Turn off iframe compositing until it is more stable.

Change-Id: I2d54918b5910285bf7f1cfb408af8a6b038b65f9

diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 284c5fc..bac995d 100644 (file)
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -558,7 +558,7 @@ void FrameView::updateCompositingLayers()
     // Enter compositing mode for child frames that have layout dimensions.  The
     // decision to enable compositing for the RenderView will be done in the
     // compositor.
-    if (m_frame->ownerRenderer() && (layoutWidth() | layoutHeight()) && !view->usesCompositing()) {
+    if (false && m_frame->ownerRenderer() && (layoutWidth() | layoutHeight()) && !view->usesCompositing()) {
         ScrollbarMode h,v;
         scrollbarModes(h, v);
         if ((h != ScrollbarAlwaysOff && layoutWidth() < contentsWidth()) ||

diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp
index 00e596b..c6cd277 100644 (file)
--- a/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1178,7 +1178,7 @@ bool RenderLayerCompositor::requiresCompositingForMobileSites(const RenderLayer*
         return true;
     HTMLFrameOwnerElement* ownerElement = enclosingIFrameElement();
     RenderObject* renderer = ownerElement ? ownerElement->renderer() : 0;
-    if (layer->isRootLayer() && renderer && renderer->isRenderIFrame()) {
+    if (false && layer->isRootLayer() && renderer && renderer->isRenderIFrame()) {
         if (layer->renderer()->frame()) {
             FrameView* view = layer->renderer()->frame()->view();
             if (view) {