Revert 206020 "cc: Emulate BeginFrame in OutputSurfaces that don..."

trunk/src/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 50 matching lines @@
       prefers_smoothness_(false),
       main_thread_handle_(base::PlatformThread::CurrentHandle()) {
   DCHECK(output_surface_filter_.get());
   DetachFromThread();
   message_sender_ = RenderThreadImpl::current()->sync_message_filter();
   DCHECK(message_sender_.get());
 }
 
 CompositorOutputSurface::~CompositorOutputSurface() {
   DCHECK(CalledOnValidThread());
-  if (!HasClient())
+  if (!client_)
     return;
   UpdateSmoothnessTakesPriority(false);
   if (output_surface_proxy_.get())
     output_surface_proxy_->ClearOutputSurface();
   output_surface_filter_->RemoveRoute(routing_id_);
 }
 
 bool CompositorOutputSurface::BindToClient(
     cc::OutputSurfaceClient* client) {
   DCHECK(CalledOnValidThread());
 
   if (!cc::OutputSurface::BindToClient(client))
     return false;
 
   output_surface_proxy_ = new CompositorOutputSurfaceProxy(this);
   output_surface_filter_->AddRoute(
       routing_id_,
       base::Bind(&CompositorOutputSurfaceProxy::OnMessageReceived,
                  output_surface_proxy_));
 
   return true;
 }
 
 void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
   if (use_swap_compositor_frame_message_) {
     Send(new ViewHostMsg_SwapCompositorFrame(routing_id_, *frame));
-    DidSwapBuffers();
     return;
   }
 
   if (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(frame->metadata.latency_info);
   }
 
   OutputSurface::SwapBuffers(frame);
 }
 
 void CompositorOutputSurface::OnMessageReceived(const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
-  if (!HasClient())
+  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)
     IPC_MESSAGE_HANDLER(ViewMsg_BeginFrame, OnBeginFrame);
 #endif
   IPC_END_MESSAGE_MAP()
 }
 
 void CompositorOutputSurface::OnUpdateVSyncParameters(
     base::TimeTicks timebase, base::TimeDelta interval) {
   DCHECK(CalledOnValidThread());
-  OnVSyncParametersChanged(timebase, interval);
+  client_->OnVSyncParametersChanged(timebase, interval);
 }
 
 #if defined(OS_ANDROID)
 void CompositorOutputSurface::SetNeedsBeginFrame(bool enable) {
   DCHECK(CalledOnValidThread());
   Send(new ViewHostMsg_SetNeedsBeginFrame(routing_id_, enable));
-  OutputSurface::SetNeedsBeginFrame(enable);
 }
 
 void CompositorOutputSurface::OnBeginFrame(base::TimeTicks frame_time) {
   DCHECK(CalledOnValidThread());
-  BeginFrame(frame_time);
+  client_->BeginFrame(frame_time);
 }
 #endif  // defined(OS_ANDROID)
 
 void CompositorOutputSurface::OnSwapAck(const cc::CompositorFrameAck& ack) {
-  OnSwapBuffersComplete(&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