Plumb cc::LatencyInfo through command buffer and output surface

content/renderer/render_widget.cc

 // Copyright (c) 2012 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 "content/renderer/render_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 532 matching lines @@
 
 GURL RenderWidget::GetURLForGraphicsContext3D() {
   return GURL();
 }
 
 bool RenderWidget::ForceCompositingModeEnabled() {
   return false;
 }
 
 scoped_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface() {
+  CommandBufferProxyImpl* proxy = NULL;
   // Explicitly disable antialiasing for the compositor. As of the time of
   // this writing, the only platform that supported antialiasing for the
   // compositor was Mac OS X, because the on-screen OpenGL context creation
   // code paths on Windows and Linux didn't yet have multisampling support.
   // Mac OS X essentially always behaves as though it's rendering offscreen.
   // Multisampling has a heavy cost especially on devices with relatively low
   // fill rate like most notebooks, and the Mac implementation would need to
   // be optimized to resolve directly into the IOSurface shared between the
   // GPU and browser processes. For these reasons and to avoid platform
   // disparities we explicitly disable antialiasing.
   WebKit::WebGraphicsContext3D::Attributes attributes;
   attributes.antialias = false;
   attributes.shareResources = true;
   attributes.noAutomaticFlushes = true;
-  WebGraphicsContext3D* context = CreateGraphicsContext3D(attributes);
+  WebGraphicsContext3D* context = CreateGraphicsContext3D(attributes, &proxy);
   if (!context)
     return scoped_ptr<cc::OutputSurface>();
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableSoftwareCompositingGLAdapter)) {
       // In the absence of a software-based delegating renderer, use this
       // stopgap adapter class to present the software renderer output using a
       // 3d context.
       return scoped_ptr<cc::OutputSurface>(
-          new CompositorOutputSurface(routing_id(), NULL,
+          new CompositorOutputSurface(routing_id(), NULL, NULL,
               new CompositorSoftwareOutputDeviceGLAdapter(context)));
   } else {
       bool composite_to_mailbox =
           command_line.HasSwitch(cc::switches::kCompositeToMailbox);
       DCHECK(!composite_to_mailbox || command_line.HasSwitch(
           cc::switches::kEnableCompositorFrameMessage));
       // No swap throttling yet when compositing on the main thread.
       DCHECK(!composite_to_mailbox || is_threaded_compositing_enabled_);
       return scoped_ptr<cc::OutputSurface>(composite_to_mailbox ?
-          new MailboxOutputSurface(routing_id(), context, NULL) :
-              new CompositorOutputSurface(routing_id(), context, NULL));
+          new MailboxOutputSurface(routing_id(), context, proxy, NULL) :
+              new CompositorOutputSurface(routing_id(), context, proxy, NULL));
   }
 }
 
 void RenderWidget::OnViewContextSwapBuffersAborted() {
   TRACE_EVENT0("renderer", "RenderWidget::OnSwapBuffersAborted");
   while (!updates_pending_swap_.empty()) {
     ViewHostMsg_UpdateRect* msg = updates_pending_swap_.front();
     updates_pending_swap_.pop_front();
     // msg can be NULL if the swap doesn't correspond to an DoDeferredUpdate
     // compositing pass, hence doesn't require an UpdateRect message.
@@ skipping 1650 matching lines @@
 bool RenderWidget::WillHandleGestureEvent(
     const WebKit::WebGestureEvent& event) {
   return false;
 }
 
 bool RenderWidget::HasTouchEventHandlersAt(const gfx::Point& point) const {
   return true;
 }
 
 WebGraphicsContext3D* RenderWidget::CreateGraphicsContext3D(
-    const WebGraphicsContext3D::Attributes& attributes) {
+    const WebGraphicsContext3D::Attributes& attributes,
+    CommandBufferProxyImpl** proxy) {
   if (!webwidget_)
     return NULL;
   // The WebGraphicsContext3DInProcessImpl code path is used for
   // layout tests (though not through this code) as well as for
   // debugging and bringing up new ports.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) {
     return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView(
         attributes, true);
   } else {
     scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context(
         new WebGraphicsContext3DCommandBufferImpl(
             surface_id(),
             GetURLForGraphicsContext3D(),
             RenderThreadImpl::current(),
             weak_ptr_factory_.GetWeakPtr()));
 
     if (!context->Initialize(
             attributes,
             false /* bind generates resources */,
             CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE))
       return NULL;
+    *proxy = context->GetCommandBufferProxy();
     return context.release();
   }
 }
 
 }  // namespace content