Changeset 95985 in webkit

Timestamp:

Sep 26, 2011 1:08:11 PM (13 years ago)

Author:

mitz@apple.com

Message:

REGRESSION (r95926) Assert firing in svg/clip-path/clip-path-on-svg.svg
​https://bugs.webkit.org/show_bug.cgi?id=68819

Reviewed by Dave Hyatt.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::scheduleRelayout): Revert to using view() instead of the RenderView
parameter of isRooted, since only the former returns 0 when the document is detached.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-26  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r95926) Assert firing in svg/clip-path/clip-path-on-svg.svg
+        https://bugs.webkit.org/show_bug.cgi?id=68819
+
+        Reviewed by Dave Hyatt.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::scheduleRelayout): Revert to using view() instead of the RenderView**
+        parameter of isRooted, since only the former returns 0 when the document is detached.
+
 2011-09-26  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -2304 +2304 @@
             view->scheduleRelayout();
     } else {
-        RenderView* renderView;
-        if (isRooted(&renderView)) {
-            if (FrameView* frameView = renderView->frameView())
-                frameView->scheduleRelayoutOfSubtree(this);
+        if (isRooted()) {
+            if (RenderView* renderView = view()) {
+                if (FrameView* frameView = renderView->frameView())
+                    frameView->scheduleRelayoutOfSubtree(this);
+            }
         }
     }