Changeset 270569 in webkit

Timestamp:

Dec 8, 2020, 10:00:24 PM (6 years ago)

Author:

Lauro Moura

Message:

Unreviewed. Add missing LFC guards around LineLayout usage from r270544

Fix build when LFC is disabled, like in Ubuntu LTS/Debian Stable bots.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::insertedIntoTree):
(WebCore::RenderObject::willBeRemovedFromTree):

• rendering/RenderText.cpp:

(WebCore::RenderText::setText):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (2 diffs)
• rendering/RenderText.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-08  Lauro Moura  <lmoura@igalia.com>
+
+        Unreviewed. Add missing LFC guards around LineLayout usage from r270544
+
+        Fix build when LFC is disabled, like in Ubuntu LTS/Debian Stable bots.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::insertedIntoTree):
+        (WebCore::RenderObject::willBeRemovedFromTree):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::setText):
+
 2020-12-08  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1467 +1467 @@
 void RenderObject::insertedIntoTree()
 {
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
     if (auto* container = LayoutIntegration::LineLayout::blockContainer(*this))
         container->invalidateLineLayoutPath();
+#endif
 
     // FIXME: We should ASSERT(isRooted()) here but generated content makes some out-of-order insertion.
@@ -1477 +1479 @@
 void RenderObject::willBeRemovedFromTree()
 {
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
     if (auto* container = LayoutIntegration::LineLayout::blockContainer(*this))
         container->invalidateLineLayoutPath();
+#endif
 
     // FIXME: We should ASSERT(isRooted()) but we have some out-of-order removals which would need to be fixed first.

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -1462 +1462 @@
     m_knownToHaveNoOverflowAndNoFallbackFonts = false;
 
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
     if (auto* container = LayoutIntegration::LineLayout::blockContainer(*this))
         container->invalidateLineLayoutPath();
+#endif
     
     if (AXObjectCache* cache = document().existingAXObjectCache())