Merge WebKit at r76408: Initial merge by git.

Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53

1 files changed, 21 insertions, 0 deletions

diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
index 15bb8ec..9a5dda7 100644
--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -108,6 +108,7 @@ RenderLayerCompositor::RenderLayerCompositor(RenderView* renderView)
     , m_compositingDependsOnGeometry(false)
     , m_compositing(false)
     , m_compositingLayersNeedRebuild(false)
+    , m_flushingLayers(false)
     , m_rootLayerAttachment(RootLayerUnattached)
 #if PROFILE_LAYER_REBUILD
     , m_rootLayerUpdateCount(0)
@@ -188,12 +189,32 @@ void RenderLayerCompositor::scheduleLayerFlush()
 
 void RenderLayerCompositor::flushPendingLayerChanges()
 {
+    ASSERT(!m_flushingLayers);
+    m_flushingLayers = true;
+
     // FIXME: FrameView::syncCompositingStateRecursive() calls this for each
     // frame, so when compositing layers are connected between frames, we'll
     // end up syncing subframe's layers multiple times.
     // https://bugs.webkit.org/show_bug.cgi?id=52489
     if (GraphicsLayer* rootLayer = rootPlatformLayer())
         rootLayer->syncCompositingState();
+
+    ASSERT(m_flushingLayers);
+    m_flushingLayers = false;
+}
+
+RenderLayerCompositor* RenderLayerCompositor::enclosingCompositorFlushingLayers() const
+{
+    if (!m_renderView->frameView())
+        return 0;
+
+    for (Frame* frame = m_renderView->frameView()->frame(); frame; frame = frame->tree()->parent()) {
+        RenderLayerCompositor* compositor = frame->contentRenderer() ? frame->contentRenderer()->compositor() : 0;
+        if (compositor->isFlushingLayers())
+            return compositor;
+    }
+    
+    return 0;
 }
 
 void RenderLayerCompositor::scheduleCompositingLayerUpdate()