Changeset 95926 in webkit

Timestamp:

Sep 25, 2011 4:58:13 PM (13 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/10156263> ASSERT in WebCore::FrameView::scheduleRelayoutOfSubtree

Reviewed by Sam Weinig.

Source/WebCore:

Test: fast/dynamic/subtree-unrooted.html

• rendering/RenderObject.cpp:

(WebCore::RenderObject::scheduleRelayout): Replaced the check that the renderer is parented,
which was added in r21162, with a check that it is “rooted”.

LayoutTests:

• fast/dynamic/subtree-unrooted-expected.txt: Added.
• fast/dynamic/subtree-unrooted.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dynamic/subtree-unrooted-expected.txt (added)
• LayoutTests/fast/dynamic/subtree-unrooted.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-25  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10156263> ASSERT in WebCore::FrameView::scheduleRelayoutOfSubtree
+
+        Reviewed by Sam Weinig.
+
+        * fast/dynamic/subtree-unrooted-expected.txt: Added.
+        * fast/dynamic/subtree-unrooted.html: Added.
+
 2011-09-24  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-25  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10156263> ASSERT in WebCore::FrameView::scheduleRelayoutOfSubtree
+
+        Reviewed by Sam Weinig.
+
+        Test: fast/dynamic/subtree-unrooted.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::scheduleRelayout): Replaced the check that the renderer is parented,
+        which was added in r21162, with a check that it is “rooted”.
+
 2011-09-24  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -2303 +2303 @@
         if (view)
             view->scheduleRelayout();
-    } else if (parent()) {
-        FrameView* v = view() ? view()->frameView() : 0;
-        if (v)
-            v->scheduleRelayoutOfSubtree(this);
+    } else {
+        RenderView* renderView;
+        if (isRooted(&renderView)) {
+            if (FrameView* frameView = renderView->frameView())
+                frameView->scheduleRelayoutOfSubtree(this);
+        }
     }
 }