Unreviewed, rolling out r118452.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 May 2012 01:49:40 +0000 (01:49 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 May 2012 01:49:40 +0000 (01:49 +0000)
http://trac.webkit.org/changeset/118452
https://bugs.webkit.org/show_bug.cgi?id=87446

Causes many tests to assert on Mac, NRWT bails out (Requested
by sundiamonde on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-05-24

* rendering/RenderObject.cpp:
(WebCore::RenderObject::~RenderObject):
(WebCore::RenderObject::clearLayoutRootIfNeeded):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@118459 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderObject.cpp

index dae809b..5abbb45 100644 (file)
@@ -1,3 +1,16 @@
+2012-05-24  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r118452.
+        http://trac.webkit.org/changeset/118452
+        https://bugs.webkit.org/show_bug.cgi?id=87446
+
+        Causes many tests to assert on Mac, NRWT bails out (Requested
+        by sundiamonde on #webkit).
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::~RenderObject):
+        (WebCore::RenderObject::clearLayoutRootIfNeeded):
+
 2012-05-24  Kevin Ollivier  <kevino@theolliviers.com>
 
         [wx] Unreviewed build fix. Add contextMenuItemVector stub.
index 72d3d6b..4eb16b8 100755 (executable)
@@ -219,7 +219,7 @@ RenderObject::RenderObject(Node* node)
 
 RenderObject::~RenderObject()
 {
-    ASSERT(documentBeingDestroyed() || !frame()->view() || frame()->view()->layoutRoot() != this);
+    ASSERT(!node() || documentBeingDestroyed() || !frame()->view() || frame()->view()->layoutRoot() != this);
 #ifndef NDEBUG
     ASSERT(!m_hasAXObject);
     renderObjectCounter.decrement();
@@ -2260,7 +2260,7 @@ bool RenderObject::isSelectionBorder() const
 
 inline void RenderObject::clearLayoutRootIfNeeded() const
 {
-    if (!documentBeingDestroyed() && frame()) {
+    if (node() && !documentBeingDestroyed() && frame()) {
         if (FrameView* view = frame()->view()) {
             if (view->layoutRoot() == this) {
                 ASSERT_NOT_REACHED();