Title: [177062] branches/safari-600.1.4.13-branch
- Revision
- 177062
- Author
- bshaf...@apple.com
- Date
- 2014-12-10 08:53:01 -0800 (Wed, 10 Dec 2014)
Log Message
Merged r173845. rdar://problem/19131891
Modified Paths
Added Paths
Diff
Modified: branches/safari-600.1.4.13-branch/LayoutTests/ChangeLog (177061 => 177062)
--- branches/safari-600.1.4.13-branch/LayoutTests/ChangeLog 2014-12-10 16:51:02 UTC (rev 177061)
+++ branches/safari-600.1.4.13-branch/LayoutTests/ChangeLog 2014-12-10 16:53:01 UTC (rev 177062)
@@ -1,5 +1,19 @@
2014-12-10 Babak Shafiei <bshaf...@apple.com>
+ Merge r173845.
+
+ 2014-09-22 David Hyatt <hy...@apple.com>
+
+ 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-12-10 Babak Shafiei <bshaf...@apple.com>
+
Merge r173843.
2014-09-22 David Hyatt <hy...@apple.com>
Copied: branches/safari-600.1.4.13-branch/LayoutTests/fast/multicol/multicol-crazy-nesting-expected.txt (from rev 175520, branches/safari-600.3-branch/LayoutTests/fast/multicol/multicol-crazy-nesting-expected.txt) (0 => 177062)
--- branches/safari-600.1.4.13-branch/LayoutTests/fast/multicol/multicol-crazy-nesting-expected.txt (rev 0)
+++ branches/safari-600.1.4.13-branch/LayoutTests/fast/multicol/multicol-crazy-nesting-expected.txt 2014-12-10 16:53:01 UTC (rev 177062)
@@ -0,0 +1,2 @@
+This test passes if it doesn't crash.
+
Copied: branches/safari-600.1.4.13-branch/LayoutTests/fast/multicol/multicol-crazy-nesting.html (from rev 175520, branches/safari-600.3-branch/LayoutTests/fast/multicol/multicol-crazy-nesting.html) (0 => 177062)
--- branches/safari-600.1.4.13-branch/LayoutTests/fast/multicol/multicol-crazy-nesting.html (rev 0)
+++ branches/safari-600.1.4.13-branch/LayoutTests/fast/multicol/multicol-crazy-nesting.html 2014-12-10 16:53:01 UTC (rev 177062)
@@ -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: branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog (177061 => 177062)
--- branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog 2014-12-10 16:51:02 UTC (rev 177061)
+++ branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog 2014-12-10 16:53:01 UTC (rev 177062)
@@ -1,5 +1,24 @@
2014-12-10 Babak Shafiei <bshaf...@apple.com>
+ Merge r173845.
+
+ 2014-09-22 David Hyatt <hy...@apple.com>
+
+ 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-12-10 Babak Shafiei <bshaf...@apple.com>
+
Merge r173843.
2014-09-22 David Hyatt <hy...@apple.com>
Modified: branches/safari-600.1.4.13-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (177061 => 177062)
--- branches/safari-600.1.4.13-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-12-10 16:51:02 UTC (rev 177061)
+++ branches/safari-600.1.4.13-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-12-10 16:53:01 UTC (rev 177062)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
