Title: [150611] trunk
- Revision
- 150611
- Author
- [email protected]
- Date
- 2013-05-23 13:56:00 -0700 (Thu, 23 May 2013)
Log Message
assertion failed: !node || node->isElementNode() in WebCore::RenderBlock::clone
https://bugs.webkit.org/show_bug.cgi?id=116614
Patch by Mihai Maerean <[email protected]> on 2013-05-23
Reviewed by David Hyatt.
Source/WebCore:
Add a test for flow threads so they don't end up being cloned in region based multi columns with columns:1 where
the only child has column-span:all.
Test: fast/multicol/newmulticol/direct-child-column-span-all.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::addChildIgnoringAnonymousColumnBlocks):
LayoutTests:
* fast/multicol/newmulticol/direct-child-column-span-all-expected.txt: Added.
* fast/multicol/newmulticol/direct-child-column-span-all.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (150610 => 150611)
--- trunk/LayoutTests/ChangeLog 2013-05-23 20:48:51 UTC (rev 150610)
+++ trunk/LayoutTests/ChangeLog 2013-05-23 20:56:00 UTC (rev 150611)
@@ -1,3 +1,13 @@
+2013-05-23 Mihai Maerean <[email protected]>
+
+ assertion failed: !node || node->isElementNode() in WebCore::RenderBlock::clone
+ https://bugs.webkit.org/show_bug.cgi?id=116614
+
+ Reviewed by David Hyatt.
+
+ * fast/multicol/newmulticol/direct-child-column-span-all-expected.txt: Added.
+ * fast/multicol/newmulticol/direct-child-column-span-all.html: Added.
+
2013-05-23 Ryosuke Niwa <[email protected]>
Remove a stale test expectation.
Added: trunk/LayoutTests/fast/multicol/newmulticol/direct-child-column-span-all-expected.txt (0 => 150611)
--- trunk/LayoutTests/fast/multicol/newmulticol/direct-child-column-span-all-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/direct-child-column-span-all-expected.txt 2013-05-23 20:56:00 UTC (rev 150611)
@@ -0,0 +1,3 @@
+PASS
+
+test passes if it doesn't crash or assert.
Added: trunk/LayoutTests/fast/multicol/newmulticol/direct-child-column-span-all.html (0 => 150611)
--- trunk/LayoutTests/fast/multicol/newmulticol/direct-child-column-span-all.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/direct-child-column-span-all.html 2013-05-23 20:56:00 UTC (rev 150611)
@@ -0,0 +1,22 @@
+<!doctype html>
+<html>
+ <head>
+ <style type="text/css">
+ #article1 { -webkit-columns: 1; }
+ #p1 { -webkit-column-span: all; }
+ </style>
+
+ <script type="text/_javascript_">
+ if(window.testRunner)
+ window.testRunner.dumpAsText();
+ if(window.internals)
+ internals.settings.setRegionBasedColumnsEnabled(true);
+ </script>
+ </head>
+ <body>
+ <div id="article1">
+ <p id="p1">PASS</p>
+ </div>
+ test passes if it doesn't crash or assert.
+ </body>
+</html>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (150610 => 150611)
--- trunk/Source/WebCore/ChangeLog 2013-05-23 20:48:51 UTC (rev 150610)
+++ trunk/Source/WebCore/ChangeLog 2013-05-23 20:56:00 UTC (rev 150611)
@@ -1,3 +1,18 @@
+2013-05-23 Mihai Maerean <[email protected]>
+
+ assertion failed: !node || node->isElementNode() in WebCore::RenderBlock::clone
+ https://bugs.webkit.org/show_bug.cgi?id=116614
+
+ Reviewed by David Hyatt.
+
+ Add a test for flow threads so they don't end up being cloned in region based multi columns with columns:1 where
+ the only child has column-span:all.
+
+ Test: fast/multicol/newmulticol/direct-child-column-span-all.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::addChildIgnoringAnonymousColumnBlocks):
+
2013-05-23 Anders Carlsson <[email protected]>
Crash in convertMainResourceLoadToDownload when downloading file by option-return
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (150610 => 150611)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-05-23 20:48:51 UTC (rev 150610)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-05-23 20:56:00 UTC (rev 150611)
@@ -870,7 +870,7 @@
// We are placing a column-span element inside a block.
RenderBlock* newBox = createAnonymousColumnSpanBlock();
- if (columnsBlockAncestor != this) {
+ if (columnsBlockAncestor != this && !isRenderFlowThread()) {
// We are nested inside a multi-column element and are being split by the span. We have to break up
// our block into continuations.
RenderBoxModelObject* oldContinuation = continuation();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
