Plumb cc::LatencyInfo through command buffer and output surface

content/renderer/gpu/compositor_output_surface.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/gpu/compositor_output_surface.h"
 
 #include "base/command_line.h"
 #include "base/message_loop_proxy.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/output_surface_client.h"
+#include "content/common/gpu/client/command_buffer_proxy_impl.h"
+#include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/render_thread_impl.h"
 #include "ipc/ipc_forwarding_message_filter.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 
 #if defined(OS_ANDROID)
 // TODO(epenner): Move thread priorities to base. (crbug.com/170549)
@@ skipping 23 matching lines @@
     ViewMsg_SwapCompositorFrameAck::ID
   };
 
   return new IPC::ForwardingMessageFilter(
       messages_to_filter, arraysize(messages_to_filter),
       target_task_runner);
 }
 
 CompositorOutputSurface::CompositorOutputSurface(
     int32 routing_id,
-    WebGraphicsContext3D* context3D,
+    WebGraphicsContext3DCommandBufferImpl* context3D,
     cc::SoftwareOutputDevice* software_device)
-    : OutputSurface(make_scoped_ptr(context3D),
+    : OutputSurface(scoped_ptr<WebKit::WebGraphicsContext3D>(context3D),
                     make_scoped_ptr(software_device)),
       output_surface_filter_(
           RenderThreadImpl::current()->compositor_output_surface_filter()),
       routing_id_(routing_id),
       prefers_smoothness_(false),
       main_thread_id_(base::PlatformThread::CurrentId()) {
   DCHECK(output_surface_filter_);
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   capabilities_.has_parent_compositor = command_line->HasSwitch(
       switches::kEnableDelegatedRenderer);
@@ skipping 25 matching lines @@
 
   return true;
 }
 
 void CompositorOutputSurface::SendFrameToParentCompositor(
     cc::CompositorFrame* frame) {
   DCHECK(CalledOnValidThread());
   Send(new ViewHostMsg_SwapCompositorFrame(routing_id_, *frame));
 }
 
+void CompositorOutputSurface::SwapBuffers(
+    const cc::LatencyInfo& latency_info) {
+  WebGraphicsContext3DCommandBufferImpl* command_buffer =
+      static_cast<WebGraphicsContext3DCommandBufferImpl*>(context3d());
+  CommandBufferProxyImpl* command_buffer_proxy =
+      command_buffer->GetCommandBufferProxy();
+  if (command_buffer_proxy) {

[piman, 2013/04/03 18:05:09]

I think DCHECK is enough. If we're able to send commands through the context, we
have a CommandBufferProxyImpl.

+    context3d()->flush();

[piman, 2013/04/03 18:05:09]

nit: shallowFlush

+    command_buffer_proxy->SetLatencyInfo(latency_info);
+  }
+  OutputSurface::SwapBuffers(latency_info);
+}
+
+void CompositorOutputSurface::PostSubBuffer(
+    gfx::Rect rect, const cc::LatencyInfo& latency_info) {
+  WebGraphicsContext3DCommandBufferImpl* command_buffer =
+      static_cast<WebGraphicsContext3DCommandBufferImpl*>(context3d());
+  CommandBufferProxyImpl* command_buffer_proxy =
+      command_buffer->GetCommandBufferProxy();
+  if (command_buffer_proxy) {

[piman, 2013/04/03 18:05:09]

just DCHECK

+    context3d()->flush();

[piman, 2013/04/03 18:05:09]

nit: shallowFlush

+    command_buffer_proxy->SetLatencyInfo(latency_info);
+  }
+  OutputSurface::PostSubBuffer(rect, latency_info);
+}
+
 void CompositorOutputSurface::OnMessageReceived(const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
   if (!client_)
     return;
   IPC_BEGIN_MESSAGE_MAP(CompositorOutputSurface, message)
     IPC_MESSAGE_HANDLER(ViewMsg_UpdateVSyncParameters, OnUpdateVSyncParameters);
     IPC_MESSAGE_HANDLER(ViewMsg_SwapCompositorFrameAck, OnSwapAck);
   IPC_END_MESSAGE_MAP()
 }
 
@@ skipping 48 matching lines @@
   // If this is the last surface to stop preferring smoothness,
   // Reset the main thread's priority to the default.
   if (prefers_smoothness_ == true &&
       --g_prefer_smoothness_count == 0) {
     SetThreadsPriorityToDefault(main_thread_id_);
   }
   prefers_smoothness_ = prefers_smoothness;
 }
 
 }  // namespace content