Context Navigation

← Previous Changeset
Next Changeset →

Changeset 254666 in webkit

Timestamp:

Jan 15, 2020 7:50:29 PM (4 years ago)

Author:

don.olmstead@sony.com

Message:

[LFC] Fix CMake Build
https://bugs.webkit.org/show_bug.cgi?id=206334

Reviewed by Zalan Bujtas.

No new tests. No change in behavior.

Adds in the required CMake values to get LFC to compile. Fixes all issues with
the non-unified build in the layout directory.

CMakeLists.txt:
Headers.cmake:
layout/FormattingContextGeometry.cpp:
layout/FormattingContextQuirks.cpp:
layout/FormattingState.cpp:
layout/LayoutContext.h:
layout/LayoutPhase.cpp:
layout/LayoutPhase.h:
layout/LayoutState.cpp:
layout/LayoutUnits.h:
layout/blockformatting/BlockFormattingContextGeometry.cpp:
layout/blockformatting/BlockFormattingContextQuirks.cpp:
layout/blockformatting/BlockMarginCollapse.cpp:
layout/inlineformatting/InlineFormattingContext.cpp:
layout/inlineformatting/InlineLineBreaker.h:
layout/inlineformatting/InlineTextItem.cpp:
layout/inlineformatting/LineLayoutContext.cpp:
layout/inlineformatting/text/TextUtil.cpp:
layout/inlineformatting/text/TextUtil.h:
layout/layouttree/LayoutBox.cpp:
layout/layouttree/LayoutTreeBuilder.cpp:
layout/layouttree/LayoutTreeBuilder.h:
layout/tableformatting/TableFormattingContext.cpp:
layout/tableformatting/TableFormattingContextGeometry.cpp:

Location:

trunk/Source/WebCore

Files:

: 25 edited

CMakeLists.txt (modified) (1 diff)
ChangeLog (modified) (1 diff)
Headers.cmake (modified) (1 diff)
layout/FormattingContextGeometry.cpp (modified) (1 diff)
layout/FormattingContextQuirks.cpp (modified) (1 diff)
layout/FormattingState.cpp (modified) (1 diff)
layout/LayoutContext.h (modified) (1 diff)
layout/LayoutPhase.cpp (modified) (1 diff)
layout/LayoutPhase.h (modified) (1 diff)
layout/LayoutState.cpp (modified) (1 diff)
layout/LayoutUnits.h (modified) (1 diff)
layout/blockformatting/BlockFormattingContextGeometry.cpp (modified) (1 diff)
layout/blockformatting/BlockFormattingContextQuirks.cpp (modified) (1 diff)
layout/blockformatting/BlockMarginCollapse.cpp (modified) (1 diff)
layout/inlineformatting/InlineFormattingContext.cpp (modified) (1 diff)
layout/inlineformatting/InlineLineBreaker.h (modified) (1 diff)
layout/inlineformatting/InlineTextItem.cpp (modified) (1 diff)
layout/inlineformatting/LineLayoutContext.cpp (modified) (1 diff)
layout/inlineformatting/text/TextUtil.cpp (modified) (1 diff)
layout/inlineformatting/text/TextUtil.h (modified) (2 diffs)
layout/layouttree/LayoutBox.cpp (modified) (1 diff)
layout/layouttree/LayoutTreeBuilder.cpp (modified) (1 diff)
layout/layouttree/LayoutTreeBuilder.h (modified) (1 diff)
layout/tableformatting/TableFormattingContext.cpp (modified) (1 diff)
layout/tableformatting/TableFormattingContextGeometry.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/Source/WebCore/CMakeLists.txt

-                      r254110
+                      r254666
     "${WEBCORE_DIR}/layout/inlineformatting/text"
     "${WEBCORE_DIR}/layout/integration"
+    "${WEBCORE_DIR}/layout/invalidation"
     "${WEBCORE_DIR}/layout/layouttree"
+    "${WEBCORE_DIR}/layout/tableformatting"
     "${WEBCORE_DIR}/loader"
     "${WEBCORE_DIR}/loader/appcache"

trunk/Source/WebCore/ChangeLog

