Chromium Code Reviews| Index: content/renderer/gpu/render_widget_compositor.cc |
| diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc |
| index 9a59785afdc02c7c63961dbd87d31b8c5c0c060a..46e3dc43932b2445b624962192af35c5962b2973 100644 |
| --- a/content/renderer/gpu/render_widget_compositor.cc |
| +++ b/content/renderer/gpu/render_widget_compositor.cc |
| @@ -94,10 +94,12 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create( |
| 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 = |
| @@ -502,12 +504,12 @@ void RenderWidgetCompositor::setContinuousPaintingEnabled(bool 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
|
| } |
| -void RenderWidgetCompositor::DidBeginFrame() { |
| +void RenderWidgetCompositor::DidBeginMainFrame() { |
| widget_->InstrumentDidBeginFrame(); |
| } |