Changeset 118459 in webkit

Timestamp:

May 24, 2012, 6:49:40 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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).

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

• rendering/RenderObject.cpp:

(WebCore::RenderObject::~RenderObject):
(WebCore::RenderObject::clearLayoutRootIfNeeded):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -220 +220 @@
 RenderObject::~RenderObject()
 {
-    ASSERT(documentBeingDestroyed() || !frame()->view() || frame()->view()->layoutRoot() != this);
+    ASSERT(!node() || documentBeingDestroyed() || !frame()->view() || frame()->view()->layoutRoot() != this);
 #ifndef NDEBUG
     ASSERT(!m_hasAXObject);
@@ -2261 +2261 @@
 inline void RenderObject::clearLayoutRootIfNeeded() const
 {
-    if (!documentBeingDestroyed() && frame()) {
+    if (node() && !documentBeingDestroyed() && frame()) {
         if (FrameView* view = frame()->view()) {
             if (view->layoutRoot() == this) {