Unified OutputSurface::SwapBuffers.

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"
@@ skipping 32 matching lines @@
   };
 
   return new IPC::ForwardingMessageFilter(
       messages_to_filter, arraysize(messages_to_filter),
       target_task_runner);
 }
 
 CompositorOutputSurface::CompositorOutputSurface(
     int32 routing_id,
     WebGraphicsContext3DCommandBufferImpl* context3D,
-    cc::SoftwareOutputDevice* software_device)
+    cc::SoftwareOutputDevice* software_device,
+    bool swap_buffers_via_ipc)
     : OutputSurface(scoped_ptr<WebKit::WebGraphicsContext3D>(context3D),
                     make_scoped_ptr(software_device)),
+      use_swap_compositor_frame_message_(swap_buffers_via_ipc),
       output_surface_filter_(
           RenderThreadImpl::current()->compositor_output_surface_filter()),
       routing_id_(routing_id),
       prefers_smoothness_(false),
       main_thread_handle_(base::PlatformThread::CurrentHandle()) {
   DCHECK(output_surface_filter_.get());
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  capabilities_.has_parent_compositor = command_line->HasSwitch(
-      switches::kEnableDelegatedRenderer);
   DetachFromThread();
   message_sender_ = RenderThreadImpl::current()->sync_message_filter();
   DCHECK(message_sender_.get());
 }
 
 CompositorOutputSurface::~CompositorOutputSurface() {
   DCHECK(CalledOnValidThread());
   if (!client_)
     return;
   UpdateSmoothnessTakesPriority(false);
@@ skipping 11 matching lines @@
 
   output_surface_proxy_ = new CompositorOutputSurfaceProxy(this);
   output_surface_filter_->AddRoute(
       routing_id_,
       base::Bind(&CompositorOutputSurfaceProxy::OnMessageReceived,
                  output_surface_proxy_));
 
   return true;
 }
 
-void CompositorOutputSurface::SendFrameToParentCompositor(
-    cc::CompositorFrame* frame) {
-  DCHECK(CalledOnValidThread());
-  Send(new ViewHostMsg_SwapCompositorFrame(routing_id_, *frame));
-}
+void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
+  if (use_swap_compositor_frame_message_) {
+    Send(new ViewHostMsg_SwapCompositorFrame(routing_id_, *frame));
+    return;
+  }
 
-void CompositorOutputSurface::SwapBuffers(
-    const ui::LatencyInfo& latency_info) {
+  if (frame->software_frame_data) {
+    PostSwapBuffersComplete();
+    return;
+  }
+
+  DCHECK(frame->gl_frame_data);
+
   WebGraphicsContext3DCommandBufferImpl* command_buffer =
       static_cast<WebGraphicsContext3DCommandBufferImpl*>(context3d());
   CommandBufferProxyImpl* command_buffer_proxy =
       command_buffer->GetCommandBufferProxy();
   DCHECK(command_buffer_proxy);
   context3d()->shallowFlushCHROMIUM();
-  command_buffer_proxy->SetLatencyInfo(latency_info);
-  OutputSurface::SwapBuffers(latency_info);
-}
+  command_buffer_proxy->SetLatencyInfo(frame->metadata.latency_info);
 
-void CompositorOutputSurface::PostSubBuffer(
-    gfx::Rect rect, const ui::LatencyInfo& latency_info) {
-  WebGraphicsContext3DCommandBufferImpl* command_buffer =
-      static_cast<WebGraphicsContext3DCommandBufferImpl*>(context3d());
-  CommandBufferProxyImpl* command_buffer_proxy =
-      command_buffer->GetCommandBufferProxy();
-  DCHECK(command_buffer_proxy);
-  context3d()->shallowFlushCHROMIUM();
-  command_buffer_proxy->SetLatencyInfo(latency_info);
-  OutputSurface::PostSubBuffer(rect, latency_info);
+  OutputSurface::SwapBuffers(frame);
 }
 
 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);
 #if defined(OS_ANDROID)
@@ skipping 14 matching lines @@
   Send(new ViewHostMsg_SetNeedsBeginFrame(routing_id_, enable));
 }
 
 void CompositorOutputSurface::OnBeginFrame(base::TimeTicks frame_time) {
   DCHECK(CalledOnValidThread());
   client_->BeginFrame(frame_time);
 }
 #endif  // defined(OS_ANDROID)
 
 void CompositorOutputSurface::OnSwapAck(const cc::CompositorFrameAck& ack) {
-  client_->OnSendFrameToParentCompositorAck(ack);
+  client_->OnSwapBuffersComplete(&ack);
 }
 
 bool CompositorOutputSurface::Send(IPC::Message* message) {
   return message_sender_->Send(message);
 }
 
 namespace {
 #if defined(OS_ANDROID)
   void SetThreadPriorityToIdle(base::PlatformThreadHandle handle) {
     base::PlatformThread::SetThreadPriority(
@@ skipping 28 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) {
     SetThreadPriorityToDefault(main_thread_handle_);
   }
   prefers_smoothness_ = prefers_smoothness;
 }
 
 }  // namespace content