Title: [173916] releases/WebKitGTK/webkit-2.6
- Revision
- 173916
- Author
- [email protected]
- Date
- 2014-09-24 06:36:19 -0700 (Wed, 24 Sep 2014)
Log Message
Merge r173845 - Bad cast in isValidColumnSpanner.
https://bugs.webkit.org/show_bug.cgi?id=133380.
Reviewed by Simon Fraser.
Source/WebCore:
Added fast/multicol/multicol-crazy-nesting.html
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::isValidColumnSpanner):
The crawl up the chain looking for unsplittable objects should use containing blocks
and not be casting to parent boxes. You can have an inline in the parent chain, so
this was not the right way to walk up the tree.
LayoutTests:
* fast/multicol/multicol-crazy-nesting-expected.txt: Added.
* fast/multicol/multicol-crazy-nesting.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (173915 => 173916)
--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-09-24 13:35:09 UTC (rev 173915)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-09-24 13:36:19 UTC (rev 173916)
@@ -1,5 +1,15 @@
2014-09-22 David Hyatt <[email protected]>
+ Bad cast in isValidColumnSpanner.
+ https://bugs.webkit.org/show_bug.cgi?id=133380.
+
+ Reviewed by Simon Fraser.
+
+ * fast/multicol/multicol-crazy-nesting-expected.txt: Added.
+ * fast/multicol/multicol-crazy-nesting.html: Added.
+
+2014-09-22 David Hyatt <[email protected]>
+
ASSERT in RenderMultiColumnSet::requiresBalancing.
https://bugs.webkit.org/show_bug.cgi?id=136376.
Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-crazy-nesting-expected.txt (0 => 173916)
--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-crazy-nesting-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-crazy-nesting-expected.txt 2014-09-24 13:36:19 UTC (rev 173916)
@@ -0,0 +1,2 @@
+This test passes if it doesn't crash.
+
Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-crazy-nesting.html (0 => 173916)
--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-crazy-nesting.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-crazy-nesting.html 2014-09-24 13:36:19 UTC (rev 173916)
@@ -0,0 +1,13 @@
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+* { -webkit-columns:3; -webkit-column-span:all }
+</style>
+</head>
+This test passes if it doesn't crash.
+<span>
+<div style="float:left">
+<div></div>
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (173915 => 173916)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-09-24 13:35:09 UTC (rev 173915)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-09-24 13:36:19 UTC (rev 173916)
@@ -1,5 +1,20 @@
2014-09-22 David Hyatt <[email protected]>
+ Bad cast in isValidColumnSpanner.
+ https://bugs.webkit.org/show_bug.cgi?id=133380.
+
+ Reviewed by Simon Fraser.
+
+ Added fast/multicol/multicol-crazy-nesting.html
+
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::isValidColumnSpanner):
+ The crawl up the chain looking for unsplittable objects should use containing blocks
+ and not be casting to parent boxes. You can have an inline in the parent chain, so
+ this was not the right way to walk up the tree.
+
+2014-09-22 David Hyatt <[email protected]>
+
ASSERT in RenderMultiColumnSet::requiresBalancing.
https://bugs.webkit.org/show_bug.cgi?id=136376.
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (173915 => 173916)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-09-24 13:35:09 UTC (rev 173915)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-09-24 13:36:19 UTC (rev 173916)
@@ -264,7 +264,7 @@
return false;
// This looks like a spanner, but if we're inside something unbreakable, it's not to be treated as one.
- for (RenderBox* ancestor = toRenderBox(descendant)->parentBox(); ancestor; ancestor = ancestor->parentBox()) {
+ for (RenderBox* ancestor = toRenderBox(descendant)->containingBlock(); ancestor; ancestor = ancestor->containingBlock()) {
if (ancestor->isRenderFlowThread()) {
// Don't allow any intervening non-multicol fragmentation contexts. The spec doesn't say
// anything about disallowing this, but it's just going to be too complicated to
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
