Title: [123794] trunk
Revision
123794
Author
commit-qu...@webkit.org
Date
2012-07-26 14:23:08 -0700 (Thu, 26 Jul 2012)

Log Message

Unreviewed, rolling out r123525.
http://trac.webkit.org/changeset/123525
https://bugs.webkit.org/show_bug.cgi?id=92421

it needed to be rolled out after r123779 too (Requested by
jchaffraix on #webkit).

Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-07-26

Source/WebCore:

* rendering/RenderObjectChildList.cpp:
(WebCore::RenderObjectChildList::insertChildNode):

LayoutTests:

* fast/table/crash-table-section-layoutRows-expected.txt: Removed.
* fast/table/crash-table-section-layoutRows.html: Removed.

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (123793 => 123794)


--- trunk/LayoutTests/ChangeLog	2012-07-26 21:18:53 UTC (rev 123793)
+++ trunk/LayoutTests/ChangeLog	2012-07-26 21:23:08 UTC (rev 123794)
@@ -1,3 +1,15 @@
+2012-07-26  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r123525.
+        http://trac.webkit.org/changeset/123525
+        https://bugs.webkit.org/show_bug.cgi?id=92421
+
+        it needed to be rolled out after r123779 too (Requested by
+        jchaffraix on #webkit).
+
+        * fast/table/crash-table-section-layoutRows-expected.txt: Removed.
+        * fast/table/crash-table-section-layoutRows.html: Removed.
+
 2012-07-26  Pravin D  <pravind....@gmail.com>
 
         Outline is always painted on the first table row regardless of the row it's set on

Deleted: trunk/LayoutTests/fast/table/crash-table-section-layoutRows-expected.txt (123793 => 123794)


--- trunk/LayoutTests/fast/table/crash-table-section-layoutRows-expected.txt	2012-07-26 21:18:53 UTC (rev 123793)
+++ trunk/LayoutTests/fast/table/crash-table-section-layoutRows-expected.txt	2012-07-26 21:23:08 UTC (rev 123794)
@@ -1,5 +0,0 @@
-Bug 92145: Crash in WebCore::RenderTableSection::layoutRows
-
-There should be PASSED below and we shouldn't crash or ASSERT.
-
-PASSED.

Deleted: trunk/LayoutTests/fast/table/crash-table-section-layoutRows.html (123793 => 123794)


--- trunk/LayoutTests/fast/table/crash-table-section-layoutRows.html	2012-07-26 21:18:53 UTC (rev 123793)
+++ trunk/LayoutTests/fast/table/crash-table-section-layoutRows.html	2012-07-26 21:23:08 UTC (rev 123794)
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<style>
-* {
-    display: table-cell;
-}
-</style>
-<p>Bug 92145: Crash in WebCore::RenderTableSection::layoutRows</p>
-<p>There should be PASSED below and we shouldn't crash or ASSERT.</p>
-<div id="firstDiv"><div id=secondDiv></div>
-<script>
-if (window.testRunner)
-    testRunner.dumpAsText();
-
-function crash() {
-    firstDiv.style.display = "inline";
-    window.scrollBy(5);
-    secondDiv.outerHTML = "PASSED.";
-    
-    // Remove the <style> to avoid having it dumped in the output.
-    var styleTag = document.getElementsByTagName("style")[0];
-    styleTag.parentNode.removeChild(styleTag);
-}
-document.addEventListener("DOMContentLoaded", crash, false);
-</script>

Modified: trunk/Source/WebCore/ChangeLog (123793 => 123794)


--- trunk/Source/WebCore/ChangeLog	2012-07-26 21:18:53 UTC (rev 123793)
+++ trunk/Source/WebCore/ChangeLog	2012-07-26 21:23:08 UTC (rev 123794)
@@ -1,3 +1,15 @@
+2012-07-26  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r123525.
+        http://trac.webkit.org/changeset/123525
+        https://bugs.webkit.org/show_bug.cgi?id=92421
+
+        it needed to be rolled out after r123779 too (Requested by
+        jchaffraix on #webkit).
+
+        * rendering/RenderObjectChildList.cpp:
+        (WebCore::RenderObjectChildList::insertChildNode):
+
 2012-07-26  Pravin D  <pravind....@gmail.com>
 
         Outline is always painted on the first table row regardless of the row it's set on

Modified: trunk/Source/WebCore/rendering/RenderObjectChildList.cpp (123793 => 123794)


--- trunk/Source/WebCore/rendering/RenderObjectChildList.cpp	2012-07-26 21:18:53 UTC (rev 123793)
+++ trunk/Source/WebCore/rendering/RenderObjectChildList.cpp	2012-07-26 21:23:08 UTC (rev 123794)
@@ -234,8 +234,9 @@
     }
 
     ASSERT(!child->parent());
-    while (beforeChild->parent() != owner)
+    while (beforeChild->parent() != owner && beforeChild->parent()->isAnonymousBlock())
         beforeChild = beforeChild->parent();
+    ASSERT(beforeChild->parent() == owner);
 
     ASSERT(!owner->isBlockFlow() || (!child->isTableSection() && !child->isTableRow() && !child->isTableCell()));
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to