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 1835121df0d180053a0ccf3d88218f6cb70dce8e..3b4b3b34c476f6a81a684994bd26382b6cb248e6 100644 |
--- a/content/renderer/gpu/render_widget_compositor.cc |
+++ b/content/renderer/gpu/render_widget_compositor.cc |
@@ -221,8 +221,6 @@ void RenderWidgetCompositor::Initialize() { |
settings.throttle_frame_production = |
!cmd->HasSwitch(switches::kDisableGpuVsync); |
- settings.use_external_begin_frame_source = |
- cmd->HasSwitch(switches::kEnableBeginFrameScheduling); |
settings.main_frame_before_activation_enabled = |
cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) && |
!cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation); |
@@ -235,6 +233,12 @@ void RenderWidgetCompositor::Initialize() { |
settings.use_compositor_animation_timelines = true; |
blink::WebRuntimeFeatures::enableCompositorAnimationTimelines(true); |
} |
+ if (cmd->HasSwitch(switches::kEnableBeginFrameScheduling) && |
+ !widget_->for_oopif()) { |
+ // TODO(simonhong): Apply BeginFrame scheduling for OOPIF. |
+ // See crbug.com/471411. |
+ settings.use_external_begin_frame_source = true; |
+ } |
settings.default_tile_size = CalculateDefaultTileSize(widget_); |
if (cmd->HasSwitch(switches::kDefaultTileWidth)) { |