cc: Rename VSync to BeginFrame

content/renderer/gpu/render_widget_compositor.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/gpu/render_widget_compositor.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 76 matching lines @@
   CommandLine* cmd = CommandLine::ForCurrentProcess();
 
   cc::LayerTreeSettings settings;
 
   // For web contents, layer transforms should scale up the contents of layers
   // to keep content always crisp when possible.
   settings.layer_transforms_should_scale_layer_contents = true;
 
   settings.accelerate_painting =
       cmd->HasSwitch(switches::kEnableAcceleratedPainting);
-  settings.render_vsync_enabled = !cmd->HasSwitch(switches::kDisableGpuVsync);
-  settings.render_vsync_notification_enabled =
+  settings.throttle_frame_production =
+      !cmd->HasSwitch(switches::kDisableGpuVsync);
+  settings.render_parent_drives_begin_impl_frame_ =
       cmd->HasSwitch(switches::kEnableVsyncNotification);
-  settings.synchronously_disable_vsync = widget->SynchronouslyDisableVSync();
+  settings.using_synchronous_renderer_compositor =
+      widget->UsingSynchronousRendererCompositor();
   settings.per_tile_painting_enabled =
       cmd->HasSwitch(cc::switches::kEnablePerTilePainting);
   settings.accelerated_animation_enabled =
       !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation);
 
   int default_tile_width = settings.default_tile_size.width();
   if (cmd->HasSwitch(switches::kDefaultTileWidth)) {
     GetSwitchValueAsInt(*cmd, switches::kDefaultTileWidth, 1,
                         std::numeric_limits<int>::max(), &default_tile_width);
   }
@@ skipping 384 matching lines @@
   debug_state.show_debug_borders = show;
   layer_tree_host_->SetDebugState(debug_state);
 }
 
 void RenderWidgetCompositor::setContinuousPaintingEnabled(bool enabled) {
   cc::LayerTreeDebugState debug_state = layer_tree_host_->debug_state();
   debug_state.continuous_painting = enabled;
   layer_tree_host_->SetDebugState(debug_state);
 }
 
-void RenderWidgetCompositor::WillBeginFrame() {
+void RenderWidgetCompositor::WillBeginMainFrame() {
   widget_->InstrumentWillBeginFrame();
   widget_->willBeginCompositorFrame();

[jamesr, 2013/05/16 21:23:40]

WillBeginMainFrame() is now inconsistent with the devtools instrumentation. 
What's the plan for fixing that?

 }
 
-void RenderWidgetCompositor::DidBeginFrame() {
+void RenderWidgetCompositor::DidBeginMainFrame() {
   widget_->InstrumentDidBeginFrame();
 }
 
 void RenderWidgetCompositor::Animate(double frame_begin_time) {
   widget_->webwidget()->animate(frame_begin_time);
 }
 
 void RenderWidgetCompositor::Layout() {
   widget_->webwidget()->layout();
 }
@@ skipping 49 matching lines @@
   return RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
 }
 
 scoped_refptr<cc::ContextProvider>
 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() {
   return RenderThreadImpl::current()->
       OffscreenContextProviderForCompositorThread();
 }
 
 }  // namespace content