Changeset 268806 in webkit

Timestamp:

Oct 21, 2020, 11:07:09 AM (6 years ago)

Author:

Antti Koivisto

Message:

[LFC][Integration] Use LineLayout::containing() in more places
​https://bugs.webkit.org/show_bug.cgi?id=218029

Reviewed by Zalan Bujtas.

• layout/integration/LayoutIntegrationRunIterator.cpp:

(WebCore::LayoutIntegration::firstTextRunFor):
(WebCore::LayoutIntegration::runFor):
(WebCore::LayoutIntegration::lineLayoutSystemFlowForRenderer): Deleted.

• rendering/RenderText.cpp:

(WebCore::RenderText::usesComplexLineLayoutPath const):
(WebCore::RenderText::layoutFormattingContextLineLayout const): Deleted.

• rendering/RenderText.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/LayoutIntegrationRunIterator.cpp (modified) (2 diffs)
• rendering/RenderText.cpp (modified) (2 diffs)
• rendering/RenderText.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-21  Antti Koivisto  <antti@apple.com>
+
+        [LFC][Integration] Use LineLayout::containing() in more places
+        https://bugs.webkit.org/show_bug.cgi?id=218029
+
+        Reviewed by Zalan Bujtas.
+
+        * layout/integration/LayoutIntegrationRunIterator.cpp:
+        (WebCore::LayoutIntegration::firstTextRunFor):
+        (WebCore::LayoutIntegration::runFor):
+        (WebCore::LayoutIntegration::lineLayoutSystemFlowForRenderer): Deleted.
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::usesComplexLineLayoutPath const):
+        (WebCore::RenderText::layoutFormattingContextLineLayout const): Deleted.
+        * rendering/RenderText.h:
+
 2020-10-21  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIterator.cpp

@@ -161 +161 @@
 }
 
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-static const RenderBlockFlow* lineLayoutSystemFlowForRenderer(const RenderObject& renderer)
-{
-    // In currently supported cases the renderer is always direct child of the flow.
-    if (!is<RenderBlockFlow>(renderer.parent()))
-        return nullptr;
-    return downcast<RenderBlockFlow>(renderer.parent());
-}
-#endif
-
 TextRunIterator firstTextRunFor(const RenderText& text)
 {
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-    if (auto* flow = lineLayoutSystemFlowForRenderer(text)) {
-        if (auto* layoutFormattingContextLineLayout = flow->layoutFormattingContextLineLayout())
-            return layoutFormattingContextLineLayout->textRunsFor(text);
-    }
+    if (auto* lineLayout = LineLayout::containing(text))
+        return lineLayout->textRunsFor(text);
 #endif
 
@@ -202 +190 @@
 }
 
-RunIterator runFor(const RenderLineBreak& renderElement)
-{
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-    if (auto* flow = lineLayoutSystemFlowForRenderer(renderElement)) {
-        if (auto* layoutFormattingContextLineLayout = flow->layoutFormattingContextLineLayout())
-            return layoutFormattingContextLineLayout->runFor(renderElement);
-    }
-#endif
-    return { RunIteratorLegacyPath(renderElement.inlineBoxWrapper()) };
-}
-
-RunIterator runFor(const RenderBox& renderElement)
-{
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-    if (auto* flow = lineLayoutSystemFlowForRenderer(renderElement)) {
-        if (auto* layoutFormattingContextLineLayout = flow->layoutFormattingContextLineLayout())
-            return layoutFormattingContextLineLayout->runFor(renderElement);
-    }
-#endif
-    return { RunIteratorLegacyPath(renderElement.inlineBoxWrapper()) };
+RunIterator runFor(const RenderLineBreak& renderer)
+{
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    if (auto* lineLayout = LineLayout::containing(renderer))
+        return lineLayout->runFor(renderer);
+#endif
+    return { RunIteratorLegacyPath(renderer.inlineBoxWrapper()) };
+}
+
+RunIterator runFor(const RenderBox& renderer)
+{
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    if (auto* lineLayout = LineLayout::containing(renderer))
+        return lineLayout->runFor(renderer);
+#endif
+    return { RunIteratorLegacyPath(renderer.inlineBoxWrapper()) };
 }
 

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -39 +39 @@
 #include "InlineTextBox.h"
 #include "LayoutIntegrationLineIterator.h"
+#include "LayoutIntegrationLineLayout.h"
 #include "LayoutIntegrationRunIterator.h"
 #include "Range.h"
@@ -1465 +1466 @@
 }
 
+bool RenderText::usesComplexLineLayoutPath() const
+{
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-const LayoutIntegration::LineLayout* RenderText::layoutFormattingContextLineLayout() const
-{
-    if (!is<RenderBlockFlow>(*parent()))
-        return nullptr;
-    return downcast<RenderBlockFlow>(*parent()).layoutFormattingContextLineLayout();
-}
+    return !LayoutIntegration::LineLayout::containing(*this);
+#else
+    return true;
 #endif
-
-bool RenderText::usesComplexLineLayoutPath() const
-{
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-    if (layoutFormattingContextLineLayout())
-        return false;
-#endif
-    return true;
 }
 

trunk/Source/WebCore/rendering/RenderText.h

@@ -169 +169 @@
 
     void ensureLineBoxes();
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-    const LayoutIntegration::LineLayout* layoutFormattingContextLineLayout() const;
-#endif
     bool usesComplexLineLayoutPath() const;