From 995d93c9d95e9d08edf6d1a104449546b1e14c01 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 18 Jun 2020 21:39:27 +0200 Subject: [PATCH] LibWeb: Move StackingContext from Layout/ to Painting/ The stacking context tree doesn't affect layout at all, so let's move it into the Painting/ directory. I'm not sure yet if it's worth going for a fullly separate painting tree. So far I'm thinking a stacking context tree with pointers into the layout tree might be enough. --- Libraries/LibWeb/CMakeLists.txt | 3 +-- Libraries/LibWeb/Layout/LayoutBox.h | 2 +- Libraries/LibWeb/Layout/LayoutDocument.cpp | 2 +- Libraries/LibWeb/{Layout => Painting}/StackingContext.cpp | 0 Libraries/LibWeb/{Layout => Painting}/StackingContext.h | 0 5 files changed, 3 insertions(+), 4 deletions(-) rename Libraries/LibWeb/{Layout => Painting}/StackingContext.cpp (100%) rename Libraries/LibWeb/{Layout => Painting}/StackingContext.h (100%) diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index 5ed0f65267..086caea7cb 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -94,7 +94,6 @@ set(SOURCES Layout/LayoutWidget.cpp Layout/LineBox.cpp Layout/LineBoxFragment.cpp - Layout/StackingContext.cpp LayoutTreeModel.cpp Loader/FrameLoader.cpp Loader/ImageLoader.cpp @@ -103,6 +102,7 @@ set(SOURCES Loader/ResourceLoader.cpp Page.cpp PageView.cpp + Painting/StackingContext.cpp Parser/CSSParser.cpp Parser/Entities.cpp Parser/HTMLDocumentParser.cpp @@ -113,7 +113,6 @@ set(SOURCES Parser/StackOfOpenElements.cpp StylePropertiesModel.cpp URLEncoder.cpp - CSS/PropertyID.h CSS/PropertyID.cpp CSS/DefaultStyleSheetSource.cpp diff --git a/Libraries/LibWeb/Layout/LayoutBox.h b/Libraries/LibWeb/Layout/LayoutBox.h index bad3078489..b088dd12dd 100644 --- a/Libraries/LibWeb/Layout/LayoutBox.h +++ b/Libraries/LibWeb/Layout/LayoutBox.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include namespace Web { diff --git a/Libraries/LibWeb/Layout/LayoutDocument.cpp b/Libraries/LibWeb/Layout/LayoutDocument.cpp index f4821f4bac..e1fe368bd9 100644 --- a/Libraries/LibWeb/Layout/LayoutDocument.cpp +++ b/Libraries/LibWeb/Layout/LayoutDocument.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include namespace Web { diff --git a/Libraries/LibWeb/Layout/StackingContext.cpp b/Libraries/LibWeb/Painting/StackingContext.cpp similarity index 100% rename from Libraries/LibWeb/Layout/StackingContext.cpp rename to Libraries/LibWeb/Painting/StackingContext.cpp diff --git a/Libraries/LibWeb/Layout/StackingContext.h b/Libraries/LibWeb/Painting/StackingContext.h similarity index 100% rename from Libraries/LibWeb/Layout/StackingContext.h rename to Libraries/LibWeb/Painting/StackingContext.h