Automated import from //branches/donutburger/...@141437,141437

diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 6d18ba1..0d73961 100644 (file)
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -1400,6 +1400,13 @@ bool RenderBlock::layoutOnlyPositionedObjects()
     if (hasOverflowClip())
         m_layer->updateScrollInfoAfterLayout();
 
+#ifdef ANDROID_FIX
+    // iframe flatten will call FrameView::layout() which calls performPostLayoutTasks, 
+    // which may make us need to layout again
+    if (!posChildNeedsLayout() || normalChildNeedsLayout() || selfNeedsLayout())
+        return false;
+#endif
+
     setNeedsLayout(false);
     return true;
 }