| 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 491dc13e68ee64ffa81e78ba8fc125103a95d27c..29d3bcf05feed4d11a40f3a6c90dddc89dd72aff 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -176,7 +176,7 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
|
|
|
| settings.throttle_frame_production =
|
| !cmd->HasSwitch(switches::kDisableGpuVsync);
|
| - settings.begin_frame_scheduling_enabled =
|
| + settings.use_external_begin_frame_source =
|
| cmd->HasSwitch(switches::kEnableBeginFrameScheduling);
|
| settings.main_frame_before_activation_enabled =
|
| cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) &&
|
| @@ -540,14 +540,14 @@ void RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) {
|
| #if defined(OS_ANDROID)
|
| if (SynchronousCompositorFactory* factory =
|
| SynchronousCompositorFactory::GetInstance()) {
|
| - DCHECK(settings.begin_frame_scheduling_enabled);
|
| + DCHECK(settings.use_external_begin_frame_source);
|
| external_begin_frame_source =
|
| factory->CreateExternalBeginFrameSource(widget_->routing_id());
|
| }
|
| #endif
|
| if (render_thread &&
|
| !external_begin_frame_source.get() &&
|
| - settings.begin_frame_scheduling_enabled) {
|
| + settings.use_external_begin_frame_source) {
|
| external_begin_frame_source.reset(new CompositorExternalBeginFrameSource(
|
| widget_->routing_id()));
|
| }
|
|
|