Add CCDelegatingRenderer, and corresponding IPCs

cc/CCLayerTreeHostImpl.cpp

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCLayerTreeHostImpl.h"
 
 #include "CCAppendQuadsData.h"
 #include "CCDamageTracker.h"
 #include "CCDebugRectHistory.h"
 #include "CCDelayBasedTimeSource.h"
+#include "CCDelegatingRenderer.h"
 #include "CCFontAtlas.h"
 #include "CCFrameRateCounter.h"
 #include "CCHeadsUpDisplayLayerImpl.h"
 #include "CCLayerIterator.h"
 #include "CCLayerTreeHost.h"
 #include "CCLayerTreeHostCommon.h"
 #include "CCMathUtil.h"
 #include "CCOverdrawMetrics.h"
 #include "CCPageScaleAnimation.h"
 #include "CCPrioritizedTextureManager.h"
@@ skipping 491 matching lines @@
 
     ASSERT(bytes);
     m_client->setNeedsCommitOnImplThread();
 }
 
 void CCLayerTreeHostImpl::onVSyncParametersChanged(double monotonicTimebase, double intervalInSeconds)
 {
     m_client->onVSyncParametersChanged(monotonicTimebase, intervalInSeconds);
 }
 
+void CCLayerTreeHostImpl::onSendFrameToParentCompositorAck(const WebKit::WebCompositorFrameAck& ack)
+{
+    if (m_renderer)
+        m_renderer->onSendFrameToParentCompositorAck(ack);
+}
+
 void CCLayerTreeHostImpl::drawLayers(const FrameData& frame)
 {
     TRACE_EVENT0("cc", "CCLayerTreeHostImpl::drawLayers");
     ASSERT(canDraw());
     ASSERT(!frame.renderPasses.isEmpty());
 
     // FIXME: use the frame begin time from the overall compositor scheduler.
     // This value is currently inaccessible because it is up in Chromium's
     // RenderWidget.
     m_fpsCounter->markBeginningOfFrame(currentTime());
@@ skipping 147 matching lines @@
 
     WebKit::WebGraphicsContext3D* context3d = context->context3D();
 
     if (!context3d) {
         // FIXME: Implement this path for software compositing.
         return false;
     }
 
     OwnPtr<CCGraphicsContext> contextRef(context);
     OwnPtr<CCResourceProvider> resourceProvider = CCResourceProvider::create(contextRef.get(), textureUploader);
-    OwnPtr<CCRendererGL> renderer;
-    if (resourceProvider.get())
-        renderer = CCRendererGL::create(this, resourceProvider.get());
+    OwnPtr<CCRenderer> renderer;
+    if (resourceProvider.get()) {
+        if (contextRef->capabilities().hasParentCompositor)
+            renderer = CCDelegatingRenderer::create(this, resourceProvider.get());
+        else
+            renderer = CCRendererGL::create(this, resourceProvider.get());

[danakj, 2012/09/21 20:51:41]

We've become inconsistent in our naming of renderers now. Are we going to use
PrefixRenderer or RendererSuffix?

+    }
 
     // Since we now have a new context/renderer, we cannot continue to use the old
     // resources (i.e. renderSurfaces and texture IDs).
     if (m_rootLayerImpl) {
         clearRenderSurfaces();
         sendDidLoseContextRecursive(m_rootLayerImpl.get());
     }
 
     m_renderer = renderer.release();
     m_resourceProvider = resourceProvider.release();
@@ skipping 559 matching lines @@
 
     CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimationController();
     if (scrollbarController && scrollbarController->animate(monotonicTime))
         m_client->setNeedsRedrawOnImplThread();
 
     for (size_t i = 0; i < layer->children().size(); ++i)
         animateScrollbarsRecursive(layer->children()[i].get(), monotonicTime);
 }
 
 } // namespace WebCore