summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-27 21:03:46 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-27 21:03:46 +0000
commitc1ffd4759d14426a69fcc83e23d410bb93c7106d (patch)
treef889a5fe7c119d5e9d4c977df6bd9b70e5d244dd /cc
parent940ed1d3ca01d6fee795a585cedfb3759bee03ab (diff)
downloadchromium_src-c1ffd4759d14426a69fcc83e23d410bb93c7106d.zip
chromium_src-c1ffd4759d14426a69fcc83e23d410bb93c7106d.tar.gz
chromium_src-c1ffd4759d14426a69fcc83e23d410bb93c7106d.tar.bz2
[cc] Rename to --enable-impl-side-painting, route to render process, and expose on settings
I added an --enable on expectation that we'll eventually need a disable flag as this becomes more solid. The rest should be straightforward, I think. BUG=155209 R=enne@chromium.org,sky@chromium.org Review URL: https://codereview.chromium.org/11413178 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/layer_tree_host.cc1
-rw-r--r--cc/layer_tree_host.h1
-rw-r--r--cc/switches.cc6
-rw-r--r--cc/switches.h2
4 files changed, 6 insertions, 4 deletions
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index b423eb7..25d3d27 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -38,6 +38,7 @@ bool LayerTreeHost::s_needsFilterContext = false;
LayerTreeSettings::LayerTreeSettings()
: acceleratePainting(false)
+ , implSidePainting(false)
, showDebugBorders(false)
, showPlatformLayerTree(false)
, showPaintRects(false)
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index ec8708d..c140b31 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -55,6 +55,7 @@ struct CC_EXPORT LayerTreeSettings {
~LayerTreeSettings();
bool acceleratePainting;
+ bool implSidePainting;
bool showDebugBorders;
bool showPlatformLayerTree;
bool showPaintRects;
diff --git a/cc/switches.cc b/cc/switches.cc
index 4094ff0..b7670b7 100644
--- a/cc/switches.cc
+++ b/cc/switches.cc
@@ -14,6 +14,9 @@ const char kBackgroundColorInsteadOfCheckerboard[] =
const char kDisableThreadedAnimation[] = "disable-threaded-animation";
+// Paint content on the compositor thread instead of the main thread.
+const char kEnableImplSidePainting[] = "enable-impl-side-painting";
+
const char kEnablePartialSwap[] = "enable-partial-swap";
const char kEnablePerTilePainting[] = "enable-per-tile-painting";
@@ -22,9 +25,6 @@ const char kEnablePerTilePainting[] = "enable-per-tile-painting";
// compositor.
const char kEnablePinchInCompositor[] = "enable-pinch-in-compositor";
-// Paint content on the compositor thread instead of the main thread.
-const char kImplSidePainting[] = "impl-side-painting";
-
// Show rects in the HUD around layers whose properties have changed.
const char kShowPropertyChangedRects[] = "show-property-changed-rects";
diff --git a/cc/switches.h b/cc/switches.h
index 31e5cb6a..f7c3485 100644
--- a/cc/switches.h
+++ b/cc/switches.h
@@ -17,10 +17,10 @@ namespace switches {
CC_EXPORT extern const char kBackgroundColorInsteadOfCheckerboard[];
CC_EXPORT extern const char kDisableThreadedAnimation[];
+CC_EXPORT extern const char kEnableImplSidePainting[];
CC_EXPORT extern const char kEnablePartialSwap[];
CC_EXPORT extern const char kEnablePerTilePainting[];
CC_EXPORT extern const char kEnablePinchInCompositor[];
-CC_EXPORT extern const char kImplSidePainting[];
CC_EXPORT extern const char kJankInsteadOfCheckerboard[];
CC_EXPORT extern const char kShowPropertyChangedRects[];
CC_EXPORT extern const char kShowSurfaceDamageRects[];