Title: [106968] trunk
- Revision
- 106968
- Author
- infe...@chromium.org
- Date
- 2012-02-07 11:37:26 -0800 (Tue, 07 Feb 2012)
Log Message
Source/WebCore: Crash due to column style not updated on post block
in splitInlines.
https://bugs.webkit.org/show_bug.cgi?id=77939
Reviewed by Julien Chaffraix.
Test: fast/multicol/span/split-inline-wrong-post-block-crash.html
* rendering/RenderInline.cpp:
(WebCore::RenderInline::splitFlow):
LayoutTests: Crash due to column style not updated on post block
in splitInlines.
https://bugs.webkit.org/show_bug.cgi?id=77939
Reviewed by Julien Chaffraix.
* fast/multicol/span/split-inline-wrong-post-block-crash-expected.txt: Added.
* fast/multicol/span/split-inline-wrong-post-block-crash.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (106967 => 106968)
--- trunk/LayoutTests/ChangeLog 2012-02-07 19:34:29 UTC (rev 106967)
+++ trunk/LayoutTests/ChangeLog 2012-02-07 19:37:26 UTC (rev 106968)
@@ -1,3 +1,14 @@
+2012-02-07 Abhishek Arya <infe...@chromium.org>
+
+ Crash due to column style not updated on post block
+ in splitInlines.
+ https://bugs.webkit.org/show_bug.cgi?id=77939
+
+ Reviewed by Julien Chaffraix.
+
+ * fast/multicol/span/split-inline-wrong-post-block-crash-expected.txt: Added.
+ * fast/multicol/span/split-inline-wrong-post-block-crash.html: Added.
+
2012-02-07 Julien Chaffraix <jchaffr...@webkit.org>
Unreviewed gardening.
Added: trunk/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash-expected.txt (0 => 106968)
--- trunk/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash-expected.txt 2012-02-07 19:37:26 UTC (rev 106968)
@@ -0,0 +1,2 @@
+Test passes if it does not crash.
+
Added: trunk/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html (0 => 106968)
--- trunk/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html 2012-02-07 19:37:26 UTC (rev 106968)
@@ -0,0 +1,27 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+function runTest() {
+ var container = document.createElement('div');
+ container.style['-webkit-column-count'] = 1;
+ document.body.appendChild(container);
+ var test1 = document.createElement('div');
+ test1.style['-webkit-column-span'] = 'all';
+ container.appendChild(test1);
+ var test2 = document.createElement('span');
+ container.appendChild(test2);
+ test2.appendChild(document.createElement('div'));
+ var test3 = document.createElement('div');
+ test3.style.display = 'table-column';
+ container.appendChild(test3);
+ container.appendChild(document.createElement('div'));
+}
+</script>
+</head>
+<body _onload_="runTest()">
+Test passes if it does not crash.
+</body>
+</html>
Property changes on: trunk/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html
___________________________________________________________________
Added: svn:executable
Modified: trunk/Source/WebCore/ChangeLog (106967 => 106968)
--- trunk/Source/WebCore/ChangeLog 2012-02-07 19:34:29 UTC (rev 106967)
+++ trunk/Source/WebCore/ChangeLog 2012-02-07 19:37:26 UTC (rev 106968)
@@ -1,3 +1,16 @@
+2012-02-07 Abhishek Arya <infe...@chromium.org>
+
+ Crash due to column style not updated on post block
+ in splitInlines.
+ https://bugs.webkit.org/show_bug.cgi?id=77939
+
+ Reviewed by Julien Chaffraix.
+
+ Test: fast/multicol/span/split-inline-wrong-post-block-crash.html
+
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::splitFlow):
+
2012-02-07 Peter Rybin <peter.ry...@gmail.com>
Web Inspector: CodeGeneratorInspector.py: extend Array validator functionality
Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (106967 => 106968)
--- trunk/Source/WebCore/rendering/RenderInline.cpp 2012-02-07 19:34:29 UTC (rev 106967)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2012-02-07 19:37:26 UTC (rev 106968)
@@ -383,7 +383,7 @@
madeNewBeforeBlock = true;
}
- RenderBlock* post = block->createAnonymousBlock();
+ RenderBlock* post = block->createAnonymousBlockWithSameTypeAs(pre);
RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nextSibling();
if (madeNewBeforeBlock)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
