Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1262)

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 1124523003: Revert of Enable BeginFrame scheduling on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/common/content_switches.cc ('k') | ui/compositor/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6eb57c9c71f99f5dc080364546e23fb227161635..f3f6489daee1f0e3dec61487b979322f8e8fe52d 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -233,13 +233,12 @@
settings.use_compositor_animation_timelines = true;
blink::WebRuntimeFeatures::enableCompositorAnimationTimelines(true);
}
-#if !defined(OS_MACOSX)
- if (!widget_->for_oopif()) {
+ 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;
}
-#endif
settings.default_tile_size = CalculateDefaultTileSize(widget_);
if (cmd->HasSwitch(switches::kDefaultTileWidth)) {
« no previous file with comments | « content/public/common/content_switches.cc ('k') | ui/compositor/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698