Title: [104078] branches/safari-534.54-branch/Source/WebCore
Diff
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104077 => 104078)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-04 22:37:51 UTC (rev 104077)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-04 22:40:36 UTC (rev 104078)
@@ -1,5 +1,20 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 95985
+
+ 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-1-4 Lucas Forschler <[email protected]>
+
Merge 95959
2011-09-26 Abhishek Arya <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp (104077 => 104078)
--- branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp 2012-01-04 22:37:51 UTC (rev 104077)
+++ branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp 2012-01-04 22:40:36 UTC (rev 104078)
@@ -2221,10 +2221,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
