cc: Rename VSync to BeginFrame

content/renderer/android/synchronous_compositor_output_surface.cc

 // Copyright (c) 2013 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/android/synchronous_compositor_output_surface.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 75 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SoftwareDevice);
 };
 
 SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(
     int32 routing_id)
     : cc::OutputSurface(CreateWebGraphicsContext3D(),
                         scoped_ptr<cc::SoftwareOutputDevice>(
                             new SoftwareDevice(this))),
       compositor_client_(NULL),
       routing_id_(routing_id),
-      vsync_enabled_(false),
+      needs_begin_frame_(false),
       did_swap_buffer_(false),
       current_sw_canvas_(NULL) {
   capabilities_.deferred_gl_initialization = true;
 }
 
 SynchronousCompositorOutputSurface::~SynchronousCompositorOutputSurface() {
   DCHECK(CalledOnValidThread());
   if (compositor_client_)
     compositor_client_->DidDestroyCompositor(this);
 }
@@ skipping 15 matching lines @@
 void SynchronousCompositorOutputSurface::Reshape(gfx::Size size) {
   // Intentional no-op: surface size is controlled by the embedder.
 }
 
 void SynchronousCompositorOutputSurface::SendFrameToParentCompositor(
     cc::CompositorFrame* frame) {
   NOTREACHED();
   // TODO(joth): Route page scale to the client, see http://crbug.com/237006
 }
 
-void SynchronousCompositorOutputSurface::EnableVSyncNotification(
-    bool enable_vsync) {
+void SynchronousCompositorOutputSurface::SetNeedsBeginFrame(
+    bool enable) {
   DCHECK(CalledOnValidThread());
-  vsync_enabled_ = enable_vsync;
+  needs_begin_frame_ = enable;
   UpdateCompositorClientSettings();
 }
 
 void SynchronousCompositorOutputSurface::SwapBuffers(
     const cc::LatencyInfo& info) {
   context3d()->shallowFlushCHROMIUM();
   did_swap_buffer_ = true;
 }
 
 void SynchronousCompositorOutputSurface::SetClient(
@@ skipping 44 matching lines @@
 
   return did_swap_buffer_;
 }
 
 void SynchronousCompositorOutputSurface::InvokeComposite(
     const gfx::Transform& transform,
     gfx::Rect damage_area) {
   // TODO(boliu): This assumes |transform| is identity and |damage_area| is the
   // whole view. Tracking bug to implement this: crbug.com/230463.
   client_->SetNeedsRedrawRect(damage_area);
-  if (vsync_enabled_)
-    client_->DidVSync(base::TimeTicks::Now());
+  if (needs_begin_frame_)
+    client_->BeginFrame(base::TimeTicks::Now());
 }
 
 void SynchronousCompositorOutputSurface::UpdateCompositorClientSettings() {
   if (compositor_client_) {
-    compositor_client_->SetContinuousInvalidate(vsync_enabled_);
+    compositor_client_->SetContinuousInvalidate(needs_begin_frame_);
   }
 }
 
 // Not using base::NonThreadSafe as we want to enforce a more exacting threading
 // requirement: SynchronousCompositorOutputSurface() must only be used by
 // embedders that supply their own compositor loop via
 // OverrideCompositorMessageLoop().
 bool SynchronousCompositorOutputSurface::CalledOnValidThread() const {
   return base::MessageLoop::current() && (base::MessageLoop::current() ==
       GetContentClient()->renderer()->OverrideCompositorMessageLoop());
 }
 
 }  // namespace content