-                      r254662
+                      r254666
+-01-15  Don Olmstead  <don.olmstead@sony.com>
+        [LFC] Fix CMake Build
+        https://bugs.webkit.org/show_bug.cgi?id=206334
+        Reviewed by Zalan Bujtas.
+        No new tests. No change in behavior.
+        Adds in the required CMake values to get LFC to compile. Fixes all issues with
+        the non-unified build in the layout directory.
+        * CMakeLists.txt:
+        * Headers.cmake:
+        * layout/FormattingContextGeometry.cpp:
+        * layout/FormattingContextQuirks.cpp:
+        * layout/FormattingState.cpp:
+        * layout/LayoutContext.h:
+        * layout/LayoutPhase.cpp:
+        * layout/LayoutPhase.h:
+        * layout/LayoutState.cpp:
+        * layout/LayoutUnits.h:
+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+        * layout/blockformatting/BlockFormattingContextQuirks.cpp:
+        * layout/blockformatting/BlockMarginCollapse.cpp:
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        * layout/inlineformatting/InlineLineBreaker.h:
+        * layout/inlineformatting/InlineTextItem.cpp:
+        * layout/inlineformatting/LineLayoutContext.cpp:
+        * layout/inlineformatting/text/TextUtil.cpp:
+        * layout/inlineformatting/text/TextUtil.h:
+        * layout/layouttree/LayoutBox.cpp:
+        * layout/layouttree/LayoutTreeBuilder.cpp:
+        * layout/layouttree/LayoutTreeBuilder.h:
+        * layout/tableformatting/TableFormattingContext.cpp:
+        * layout/tableformatting/TableFormattingContextGeometry.cpp:
 -01-15  Pinki Gyanchandani  <pgyanchandani@apple.com>

trunk/Source/WebCore/Headers.cmake

-                      r254214
+                      r254666
     inspector/agents/InspectorPageAgent.h
+    layout/LayoutUnits.h
+    layout/MarginTypes.h
+    layout/displaytree/DisplayBox.h
+    layout/displaytree/DisplayInlineContent.h
+    layout/displaytree/DisplayInlineRect.h
+    layout/displaytree/DisplayLineBox.h
+    layout/displaytree/DisplayRect.h
+    layout/displaytree/DisplayRun.h
+    layout/layouttree/LayoutBox.h
+    layout/layouttree/LayoutReplaced.h
+    layout/layouttree/TextContext.h
     loader/AdClickAttribution.h
     loader/CanvasActivityRecord.h

trunk/Source/WebCore/layout/FormattingContextGeometry.cpp

r254336	r254666
31	31	#include "FloatingState.h"
32	32	#include "InlineFormattingState.h"
	33	#include "LayoutContext.h"
	34	#include "Logging.h"
33	35	#include "TableFormattingState.h"
34	36

trunk/Source/WebCore/layout/FormattingContextQuirks.cpp

r254336	r254666
29	29	#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
30	30
	31	#include "DisplayBox.h"
31	32	#include "LayoutBox.h"
32	33

trunk/Source/WebCore/layout/FormattingState.cpp

r254634	r254666
30	30
31	31	#include "DisplayBox.h"
	32	#include "FloatingState.h"
32	33	#include <wtf/IsoMallocInlines.h>
33	34

trunk/Source/WebCore/layout/LayoutContext.h

r253032	r254666
35	35	class GraphicsContext;
36	36	class IntRect;
	37	class LayoutSize;
37	38	class RenderView;
38	39

trunk/Source/WebCore/layout/LayoutPhase.cpp

r248364	r254666
28	28
29	29	#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
	30
	31	#include <wtf/NeverDestroyed.h>
