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.

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 1597bb0..126d017 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+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>
 
         Web Inspector: XMLHttpRequest console logging messages should link to network panel when possible.

diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp
index d88f3b8..237da51 100644 (file)
--- a/Source/WebCore/rendering/RenderObject.cpp
+++ b/Source/WebCore/rendering/RenderObject.cpp
@@ -2303,10 +2303,11 @@ void RenderObject::scheduleRelayout()
         if (view)
             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);
+            }
         }
     }
 }