cc: Move scheduling logic out of OutputSurface

cc/test/fake_output_surface.cc

 // Copyright 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 "cc/test/fake_output_surface.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/output_surface_client.h"
@@ skipping 45 matching lines @@
       fake_weak_ptr_factory_(this) {
   if (delegated_rendering) {
     capabilities_.delegated_rendering = true;
     capabilities_.max_frames_pending = 1;
   }
 }
 
 FakeOutputSurface::~FakeOutputSurface() {}
 
 void FakeOutputSurface::SwapBuffers(CompositorFrame* frame) {
+  if (is_lost_)
+    return;
+
   if (frame->software_frame_data || frame->delegated_frame_data ||
       !context_provider()) {
     frame->AssignTo(&last_sent_frame_);
 
     if (last_sent_frame_.delegated_frame_data) {
       resources_held_by_parent_.insert(
           resources_held_by_parent_.end(),
           last_sent_frame_.delegated_frame_data->resource_list.begin(),
           last_sent_frame_.delegated_frame_data->resource_list.end());
     }
 
     ++num_sent_frames_;
     PostSwapBuffersComplete();
-    DidSwapBuffers();
+    client_->DidSwapBuffers();
   } else {
     OutputSurface::SwapBuffers(frame);
     frame->AssignTo(&last_sent_frame_);
     ++num_sent_frames_;
   }
 }
 
 void FakeOutputSurface::SetNeedsBeginFrame(bool enable) {
   needs_begin_frame_ = enable;
   OutputSurface::SetNeedsBeginFrame(enable);
 
-  // If there is not BeginFrame emulation from the FrameRateController,
-  // then we just post a BeginFrame to emulate it as part of the test.
-  if (enable && !frame_rate_controller_) {
+  if (enable) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeOutputSurface::OnBeginFrame,
                    fake_weak_ptr_factory_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(16));
   }
 }
 
 void FakeOutputSurface::OnBeginFrame() {
-  OutputSurface::BeginFrame(BeginFrameArgs::CreateForTesting());
+  client_->BeginFrame(BeginFrameArgs::CreateForTesting());
 }
 
 
 bool FakeOutputSurface::ForcedDrawToSoftwareDevice() const {
   return forced_draw_to_software_device_;
 }
 
 bool FakeOutputSurface::BindToClient(OutputSurfaceClient* client) {
   if (OutputSurface::BindToClient(client)) {
     client_ = client;
@@ skipping 29 matching lines @@
 bool FakeOutputSurface::HasExternalStencilTest() const {
   return has_external_stencil_test_;
 }
 
 void FakeOutputSurface::SetMemoryPolicyToSetAtBind(
     scoped_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind) {
   memory_policy_to_set_at_bind_.swap(memory_policy_to_set_at_bind);
 }
 
 }  // namespace cc