30	32
31	33	namespace WebCore {

trunk/Source/WebCore/layout/LayoutPhase.h

r248364	r254666
27	27
28	28	#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
	29
	30	#include <wtf/Optional.h>
29	31
30	32	namespace WebCore {

trunk/Source/WebCore/layout/LayoutState.cpp

-                      r254634
+                      r254666
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+#include "BlockFormattingState.h"
 #include "DisplayBox.h"
+#include "FloatingState.h"
+#include "InlineFormattingState.h"
 #include "LayoutBox.h"
 #include "LayoutContainer.h"
+#include "RenderBox.h"
 #include "RuntimeEnabledFeatures.h"
+#include "TableFormattingState.h"
 #include <wtf/IsoMallocInlines.h>

trunk/Source/WebCore/layout/LayoutUnits.h

r254277	r254666
30	30	#include "LayoutUnit.h"
31	31	#include "LayoutPoint.h"
	32	#include "LayoutRect.h"
32	33	#include "MarginTypes.h"
33	34	#include <wtf/Optional.h>

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp

-                      r254277
+                      r254666
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+#include "BlockFormattingState.h"
 #include "FormattingContext.h"
 #include "InlineFormattingState.h"
 #include "LayoutChildIterator.h"
+#include "LayoutContext.h"
 #include "Logging.h"
 #include <wtf/text/TextStream.h>

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp

r254380	r254666
29	29	#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
30	30
	31	#include "BlockFormattingState.h"
	32	#include "DisplayBox.h"
31	33	#include "LayoutBox.h"
32	34	#include "LayoutContainer.h"

trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp

r254271	r254666
29	29	#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
30	30
	31	#include "BlockFormattingState.h"
	32	#include "FloatingState.h"
31	33	#include "InlineFormattingState.h"
32	34	#include "LayoutBox.h"

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp

r254336	r254666
29	29	#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
30	30
	31	#include "FloatingContext.h"
	32	#include "FontCascade.h"
31	33	#include "InlineFormattingState.h"
32	34	#include "InlineTextItem.h"

trunk/Source/WebCore/layout/inlineformatting/InlineLineBreaker.h

-                      r254661
+                      r254666
 namespace WebCore {
+class RenderStyle;
 namespace Layout {

trunk/Source/WebCore/layout/inlineformatting/InlineTextItem.cpp

r253997	r254666
29	29	#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
30	30
	31	#include "FontCascade.h"
31	32	#include "InlineSoftLineBreakItem.h"
32	33	#include "TextUtil.h"

trunk/Source/WebCore/layout/inlineformatting/LineLayoutContext.cpp

r254661	r254666
29	29	#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
30	30
	31	#include "InlineFormattingContext.h"
31	32	#include "LayoutBox.h"
32	33	#include "TextUtil.h"

trunk/Source/WebCore/layout/inlineformatting/text/TextUtil.cpp

r253905	r254666
32	32	#include "FontCascade.h"
33	33	#include "InlineTextItem.h"
	34	#include "RenderBox.h"
34	35	#include "RenderStyle.h"
35	36

trunk/Source/WebCore/layout/inlineformatting/text/TextUtil.h

-                      r253468
+                      r254666
 #include "InlineItem.h"
+#include "LayoutUnits.h"
 #include <wtf/text/TextBreakIterator.h>
 …
 namespace Layout {
+class InlineTextItem;
 class TextUtil {

trunk/Source/WebCore/layout/layouttree/LayoutBox.cpp

r254634	r254666
29	29	#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
30	30
	31	#include "DisplayBox.h"
31	32	#include "LayoutContainer.h"
32	33	#include "LayoutPhase.h"

trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp

-                      r254427
+                      r254666
 #include "LayoutDescendantIterator.h"
 #include "LayoutPhase.h"
+#include "LayoutSize.h"
 #include "LayoutState.h"
 #include "RenderBlock.h"
+#include "RenderBox.h"
 #include "RenderChildIterator.h"
 #include "RenderElement.h"

trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.h

r254634	r254666
34	34
35	35	class RenderBlockFlow;
	36	class RenderBox;
36	37	class RenderElement;
37	38	class RenderObject;

trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp

-                      r254388
+                      r254666
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+#include "DisplayBox.h"
 #include "InvalidationState.h"
 #include "LayoutBox.h"
 #include "LayoutChildIterator.h"
+#include "LayoutContext.h"
 #include "TableFormattingState.h"
 #include <wtf/IsoMallocInlines.h>

trunk/Source/WebCore/layout/tableformatting/TableFormattingContextGeometry.cpp

r251151	r254666
30	30
31	31	#include "LayoutBox.h"
	32	#include "TableFormattingState.h"
32	33
33	34	namespace WebCore {

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 254666 in webkit

Legend:

Download in other formats: