Title: [95985] trunk/Source/WebCore
- Revision
- 95985
- Author
- [email protected]
- Date
- 2011-09-26 13:08:11 -0700 (Mon, 26 Sep 2011)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95984 => 95985)
--- trunk/Source/WebCore/ChangeLog 2011-09-26 20:06:55 UTC (rev 95984)
+++ trunk/Source/WebCore/ChangeLog 2011-09-26 20:08:11 UTC (rev 95985)
@@ -1,3 +1,14 @@
+2011-09-26 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
Web Inspector: XMLHttpRequest console logging messages should link to network panel when possible.
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (95984 => 95985)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2011-09-26 20:06:55 UTC (rev 95984)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2011-09-26 20:08:11 UTC (rev 95985)
@@ -2303,10 +2303,11 @@
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);
+ }
}
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
