1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp
index f31ab9d..a115bfe 100644
--- a/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1193,10 +1193,6 @@ bool RenderLayerCompositor::requiresCompositingForAndroidLayers(const RenderLaye
         return true;
 #endif
 #if ENABLE(COMPOSITED_FIXED_ELEMENTS)
-    // First, check if we are in an iframe, and if so bail out
-    if (m_renderView->document()->frame()->tree()->parent())
-        return false;
-
     // For the moment, we want to only enable fixed composited layers on mobile websites.
     // Enable composited layers (for fixed elements)
     // We can consider a website as being a 'mobile' site if all the
@@ -1288,6 +1284,10 @@ bool RenderLayerCompositor::clippedByAncestor(RenderLayer* layer) const
 // into the hierarchy between this layer and its children in the z-order hierarchy.
 bool RenderLayerCompositor::clipsCompositingDescendants(const RenderLayer* layer) const
 {
+#if ENABLE(ANDROID_OVERFLOW_SCROLL)
+    if (layer->hasOverflowScroll())
+        return false;
+#endif
     return layer->hasCompositingDescendant() &&
            (layer->renderer()->hasOverflowClip() || layer->renderer()->hasClip());
 }