From 2e9faebb3dad7d286895741df614452613b7534e Mon Sep 17 00:00:00 2001 From: "mitz@apple.com" Date: Mon, 26 Sep 2011 20:08:11 +0000 Subject: [PATCH] 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: https://svn.webkit.org/repository/webkit/trunk@95985 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 11 +++++++++++ Source/WebCore/rendering/RenderObject.cpp | 9 +++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 1597bb0eadd5..126d017e67ac 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2011-09-26 Dan Bernstein + + 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 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 d88f3b874fa0..237da514316b 100644 --- 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); + } } } } -- 2.36.0