Revert "Enable iframe scrolling."

This reverts commit 27dd9e051d0960e985cb677bfc1ce20531ac0456.

1 files changed, 3 insertions, 14 deletions

diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp
index 00e596b..ce80e5a 100644
--- a/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1178,20 +1178,9 @@ bool RenderLayerCompositor::requiresCompositingForMobileSites(const RenderLayer*
         return true;
     HTMLFrameOwnerElement* ownerElement = enclosingIFrameElement();
     RenderObject* renderer = ownerElement ? ownerElement->renderer() : 0;
-    if (layer->isRootLayer() && renderer && renderer->isRenderIFrame()) {
-        if (layer->renderer()->frame()) {
-            FrameView* view = layer->renderer()->frame()->view();
-            if (view) {
-                // Enable compositing if the frame can scroll and the contents
-                // are larger than the layout dimensions.
-                ScrollbarMode h,v;
-                view->scrollbarModes(h, v);
-                if ((h != ScrollbarAlwaysOff && view->layoutWidth() < view->contentsWidth()) ||
-                    (v != ScrollbarAlwaysOff && view->layoutHeight() < view->contentsHeight()))
-                    return true;
-            }
-        }
-    }
+    // FIXME: Disabled for now until navigation is fixed.
+    if (false && layer->isRootLayer() && renderer && renderer->isRenderIFrame())
+        return true;
 #endif
 #if ENABLE(COMPOSITED_FIXED_ELEMENTS)
     // First, check if we are in an iframe, and if so bail out