1 files changed, 16 insertions, 14 deletions
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp
index fd38f30..835d21e 100644..100755
--- a/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/WebCore/rendering/RenderLayerCompositor.cpp
@@ -864,6 +864,19 @@ void RenderLayerCompositor::frameViewDidScroll(const IntPoint& scrollPosition)
         m_scrollLayer->setPosition(FloatPoint(-scrollPosition.x(), -scrollPosition.y()));
 }
 
+String RenderLayerCompositor::layerTreeAsText()
+{
+    if (compositingLayerUpdatePending())
+        updateCompositingLayers();
+
+    if (!m_rootPlatformLayer)
+        return String();
+
+    // We skip dumping the scroll and clip layers to keep layerTreeAsText output
+    // similar between platforms.
+    return m_rootPlatformLayer->layerTreeAsText();
+}
+
 RenderLayerCompositor* RenderLayerCompositor::iframeContentsCompositor(RenderIFrame* renderer)
 {
     HTMLIFrameElement* element = static_cast<HTMLIFrameElement*>(renderer->node());
@@ -1368,16 +1381,9 @@ bool RenderLayerCompositor::needsContentsCompositingLayer(const RenderLayer* lay
 
 bool RenderLayerCompositor::requiresScrollLayer(RootLayerAttachment attachment) const
 {
-    if (attachment == RootLayerAttachedViaEnclosingIframe)
-        return true;
-
-#if PLATFORM(MAC)
-    // If we're viewless (i.e. WebKit2), we need to scroll ourselves.
-    // FIXME: eventually we should do this on other platforms too.
-    if (!m_renderView->frameView()->platformWidget())
-        return true;
-#endif
-    return false;
+    // We need to handle our own scrolling if we're:
+    return !m_renderView->frameView()->platformWidget() // viewless (i.e. non-Mac, or Mac in WebKit2)
+        || attachment == RootLayerAttachedViaEnclosingIframe; // a composited iframe on Mac
 }
 
 void RenderLayerCompositor::ensureRootPlatformLayer()
@@ -1430,10 +1436,6 @@ void RenderLayerCompositor::ensureRootPlatformLayer()
         }
     }
 
-    // The root layer does geometry flipping if we need it.
-    m_rootPlatformLayer->setGeometryOrientation(expectedAttachment == RootLayerAttachedViaEnclosingIframe
-        ? GraphicsLayer::CompositingCoordinatesTopDown : GraphicsLayer::compositingCoordinatesOrientation());
-
     // Check to see if we have to change the attachment
     if (m_rootLayerAttachment != RootLayerUnattached)
         detachRootPlatformLayer();