summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorjdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 22:37:18 +0000
committerjdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 22:37:18 +0000
commit2263cef845fe0e8e7411f9164254f298868f766d (patch)
tree0b9690b88378574a55eb4236271667f7695bcce9 /cc
parent62e65f0cc982cf66eb00a1a2fc40fb6d82510e31 (diff)
downloadchromium_src-2263cef845fe0e8e7411f9164254f298868f766d.zip
chromium_src-2263cef845fe0e8e7411f9164254f298868f766d.tar.gz
chromium_src-2263cef845fe0e8e7411f9164254f298868f766d.tar.bz2
Create content switches for frame scheduling and input manager
The new scheduling approach consists of both changes to how frames are scheduled and when input events are processed. This patch renames a switch for the former and adds a switch for the latter, to be used for ongoing development. BUG=240945 Review URL: https://chromiumcodereview.appspot.com/16043002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/base/switches.cc3
-rw-r--r--cc/base/switches.h1
-rw-r--r--cc/trees/layer_tree_host_unittest.cc6
-rw-r--r--cc/trees/layer_tree_settings.cc3
-rw-r--r--cc/trees/layer_tree_settings.h3
-rw-r--r--cc/trees/thread_proxy.cc8
-rw-r--r--cc/trees/thread_proxy.h2
7 files changed, 10 insertions, 16 deletions
diff --git a/cc/base/switches.cc b/cc/base/switches.cc
index 57984af..7e4995a 100644
--- a/cc/base/switches.cc
+++ b/cc/base/switches.cc
@@ -29,9 +29,6 @@ const char kDisableImplSidePainting[] = "disable-impl-side-painting";
// Paint content on the compositor thread instead of the main thread.
const char kEnableImplSidePainting[] = "enable-impl-side-painting";
-// Try to finish display pipeline before vsync tick
-const char kEnableRightAlignedScheduling[] = "enable-right-aligned-scheduling";
-
const char kEnableTopControlsPositionCalculation[] =
"enable-top-controls-position-calculation";
diff --git a/cc/base/switches.h b/cc/base/switches.h
index 32c3826..ef4839f 100644
--- a/cc/base/switches.h
+++ b/cc/base/switches.h
@@ -22,7 +22,6 @@ CC_EXPORT extern const char kDisableImplSidePainting[];
CC_EXPORT extern const char kDisableThreadedAnimation[];
CC_EXPORT extern const char kEnableCompositorFrameMessage[];
CC_EXPORT extern const char kEnableImplSidePainting[];
-CC_EXPORT extern const char kEnableRightAlignedScheduling[];
CC_EXPORT extern const char kEnableTopControlsPositionCalculation[];
CC_EXPORT extern const char kForceDirectLayerDrawing[];
CC_EXPORT extern const char kJankInsteadOfCheckerboard[];
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index b80c5b0..65b8e24 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -2247,7 +2247,7 @@ SINGLE_THREAD_TEST_F(LayerTreeHostTestLCDNotification);
class LayerTreeHostTestBeginFrameNotification : public LayerTreeHostTest {
public:
virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
- settings->render_parent_drives_begin_frame_ = true;
+ settings->begin_frame_scheduling_enabled = true;
}
virtual void BeginTest() OVERRIDE {
@@ -2297,7 +2297,7 @@ class LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled
: public LayerTreeHostTest {
public:
virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
- settings->render_parent_drives_begin_frame_ = true;
+ settings->begin_frame_scheduling_enabled = true;
settings->using_synchronous_renderer_compositor = true;
}
@@ -2320,7 +2320,7 @@ MULTI_THREAD_TEST_F(
class LayerTreeHostTestInputDrivenRendering : public LayerTreeHostTest {
public:
virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
- settings->render_parent_drives_begin_frame_ = true;
+ settings->begin_frame_scheduling_enabled = true;
}
virtual void BeginTest() OVERRIDE {
diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc
index 422dbc8..3f262cb 100644
--- a/cc/trees/layer_tree_settings.cc
+++ b/cc/trees/layer_tree_settings.cc
@@ -16,12 +16,11 @@ LayerTreeSettings::LayerTreeSettings()
: compositor_frame_message(false),
impl_side_painting(false),
throttle_frame_production(true),
- render_parent_drives_begin_frame_(false),
+ begin_frame_scheduling_enabled(false),
using_synchronous_renderer_compositor(false),
per_tile_painting_enabled(false),
partial_swap_enabled(false),
cache_render_pass_contents(true),
- right_aligned_scheduling_enabled(false),
accelerated_animation_enabled(true),
background_color_instead_of_checkerboard(false),
show_overdraw_in_tracing(false),
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
index e7c0f45..2f33f77 100644
--- a/cc/trees/layer_tree_settings.h
+++ b/cc/trees/layer_tree_settings.h
@@ -23,12 +23,11 @@ class CC_EXPORT LayerTreeSettings {
bool compositor_frame_message;
bool impl_side_painting;
bool throttle_frame_production;
- bool render_parent_drives_begin_frame_;
+ bool begin_frame_scheduling_enabled;
bool using_synchronous_renderer_compositor;
bool per_tile_painting_enabled;
bool partial_swap_enabled;
bool cache_render_pass_contents;
- bool right_aligned_scheduling_enabled;
bool accelerated_animation_enabled;
bool background_color_instead_of_checkerboard;
bool show_overdraw_in_tracing;
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index c807427..7d7a888e 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -60,8 +60,8 @@ ThreadProxy::ThreadProxy(LayerTreeHost* layer_tree_host,
next_frame_is_newly_committed_frame_on_impl_thread_(false),
throttle_frame_production_(
layer_tree_host->settings().throttle_frame_production),
- render_parent_drives_begin_frame__(
- layer_tree_host->settings().render_parent_drives_begin_frame_),
+ begin_frame_scheduling_enabled_(
+ layer_tree_host->settings().begin_frame_scheduling_enabled),
using_synchronous_renderer_compositor_(
layer_tree_host->settings().using_synchronous_renderer_compositor),
vsync_client_(NULL),
@@ -1116,7 +1116,7 @@ void ThreadProxy::InitializeImplOnImplThread(CompletionEvent* completion) {
layer_tree_host_->settings().refresh_rate);
scoped_ptr<FrameRateController> frame_rate_controller;
if (throttle_frame_production_) {
- if (render_parent_drives_begin_frame__) {
+ if (begin_frame_scheduling_enabled_) {
frame_rate_controller.reset(
new FrameRateController(VSyncTimeSource::Create(
this,
@@ -1369,7 +1369,7 @@ void ThreadProxy::StartScrollbarAnimationOnImplThread() {
void ThreadProxy::DidReceiveLastInputEventForBeginFrameOnImplThread(
base::TimeTicks frame_time) {
- if (render_parent_drives_begin_frame__) {
+ if (begin_frame_scheduling_enabled_) {
TRACE_EVENT0("cc",
"ThreadProxy::DidReceiveLastInputEventForBeginFrameOnImplThread");
BeginFrameOnImplThread(frame_time);
diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
index 689e417..ebd228b 100644
--- a/cc/trees/thread_proxy.h
+++ b/cc/trees/thread_proxy.h
@@ -249,7 +249,7 @@ class ThreadProxy : public Proxy,
bool next_frame_is_newly_committed_frame_on_impl_thread_;
bool throttle_frame_production_;
- bool render_parent_drives_begin_frame__;
+ bool begin_frame_scheduling_enabled_;
bool using_synchronous_renderer_compositor_;
VSyncClient* vsync_client_;
generated by cgit v1.1 at 2025-03-14 02:23:32 +0000