Diff
Copied: branches/chromium/1364/LayoutTests/fast/multicol/continuation-crash-expected.txt (from rev 138850, trunk/LayoutTests/fast/multicol/continuation-crash-expected.txt) (0 => 139398)
--- branches/chromium/1364/LayoutTests/fast/multicol/continuation-crash-expected.txt (rev 0)
+++ branches/chromium/1364/LayoutTests/fast/multicol/continuation-crash-expected.txt 2013-01-11 03:00:10 UTC (rev 139398)
@@ -0,0 +1,2 @@
+Test passes if it does not crash.
+
Copied: branches/chromium/1364/LayoutTests/fast/multicol/continuation-crash.html (from rev 138850, trunk/LayoutTests/fast/multicol/continuation-crash.html) (0 => 139398)
--- branches/chromium/1364/LayoutTests/fast/multicol/continuation-crash.html (rev 0)
+++ branches/chromium/1364/LayoutTests/fast/multicol/continuation-crash.html 2013-01-11 03:00:10 UTC (rev 139398)
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+Test passes if it does not crash.
+<style>
+.column-layout { -webkit-column-count: 1; }
+.column-span-all { -webkit-column-span: all; }
+.after-content:after { display: block; content: "" }
+</style>
+<div class="column-layout">
+ <span class="after-content">
+ <div></div>
+ </span>
+ <div class="column-span-all"></div>
+</div>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</html>
Modified: branches/chromium/1364/Source/WebCore/rendering/RenderBlock.cpp (139397 => 139398)
--- branches/chromium/1364/Source/WebCore/rendering/RenderBlock.cpp 2013-01-11 02:36:24 UTC (rev 139397)
+++ branches/chromium/1364/Source/WebCore/rendering/RenderBlock.cpp 2013-01-11 03:00:10 UTC (rev 139398)
@@ -774,10 +774,6 @@
void RenderBlock::addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild)
{
- // Make sure we don't append things after :after-generated content if we have it.
- if (!beforeChild)
- beforeChild = afterPseudoElementRenderer();
-
if (beforeChild && beforeChild->parent() != this) {
RenderObject* beforeChildContainer = beforeChild->parent();
while (beforeChildContainer->parent() != this)
Modified: branches/chromium/1364/Source/WebCore/rendering/RenderRuby.cpp (139397 => 139398)
--- branches/chromium/1364/Source/WebCore/rendering/RenderRuby.cpp 2013-01-11 02:36:24 UTC (rev 139397)
+++ branches/chromium/1364/Source/WebCore/rendering/RenderRuby.cpp 2013-01-11 03:00:10 UTC (rev 139398)
@@ -184,7 +184,7 @@
RenderRubyRun* lastRun = lastRubyRun(this);
if (!lastRun || lastRun->hasRubyText()) {
lastRun = RenderRubyRun::staticCreateRubyRun(this);
- RenderInline::addChild(lastRun);
+ RenderInline::addChild(lastRun, beforeChild);
}
lastRun->addChild(child);
}
@@ -291,7 +291,7 @@
RenderRubyRun* lastRun = lastRubyRun(this);
if (!lastRun || lastRun->hasRubyText()) {
lastRun = RenderRubyRun::staticCreateRubyRun(this);
- RenderBlock::addChild(lastRun);
+ RenderBlock::addChild(lastRun, beforeChild);
}
lastRun->addChild(child);
}
Modified: branches/chromium/1364/Source/WebCore/rendering/RenderTable.cpp (139397 => 139398)
--- branches/chromium/1364/Source/WebCore/rendering/RenderTable.cpp 2013-01-11 02:36:24 UTC (rev 139397)
+++ branches/chromium/1364/Source/WebCore/rendering/RenderTable.cpp 2013-01-11 03:00:10 UTC (rev 139398)
@@ -113,10 +113,6 @@
void RenderTable::addChild(RenderObject* child, RenderObject* beforeChild)
{
- // Make sure we don't append things after :after-generated content if we have it.
- if (!beforeChild)
- beforeChild = afterPseudoElementRenderer();
-
bool wrapInAnonymousSection = !child->isOutOfFlowPositioned();
if (child->isTableCaption())
Modified: branches/chromium/1364/Source/WebCore/rendering/RenderTableRow.cpp (139397 => 139398)
--- branches/chromium/1364/Source/WebCore/rendering/RenderTableRow.cpp 2013-01-11 02:36:24 UTC (rev 139397)
+++ branches/chromium/1364/Source/WebCore/rendering/RenderTableRow.cpp 2013-01-11 03:00:10 UTC (rev 139398)
@@ -88,10 +88,6 @@
void RenderTableRow::addChild(RenderObject* child, RenderObject* beforeChild)
{
- // Make sure we don't append things after :after-generated content if we have it.
- if (!beforeChild)
- beforeChild = afterPseudoElementRenderer();
-
if (!child->isTableCell()) {
RenderObject* last = beforeChild;
if (!last)
Modified: branches/chromium/1364/Source/WebCore/rendering/RenderTableSection.cpp (139397 => 139398)
--- branches/chromium/1364/Source/WebCore/rendering/RenderTableSection.cpp 2013-01-11 02:36:24 UTC (rev 139397)
+++ branches/chromium/1364/Source/WebCore/rendering/RenderTableSection.cpp 2013-01-11 03:00:10 UTC (rev 139398)
@@ -130,10 +130,6 @@
void RenderTableSection::addChild(RenderObject* child, RenderObject* beforeChild)
{
- // Make sure we don't append things after :after-generated content if we have it.
- if (!beforeChild)
- beforeChild = afterPseudoElementRenderer();
-
if (!child->isTableRow()) {
RenderObject* last = beforeChild;
if (!last)
