Title: [195199] releases/WebKitGTK/webkit-2.10
- Revision
- 195199
- Author
- [email protected]
- Date
- 2016-01-18 03:49:18 -0800 (Mon, 18 Jan 2016)
Log Message
Merge r194461 - 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.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195198 => 195199)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-18 11:43:15 UTC (rev 195198)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-18 11:49:18 UTC (rev 195199)
@@ -1,3 +1,16 @@
+2015-12-31 Zalan Bujtas <[email protected]>
+
+ 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-27 Zalan Bujtas <[email protected]>
Should never be reached failure in WebCore::RenderElement::clearLayoutRootIfNeeded
Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout-expected.html (0 => 195199)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout-expected.html 2016-01-18 11:49:18 UTC (rev 195199)
@@ -0,0 +1,21 @@
+<html>
+<head>
+<title>This tests that we properly bail out of simple line layout when first-line pseudo class is present.</title>
+<script>
+ if (window.internals)
+ internals.settings.setSimpleLineLayoutEnabled(false);
+</script>
+<style>
+ .outer::first-line{
+ color: red;
+ }
+
+ div {
+ color : blue;
+ }
+</style>
+</head>
+<body>
+<div class=outer><div><div><div>First line has color red<br> while this second line has color blue.</div></div></div></div>
+</body>
+</html>
Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout.html (0 => 195199)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/line-layout/first-line-should-bail-out-of-simple-line-layout.html 2016-01-18 11:49:18 UTC (rev 195199)
@@ -0,0 +1,17 @@
+<html>
+<head>
+<title>This tests that we properly bail out of simple line layout when first-line pseudo class is present.</title>
+<style>
+ .outer::first-line{
+ color: red;
+ }
+
+ div {
+ color : blue;
+ }
+</style>
+</head>
+<body>
+<div class=outer><div><div><div>First line has color red<br> while this second line has color blue.</div></div></div></div>
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195198 => 195199)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-18 11:43:15 UTC (rev 195198)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-18 11:49:18 UTC (rev 195199)
@@ -1,3 +1,18 @@
+2015-12-31 Zalan Bujtas <[email protected]>
+
+ 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-27 Zalan Bujtas <[email protected]>
Should never be reached failure in WebCore::RenderElement::clearLayoutRootIfNeeded
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/SimpleLineLayout.cpp (195198 => 195199)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/SimpleLineLayout.cpp 2016-01-18 11:43:15 UTC (rev 195198)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/SimpleLineLayout.cpp 2016-01-18 11:49:18 UTC (rev 195199)
@@ -160,7 +160,7 @@
return false;
if (style.hasPseudoStyle(FIRST_LINE) || style.hasPseudoStyle(FIRST_LETTER))
return false;
- else if (flow.isAnonymous() && flow.firstLineBlock())
+ else if (flow.firstLineBlock())
return false;
if (style.hasTextCombine())
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
