Changeset 267461 in webkit

Timestamp:

Sep 22, 2020, 8:50:31 PM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][Integration] Move RuntimeEnabledFeatures::layoutFormattingContextIntegrationEnabled() check out from LineBuilder::constraintsForLine
​https://bugs.webkit.org/show_bug.cgi?id=216862

Reviewed by Simon Fraser.

• layout/LayoutState.cpp:

(WebCore::Layout::LayoutState::setIsIntegratedRootBoxFirstChild):

• layout/LayoutState.h:

(WebCore::Layout::LayoutState::isIntegratedRootBoxFirstChild const):

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::computeGeometryForLineContent):

• layout/inlineformatting/InlineLineBuilder.cpp:

(WebCore::Layout::LineBuilder::constraintsForLine):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/LayoutState.cpp (modified) (1 diff)
• layout/LayoutState.h (modified) (2 diffs)
• layout/inlineformatting/InlineFormattingContext.cpp (modified) (1 diff)
• layout/inlineformatting/InlineLineBuilder.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Integration] Move RuntimeEnabledFeatures::layoutFormattingContextIntegrationEnabled() check out from LineBuilder::constraintsForLine
+        https://bugs.webkit.org/show_bug.cgi?id=216862
+
+        Reviewed by Simon Fraser.
+
+        * layout/LayoutState.cpp:
+        (WebCore::Layout::LayoutState::setIsIntegratedRootBoxFirstChild):
+        * layout/LayoutState.h:
+        (WebCore::Layout::LayoutState::isIntegratedRootBoxFirstChild const):
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::computeGeometryForLineContent):
+        * layout/inlineformatting/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::constraintsForLine):
+
 2020-09-22  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/LayoutState.cpp

@@ -237 +237 @@
 {
     ASSERT(RuntimeEnabledFeatures::sharedFeatures().layoutFormattingContextIntegrationEnabled());
-    m_isIntegratedRootBoxFirstChild = value;
+    m_isIntegratedRootBoxFirstChild = value ? IsIntegratedRootBoxFirstChild::Yes : IsIntegratedRootBoxFirstChild::No;
 }
 

trunk/Source/WebCore/layout/LayoutState.h

@@ -90 +90 @@
     void setViewportSize(const LayoutSize&);
     LayoutSize viewportSize() const;
-    bool isIntegratedRootBoxFirstChild() const { return m_isIntegratedRootBoxFirstChild; }
+    enum IsIntegratedRootBoxFirstChild { Yes, No, NotApplicable };
+    IsIntegratedRootBoxFirstChild isIntegratedRootBoxFirstChild() const { return m_isIntegratedRootBoxFirstChild; }
     void setIsIntegratedRootBoxFirstChild(bool);
 
@@ -114 +115 @@
     // LFC integration only.
     LayoutSize m_viewportSize;
-    bool m_isIntegratedRootBoxFirstChild { false };
+    IsIntegratedRootBoxFirstChild m_isIntegratedRootBoxFirstChild { IsIntegratedRootBoxFirstChild::NotApplicable };
 };
 

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

@@ -486 +486 @@
     };
     constructLineGeometry();
+
     return lineLogicalRect;
 }

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

@@ -430 +430 @@
             // of an element are affected.
             // For example, the first line of an anonymous block box is only affected if it is the first child of its parent element.
-            isFormattingContextRootCandidateToTextIndent = RuntimeEnabledFeatures::sharedFeatures().layoutFormattingContextIntegrationEnabled()
-                ? layoutState().isIntegratedRootBoxFirstChild()
-                : root.parent().firstInFlowChild() == &root;
+            auto isIntegratedRootBoxFirstChild = layoutState().isIntegratedRootBoxFirstChild();
+            if (isIntegratedRootBoxFirstChild == LayoutState::IsIntegratedRootBoxFirstChild::NotApplicable)
+                isFormattingContextRootCandidateToTextIndent = root.parent().firstInFlowChild() == &root;
+            else
+                isFormattingContextRootCandidateToTextIndent = isIntegratedRootBoxFirstChild == LayoutState::IsIntegratedRootBoxFirstChild::Yes;
         }
         if (!isFormattingContextRootCandidateToTextIndent)