Title: [204773] releases/WebKitGTK/webkit-2.12
- Revision
- 204773
- Author
- [email protected]
- Date
- 2016-08-23 00:12:54 -0700 (Tue, 23 Aug 2016)
Log Message
Merge r202146 - [New Block-Inside-Inline Model] Do not attempt to re-run margin collapsing on the block sequence.
https://bugs.webkit.org/show_bug.cgi?id=158854
Reviewed by David Hyatt.
Source/WebCore:
Test: fast/block/inside-inlines/crash-on-first-line-change.html
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::marginCollapseLinesFromStart):
LayoutTests:
* fast/block/inside-inlines/crash-on-first-line-change-expected.txt: Added.
* fast/block/inside-inlines/crash-on-first-line-change.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (204772 => 204773)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 07:09:38 UTC (rev 204772)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 07:12:54 UTC (rev 204773)
@@ -1,3 +1,13 @@
+2016-06-16 Zalan Bujtas <[email protected]>
+
+ [New Block-Inside-Inline Model] Do not attempt to re-run margin collapsing on the block sequence.
+ https://bugs.webkit.org/show_bug.cgi?id=158854
+
+ Reviewed by David Hyatt.
+
+ * fast/block/inside-inlines/crash-on-first-line-change-expected.txt: Added.
+ * fast/block/inside-inlines/crash-on-first-line-change.html: Added.
+
2016-06-15 Zalan Bujtas <[email protected]>
Decouple the percent height and positioned descendants maps.
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/inside-inlines/crash-on-first-line-change-expected.txt (0 => 204773)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/inside-inlines/crash-on-first-line-change-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/inside-inlines/crash-on-first-line-change-expected.txt 2016-08-23 07:12:54 UTC (rev 204773)
@@ -0,0 +1,2 @@
+PASS if no crash.
+
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/inside-inlines/crash-on-first-line-change.html (0 => 204773)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/inside-inlines/crash-on-first-line-change.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/inside-inlines/crash-on-first-line-change.html 2016-08-23 07:12:54 UTC (rev 204773)
@@ -0,0 +1,33 @@
+<!doctype html>
+<html>
+<head>
+<style>
+div {
+ width: 100px;
+ height: 100px;
+ background-color: green;
+}
+
+.container {
+ overflow: hidden;
+}
+</style>
+</head>
+<body>
+PASS if no crash.
+<div class=container><span><div id=foo></div></div></div>
+<script>
+if (window.internals)
+ internals.settings.setNewBlockInsideInlineModelEnabled(true)
+
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+setTimeout(function() {
+ document.getElementById("foo").style.height = "200px";
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, 10);
+</script>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (204772 => 204773)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 07:09:38 UTC (rev 204772)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 07:12:54 UTC (rev 204773)
@@ -1,3 +1,15 @@
+2016-06-16 Zalan Bujtas <[email protected]>
+
+ [New Block-Inside-Inline Model] Do not attempt to re-run margin collapsing on the block sequence.
+ https://bugs.webkit.org/show_bug.cgi?id=158854
+
+ Reviewed by David Hyatt.
+
+ Test: fast/block/inside-inlines/crash-on-first-line-change.html
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::marginCollapseLinesFromStart):
+
2016-06-15 Zalan Bujtas <[email protected]>
Decouple the percent height and positioned descendants maps.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlockLineLayout.cpp (204772 => 204773)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2016-08-23 07:09:38 UTC (rev 204772)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2016-08-23 07:12:54 UTC (rev 204773)
@@ -2250,6 +2250,10 @@
if (!stopLine->hasAnonymousInlineBlock())
return;
+ // We already handled top of block with startLine.
+ if (stopLine == firstRootBox())
+ return;
+
// Re-run margin collapsing on the block sequence that stopLine is a part of.
// First go backwards to get the entire sequence.
RootInlineBox* prev = stopLine;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
