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

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

Issue 423773002: Unified BeginFrame scheduling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 3 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
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 baf1ac13f675e9954fa11e1fbae7c52262119241..c1e0402bd162bfc8ec2473c33f193b88c527331d 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -169,8 +169,13 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
settings.throttle_frame_production =
!cmd->HasSwitch(switches::kDisableGpuVsync);
- settings.begin_frame_scheduling_enabled =
- cmd->HasSwitch(switches::kEnableBeginFrameScheduling);
+#if defined(OS_ANDROID) || (defined(USE_AURA) &&!defined(OS_CHROMEOS))
brianderson 2014/09/04 18:45:46 Why !OS_CHROMEOS? For platforms other than Mac, ca
+ settings.begin_frame_receiver = true;
+#elif defined(OS_MACOSX)
+ // Mac only uses browser compositor when delegated renderer is used.
+ if (cmd->HasSwitch(switches::kEnableDelegatedRenderer))
+ settings.begin_frame_receiver = true;
+#endif
settings.main_frame_before_activation_enabled =
cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) &&
!cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation);

Powered by Google App Engine
This is Rietveld 408576698