Diff
Modified: branches/safari-536.30-branch/LayoutTests/ChangeLog (148454 => 148455)
--- branches/safari-536.30-branch/LayoutTests/ChangeLog 2013-04-15 18:27:47 UTC (rev 148454)
+++ branches/safari-536.30-branch/LayoutTests/ChangeLog 2013-04-15 19:04:10 UTC (rev 148455)
@@ -1,3 +1,7 @@
+2012-12-13 Lucas Forschler <[email protected]>
+
+ Rollout r145643. <rdar://problem/13334979>
+
2013-04-15 Roger Fong <[email protected]>
Merge r142816.
Deleted: branches/safari-536.30-branch/LayoutTests/fast/multicol/continuation-crash-expected.txt (148454 => 148455)
--- branches/safari-536.30-branch/LayoutTests/fast/multicol/continuation-crash-expected.txt 2013-04-15 18:27:47 UTC (rev 148454)
+++ branches/safari-536.30-branch/LayoutTests/fast/multicol/continuation-crash-expected.txt 2013-04-15 19:04:10 UTC (rev 148455)
@@ -1,2 +0,0 @@
-Test passes if it does not crash.
-
Modified: branches/safari-536.30-branch/Source/WebCore/ChangeLog (148454 => 148455)
--- branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-04-15 18:27:47 UTC (rev 148454)
+++ branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-04-15 19:04:10 UTC (rev 148455)
@@ -1,3 +1,8 @@
+2012-12-13 Lucas Forschler <[email protected]>
+
+ Rollout r
+145643
+
2013-04-15 Roger Fong <[email protected]>
Merge r142816.
Modified: branches/safari-536.30-branch/Source/WebCore/rendering/RenderBlock.cpp (148454 => 148455)
--- branches/safari-536.30-branch/Source/WebCore/rendering/RenderBlock.cpp 2013-04-15 18:27:47 UTC (rev 148454)
+++ branches/safari-536.30-branch/Source/WebCore/rendering/RenderBlock.cpp 2013-04-15 19:04:10 UTC (rev 148455)
@@ -799,6 +799,10 @@
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/safari-536.30-branch/Source/WebCore/rendering/RenderRuby.cpp (148454 => 148455)
--- branches/safari-536.30-branch/Source/WebCore/rendering/RenderRuby.cpp 2013-04-15 18:27:47 UTC (rev 148454)
+++ branches/safari-536.30-branch/Source/WebCore/rendering/RenderRuby.cpp 2013-04-15 19:04:10 UTC (rev 148455)
@@ -183,7 +183,7 @@
RenderRubyRun* lastRun = lastRubyRun(this);
if (!lastRun || lastRun->hasRubyText()) {
lastRun = RenderRubyRun::staticCreateRubyRun(this);
- RenderInline::addChild(lastRun, beforeChild);
+ RenderInline::addChild(lastRun);
}
lastRun->addChild(child);
}
@@ -290,7 +290,7 @@
RenderRubyRun* lastRun = lastRubyRun(this);
if (!lastRun || lastRun->hasRubyText()) {
lastRun = RenderRubyRun::staticCreateRubyRun(this);
- RenderBlock::addChild(lastRun, beforeChild);
+ RenderBlock::addChild(lastRun);
}
lastRun->addChild(child);
}
Modified: branches/safari-536.30-branch/Source/WebCore/rendering/RenderTable.cpp (148454 => 148455)
--- branches/safari-536.30-branch/Source/WebCore/rendering/RenderTable.cpp 2013-04-15 18:27:47 UTC (rev 148454)
+++ branches/safari-536.30-branch/Source/WebCore/rendering/RenderTable.cpp 2013-04-15 19:04:10 UTC (rev 148455)
@@ -110,6 +110,10 @@
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->isPositioned();
if (child->isTableCaption()) {
Modified: branches/safari-536.30-branch/Source/WebCore/rendering/RenderTableRow.cpp (148454 => 148455)
--- branches/safari-536.30-branch/Source/WebCore/rendering/RenderTableRow.cpp 2013-04-15 18:27:47 UTC (rev 148454)
+++ branches/safari-536.30-branch/Source/WebCore/rendering/RenderTableRow.cpp 2013-04-15 19:04:10 UTC (rev 148455)
@@ -85,6 +85,10 @@
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/safari-536.30-branch/Source/WebCore/rendering/RenderTableSection.cpp (148454 => 148455)
--- branches/safari-536.30-branch/Source/WebCore/rendering/RenderTableSection.cpp 2013-04-15 18:27:47 UTC (rev 148454)
+++ branches/safari-536.30-branch/Source/WebCore/rendering/RenderTableSection.cpp 2013-04-15 19:04:10 UTC (rev 148455)
@@ -125,6 +125,10 @@
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)
