Changeset 194461 in webkit

Timestamp:

Dec 31, 2015 11:27:58 AM (8 years ago)

Author:

Alan Bujtas

Message:

Simple line layout: Nested block with pseudo first-line parent should bail out of simple line layout.
​https://bugs.webkit.org/show_bug.cgi?id=152599

Reviewed by Simon Fraser.

We should bail out of simple line layout if any of the ancestors have pseudo first-line style.
(see RenderBlock::firstLineBlock())

Source/WebCore:

Test: fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout.html

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseForWithReason):

LayoutTests:

• fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout-expected.html: Added.
• fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout-expected.html (added)
• LayoutTests/fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-12-31  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Nested block with pseudo first-line parent should bail out of simple line layout.
+        https://bugs.webkit.org/show_bug.cgi?id=152599
+
+        Reviewed by Simon Fraser.
+
+        We should bail out of simple line layout if any of the ancestors have pseudo first-line style.
+        (see RenderBlock::firstLineBlock()) 
+
+        * fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout-expected.html: Added.
+        * fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout.html: Added.
+
 2015-12-31  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-31  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Nested block with pseudo first-line parent should bail out of simple line layout.
+        https://bugs.webkit.org/show_bug.cgi?id=152599
+
+        Reviewed by Simon Fraser.
+
+        We should bail out of simple line layout if any of the ancestors have pseudo first-line style.
+        (see RenderBlock::firstLineBlock()) 
+
+        Test: fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout.html
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseForWithReason):
+
 2015-12-30  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -288 +288 @@
     if (flow.document().paginated())
         SET_REASON_AND_RETURN_IF_NEEDED(FlowIsPaginated, reasons, includeReasons);
-    if (flow.isAnonymous() && flow.firstLineBlock())
+    if (flow.firstLineBlock())
         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasPseudoFirstLine, reasons, includeReasons);
     if (flow.isAnonymousBlock() && flow.parent()->style().textOverflow())