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

Side by Side Diff: cc/scheduler/scheduler_settings.cc

Issue 609003002: cc:: Remove main_frame_before_draw_enabled from scheduler settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove DCHECK Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « cc/scheduler/scheduler_settings.h ('k') | cc/scheduler/scheduler_state_machine.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/scheduler/scheduler_settings.h" 5 #include "cc/scheduler/scheduler_settings.h"
6 6
7 #include "base/debug/trace_event_argument.h" 7 #include "base/debug/trace_event_argument.h"
8 #include "cc/trees/layer_tree_settings.h" 8 #include "cc/trees/layer_tree_settings.h"
9 9
10 namespace cc { 10 namespace cc {
11 11
12 SchedulerSettings::SchedulerSettings() 12 SchedulerSettings::SchedulerSettings()
13 : begin_frame_scheduling_enabled(true), 13 : begin_frame_scheduling_enabled(true),
14 main_frame_before_draw_enabled(true),
15 main_frame_before_activation_enabled(false), 14 main_frame_before_activation_enabled(false),
16 impl_side_painting(false), 15 impl_side_painting(false),
17 timeout_and_draw_when_animation_checkerboards(true), 16 timeout_and_draw_when_animation_checkerboards(true),
18 maximum_number_of_failed_draws_before_draw_is_forced_(3), 17 maximum_number_of_failed_draws_before_draw_is_forced_(3),
19 using_synchronous_renderer_compositor(false), 18 using_synchronous_renderer_compositor(false),
20 throttle_frame_production(true) { 19 throttle_frame_production(true) {
21 } 20 }
22 21
23 SchedulerSettings::SchedulerSettings(const LayerTreeSettings& settings) 22 SchedulerSettings::SchedulerSettings(const LayerTreeSettings& settings)
24 : begin_frame_scheduling_enabled(settings.begin_frame_scheduling_enabled), 23 : begin_frame_scheduling_enabled(settings.begin_frame_scheduling_enabled),
25 main_frame_before_draw_enabled(settings.main_frame_before_draw_enabled),
26 main_frame_before_activation_enabled( 24 main_frame_before_activation_enabled(
27 settings.main_frame_before_activation_enabled), 25 settings.main_frame_before_activation_enabled),
28 impl_side_painting(settings.impl_side_painting), 26 impl_side_painting(settings.impl_side_painting),
29 timeout_and_draw_when_animation_checkerboards( 27 timeout_and_draw_when_animation_checkerboards(
30 settings.timeout_and_draw_when_animation_checkerboards), 28 settings.timeout_and_draw_when_animation_checkerboards),
31 maximum_number_of_failed_draws_before_draw_is_forced_( 29 maximum_number_of_failed_draws_before_draw_is_forced_(
32 settings.maximum_number_of_failed_draws_before_draw_is_forced_), 30 settings.maximum_number_of_failed_draws_before_draw_is_forced_),
33 using_synchronous_renderer_compositor( 31 using_synchronous_renderer_compositor(
34 settings.using_synchronous_renderer_compositor), 32 settings.using_synchronous_renderer_compositor),
35 throttle_frame_production(settings.throttle_frame_production) { 33 throttle_frame_production(settings.throttle_frame_production) {
36 } 34 }
37 35
38 SchedulerSettings::~SchedulerSettings() {} 36 SchedulerSettings::~SchedulerSettings() {}
39 37
40 scoped_refptr<base::debug::ConvertableToTraceFormat> 38 scoped_refptr<base::debug::ConvertableToTraceFormat>
41 SchedulerSettings::AsValue() const { 39 SchedulerSettings::AsValue() const {
42 scoped_refptr<base::debug::TracedValue> state = 40 scoped_refptr<base::debug::TracedValue> state =
43 new base::debug::TracedValue(); 41 new base::debug::TracedValue();
44 state->SetBoolean("begin_frame_scheduling_enabled", 42 state->SetBoolean("begin_frame_scheduling_enabled",
45 begin_frame_scheduling_enabled); 43 begin_frame_scheduling_enabled);
46 state->SetBoolean("main_frame_before_draw_enabled",
47 main_frame_before_draw_enabled);
48 state->SetBoolean("main_frame_before_activation_enabled", 44 state->SetBoolean("main_frame_before_activation_enabled",
49 main_frame_before_activation_enabled); 45 main_frame_before_activation_enabled);
50 state->SetBoolean("impl_side_painting", impl_side_painting); 46 state->SetBoolean("impl_side_painting", impl_side_painting);
51 state->SetBoolean("timeout_and_draw_when_animation_checkerboards", 47 state->SetBoolean("timeout_and_draw_when_animation_checkerboards",
52 timeout_and_draw_when_animation_checkerboards); 48 timeout_and_draw_when_animation_checkerboards);
53 state->SetInteger("maximum_number_of_failed_draws_before_draw_is_forced_", 49 state->SetInteger("maximum_number_of_failed_draws_before_draw_is_forced_",
54 maximum_number_of_failed_draws_before_draw_is_forced_); 50 maximum_number_of_failed_draws_before_draw_is_forced_);
55 state->SetBoolean("using_synchronous_renderer_compositor", 51 state->SetBoolean("using_synchronous_renderer_compositor",
56 using_synchronous_renderer_compositor); 52 using_synchronous_renderer_compositor);
57 state->SetBoolean("throttle_frame_production", throttle_frame_production); 53 state->SetBoolean("throttle_frame_production", throttle_frame_production);
58 return state; 54 return state;
59 } 55 }
60 56
61 } // namespace cc 57 } // namespace cc
OLDNEW
« no previous file with comments | « cc/scheduler/scheduler_settings.h ('k') | cc/scheduler/scheduler_state_machine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698