cc: Move scheduling logic out of OutputSurface

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/message_loop_proxy.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
@@ skipping 112 matching lines @@
   }
 
   OnSwapAck(output_surface_id, *layout_test_previous_frame_ack_);
 
   layout_test_previous_frame_ack_->gl_frame_data = gl_frame_data.Pass();
   layout_test_previous_frame_ack_->last_software_frame_id =
       software_frame_data ? software_frame_data->id : 0;
 }
 
 void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
+  if (is_lost_)
+    return;
+
   if (layout_test_mode_ && use_swap_compositor_frame_message_) {
     // This code path is here to support layout tests that are currently
     // doing a readback in the renderer instead of the browser. So they
     // are using deprecated code paths in the renderer and don't need to
     // actually swap anything to the browser. We shortcut the swap to the
     // browser here and just ack directly within the renderer process.
     // Once crbug.com/311404 is fixed, this can be removed.
 
     // This would indicate that crbug.com/311404 is being fixed, and this
     // block needs to be removed.
     DCHECK(!frame->delegated_frame_data);
 
     base::Closure closure =
         base::Bind(&CompositorOutputSurface::ShortcutSwapAck,
                    weak_ptrs_.GetWeakPtr(),
                    output_surface_id_,
                    base::Passed(&frame->gl_frame_data),
                    base::Passed(&frame->software_frame_data));
 
     if (context_provider_) {
       gpu::gles2::GLES2Interface* context = context_provider_->ContextGL();
       context->Flush();
       uint32 sync_point = context->InsertSyncPointCHROMIUM();
       context_provider_->ContextSupport()->SignalSyncPoint(sync_point, closure);
     } else {
       base::MessageLoopProxy::current()->PostTask(FROM_HERE, closure);
     }
-    DidSwapBuffers();
+    client_->DidSwapBuffers();
     return;
   }
 
   if (use_swap_compositor_frame_message_) {
     Send(new ViewHostMsg_SwapCompositorFrame(routing_id_,
                                              output_surface_id_,
                                              *frame));
-    DidSwapBuffers();
+    client_->DidSwapBuffers();
     return;
   }
 
   if (frame->gl_frame_data) {
     context_provider_->ContextGL()->ShallowFlushCHROMIUM();
     ContextProviderCommandBuffer* provider_command_buffer =
         static_cast<ContextProviderCommandBuffer*>(context_provider_.get());
     CommandBufferProxyImpl* command_buffer_proxy =
         provider_command_buffer->GetCommandBufferProxy();
     DCHECK(command_buffer_proxy);
     command_buffer_proxy->SetLatencyInfo(frame->metadata.latency_info);
   }
-
-  OutputSurface::SwapBuffers(frame);
 }
 
 void CompositorOutputSurface::OnMessageReceived(const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
   if (!HasClient())
     return;
   IPC_BEGIN_MESSAGE_MAP(CompositorOutputSurface, message)
     IPC_MESSAGE_HANDLER(ViewMsg_UpdateVSyncParameters,
                         OnUpdateVSyncParametersFromBrowser);
     IPC_MESSAGE_HANDLER(ViewMsg_SwapCompositorFrameAck, OnSwapAck);
     IPC_MESSAGE_HANDLER(ViewMsg_ReclaimCompositorResources, OnReclaimResources);
 #if defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(ViewMsg_BeginFrame, OnBeginFrame);
 #endif
   IPC_END_MESSAGE_MAP()
 }
 
 void CompositorOutputSurface::OnUpdateVSyncParametersFromBrowser(
     base::TimeTicks timebase,
     base::TimeDelta interval) {
   DCHECK(CalledOnValidThread());
   CommitVSyncParameters(timebase, interval);
 }
 
 #if defined(OS_ANDROID)
 void CompositorOutputSurface::SetNeedsBeginFrame(bool enable) {
   DCHECK(CalledOnValidThread());
   if (needs_begin_frame_ != enable)
     Send(new ViewHostMsg_SetNeedsBeginFrame(routing_id_, enable));
-  OutputSurface::SetNeedsBeginFrame(enable);
 }
 
 void CompositorOutputSurface::OnBeginFrame(const cc::BeginFrameArgs& args) {
   DCHECK(CalledOnValidThread());
-  BeginFrame(args);
+  client->BeginFrame(args);
 }
 #endif  // defined(OS_ANDROID)
 
 void CompositorOutputSurface::OnSwapAck(uint32 output_surface_id,
                                         const cc::CompositorFrameAck& ack) {
   // Ignore message if it's a stale one coming from a different output surface
   // (e.g. after a lost context).
   if (output_surface_id != output_surface_id_)
     return;
+  // Also ignore message if the current output surface's context is lost.
+  if (is_lost_)
+    return;
   ReclaimResources(&ack);
-  OnSwapBuffersComplete();
+  client_->DidSwapBuffersComplete();
 }
 
 void CompositorOutputSurface::OnReclaimResources(
     uint32 output_surface_id,
     const cc::CompositorFrameAck& ack) {
   // Ignore message if it's a stale one coming from a different output surface
   // (e.g. after a lost context).
   if (output_surface_id != output_surface_id_)
     return;
   ReclaimResources(&ack);
@@ skipping 38 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