| 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 4e68d22ac34082b738dede4ef1b04e6211479608..1ea1f2a7e89fbab707959c29bba37c1cfde84478 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -240,8 +240,10 @@
|
| params.task_graph_runner = compositor_deps_->GetTaskGraphRunner();
|
| params.main_task_runner =
|
| compositor_deps_->GetCompositorMainThreadTaskRunner();
|
| - params.external_begin_frame_source =
|
| - delegate_->CreateExternalBeginFrameSource();
|
| + if (settings.use_external_begin_frame_source) {
|
| + params.external_begin_frame_source =
|
| + delegate_->CreateExternalBeginFrameSource();
|
| + }
|
| params.animation_host = cc::AnimationHost::CreateMainInstance();
|
|
|
| if (cmd->HasSwitch(switches::kUseRemoteCompositing)) {
|
| @@ -487,6 +489,8 @@
|
| settings.create_low_res_tiling = true;
|
| if (cmd.HasSwitch(switches::kDisableLowResTiling))
|
| settings.create_low_res_tiling = false;
|
| + if (!cmd.HasSwitch(cc::switches::kDisableBeginFrameScheduling))
|
| + settings.use_external_begin_frame_source = true;
|
|
|
| if (cmd.HasSwitch(switches::kEnableRGBA4444Textures) &&
|
| !cmd.HasSwitch(switches::kDisableRGBA4444Textures)) {
|
| @@ -507,6 +511,10 @@
|
|
|
| settings.use_cached_picture_raster =
|
| !cmd.HasSwitch(cc::switches::kDisableCachedPictureRaster);
|
| +
|
| + if (cmd.HasSwitch(switches::kUseRemoteCompositing) ||
|
| + cmd.HasSwitch(switches::kIsRunningInMash))
|
| + settings.use_external_begin_frame_source = false;
|
|
|
| return settings;
|
| }
|
|
|