commit 4789a0829628891e38db1448383fec32f5f4b7ec
author antti@apple.com <antti@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sun Dec 08 15:30:50 2019 +0000
committer antti@apple.com <antti@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sun Dec 08 15:30:50 2019 +0000
tree fb34cb21cbe0c9babb2e0f9a81dea4aaedb2eea0
parent 3fd8cecfe58e8f663dadb56fee777e4c3827e321

[LFC][Integration] Collect overflow from lines
https://bugs.webkit.org/show_bug.cgi?id=204994

Reviewed by Zalan Bujtas.

* layout/displaytree/DisplayLineBox.h:
(WebCore::Display::LineBox::logicalRect const):
* layout/integration/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::computeVisualOverflow):
(WebCore::LayoutIntegration::LineLayout::collectOverflow):
* layout/integration/LayoutIntegrationLineLayout.h:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::addOverflowFromInlineChildren):

Connect to LFC layout.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@253270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/rendering/RenderBlockFlow.cpp

diff --git a/Source/WebCore/rendering/RenderBlockFlow.cpp b/Source/WebCore/rendering/RenderBlockFlow.cpp
index f215509..6bad91c 100644
--- a/Source/WebCore/rendering/RenderBlockFlow.cpp
+++ b/Source/WebCore/rendering/RenderBlockFlow.cpp
@@ -2969,6 +2969,13 @@
         return;
     }
 
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    if (layoutFormattingContextLineLayout()) {
+        layoutFormattingContextLineLayout()->collectOverflow(*this);
+        return;
+    }
+#endif
+    
     if (complexLineLayout())
         complexLineLayout()->addOverflowFromInlineChildren();
 }