Index: cc/trees/layer_tree_settings.cc |
diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc |
index 80e356e0c3a80fa5e71602242a7c0df12a1a4d66..5aa97c765435667e6ed80dfad5097348c78dcdfd 100644 |
--- a/cc/trees/layer_tree_settings.cc |
+++ b/cc/trees/layer_tree_settings.cc |
@@ -10,6 +10,8 @@ |
#include "base/command_line.h" |
#include "base/logging.h" |
#include "base/strings/string_number_conversions.h" |
+#include "cc/base/switches.h" |
+#include "ui/gl/gl_switches.h" |
namespace cc { |
@@ -81,6 +83,8 @@ LayerTreeSettings::LayerTreeSettings() |
LayerTreeSettings::~LayerTreeSettings() {} |
SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const { |
+ base::CommandLine* cmd = base::CommandLine::ForCurrentProcess(); |
+ |
SchedulerSettings scheduler_settings; |
scheduler_settings.use_external_begin_frame_source = |
use_external_begin_frame_source; |
@@ -93,8 +97,12 @@ SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const { |
maximum_number_of_failed_draws_before_draw_is_forced_; |
scheduler_settings.using_synchronous_renderer_compositor = |
using_synchronous_renderer_compositor; |
+ |
scheduler_settings.throttle_frame_production = |
- !renderer_settings.disable_gpu_vsync; |
+ (cmd->HasSwitch(::switches::kDisableGpuVsync) |
brianderson
2015/06/24 01:16:45
We try to avoid checking the command line flags di
Jimmy Jo
2015/06/24 09:38:31
Done.
|
+ ? false |
+ : !cmd->HasSwitch(switches::kDisableCompositorVsync)); |
+ |
scheduler_settings.main_thread_should_always_be_low_latency = false; |
scheduler_settings.background_frame_interval = |
base::TimeDelta::FromSecondsD(1.0 / background_animation_rate); |