cc: Remove OutputSurfaceClient::DidSwapBuffers().

cc/trees/proxy_impl.cc

 // Copyright 2015 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/trees/proxy_impl.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 313 matching lines @@
     // other sources will eventually be removed and this will be the only path.
     scheduler_->SetBeginFrameSource(source);
   }
 }
 
 void ProxyImpl::SetEstimatedParentDrawTime(base::TimeDelta draw_time) {
   DCHECK(IsImplThread());
   scheduler_->SetEstimatedParentDrawTime(draw_time);
 }
 
-void ProxyImpl::DidSwapBuffersOnImplThread() {
-  DCHECK(IsImplThread());
-  scheduler_->DidSwapBuffers();
-}
-
 void ProxyImpl::DidSwapBuffersCompleteOnImplThread() {
   TRACE_EVENT0("cc,benchmark", "ProxyImpl::DidSwapBuffersCompleteOnImplThread");
   DCHECK(IsImplThread());
   scheduler_->DidSwapBuffersComplete();
   channel_impl_->DidCompleteSwapBuffers();
 }
 
 void ProxyImpl::OnCanDrawStateChanged(bool can_draw) {
   TRACE_EVENT1("cc", "ProxyImpl::OnCanDrawStateChanged", "can_draw", can_draw);
   DCHECK(IsImplThread());
@@ skipping 304 matching lines @@
     layer_tree_host_impl_->DrawLayers(&frame);
     result = DRAW_SUCCESS;
   } else {
     DCHECK_NE(DRAW_SUCCESS, result);
   }
   layer_tree_host_impl_->DidDrawAllLayers(frame);
 
   bool start_ready_animations = draw_frame;
   layer_tree_host_impl_->UpdateAnimationState(start_ready_animations);
 
-  if (draw_frame)
-    layer_tree_host_impl_->SwapBuffers(frame);
+  if (draw_frame) {
+    if (layer_tree_host_impl_->SwapBuffers(frame))
+      scheduler_->DidSwapBuffers();
+  }
 
   // Tell the main thread that the the newly-commited frame was drawn.
   if (next_frame_is_newly_committed_frame_) {
     next_frame_is_newly_committed_frame_ = false;
     channel_impl_->DidCommitAndDrawFrame();
   }
 
   DCHECK_NE(INVALID_RESULT, result);
   return result;
 }
 
 bool ProxyImpl::IsImplThread() const {
   return task_runner_provider_->IsImplThread();
 }
 
 bool ProxyImpl::IsMainThreadBlocked() const {
   return task_runner_provider_->IsMainThreadBlocked();
 }
 
 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() {
   DCHECK(IsMainThreadBlocked() && commit_completion_event_);
   return main_thread_blocked_commit_vars_unsafe_;
 }
 
 }  // namespace cc