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

Source/WebCore/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 2231 matching lines @@
 {
     return false;
 }
 
 void RenderObject::scheduleRelayout()
 {
     if (isRenderView()) {
         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);
+        }
     }
 }
 
 void RenderObject::layout()
 {
     ASSERT(needsLayout());
     RenderObject* child = firstChild();
     while (child) {
         child->layoutIfNeeded();
         ASSERT(!child->needsLayout());
@@ skipping 448 matching lines @@
 {
     if (object1) {
         const WebCore::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif