Merge 95926 - <rdar://problem/10156263> ASSERT in WebCore::FrameView::scheduleRelayoutOfSubtree

Source/WebCore/rendering/RenderObject.cpp

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);
+        }
     }
 }