Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: Source/WebCore/rendering/RenderObject.cpp

Issue 8052011: Merge 95926 - <rdar://problem/10156263> ASSERT in WebCore::FrameView::scheduleRelayoutOfSubtree (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/dynamic/subtree-unrooted-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderObject.cpp
===================================================================
--- Source/WebCore/rendering/RenderObject.cpp (revision 96116)
+++ Source/WebCore/rendering/RenderObject.cpp (working copy)
@@ -2249,10 +2249,12 @@
FrameView* view = toRenderView(this)->frameView();
if (view)
view->scheduleRelayout();
- } else if (parent()) {
- FrameView* v = view() ? view()->frameView() : 0;
- if (v)
- v->scheduleRelayoutOfSubtree(this);
+ } else {
+ RenderView* renderView;
+ if (isRooted(&renderView)) {
+ if (FrameView* frameView = renderView->frameView())
+ frameView->scheduleRelayoutOfSubtree(this);
+ }
}
}
« no previous file with comments | « LayoutTests/fast/dynamic/subtree-unrooted-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698