Define a --force-gpu-rasterization flag

This flag forces gpu rasterization for all layers (that is, it behaves the
way --enable-gpu-rasterization behaved previously).

--enable-gpu-rasterization now enables gpu rasterization only on layers
that have a GPU rasterization hint. Since this hint will be added in a
later CL, this flag is currently a no-op.

BUG=329722

Review URL: https://codereview.chromium.org/189883009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256143 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 93 deletions

diff --git a/cc/base/switches.cc b/cc/base/switches.cc
index 72bb14e..6ebf6d6 100644
--- a/cc/base/switches.cc
+++ b/cc/base/switches.cc
@@ -9,37 +9,15 @@
 namespace cc {
 namespace switches {
 
-// Disables LCD text.
-const char kDisableLCDText[] = "disable-lcd-text";
-
 const char kDisableThreadedAnimation[] = "disable-threaded-animation";
 
 // Disables layer-edge anti-aliasing in the compositor.
 const char kDisableCompositedAntialiasing[] =
     "disable-composited-antialiasing";
 
-// Paint content on the main thread instead of the compositor thread.
-// Overrides the kEnableImplSidePainting flag.
-const char kDisableImplSidePainting[] = "disable-impl-side-painting";
-
-// Enables LCD text.
-const char kEnableLCDText[] = "enable-lcd-text";
-
-// Paint content on the compositor thread instead of the main thread.
-const char kEnableImplSidePainting[] = "enable-impl-side-painting";
-
 const char kEnableTopControlsPositionCalculation[] =
     "enable-top-controls-position-calculation";
 
-// Allow heuristics to determine when a layer tile should be drawn with
-// the Skia GPU backend.  Only valid with GPU accelerated compositing +
-// impl-side painting.
-const char kEnableGPURasterization[] = "enable-gpu-rasterization";
-
-// Disable GPU rasterization, i.e. rasterize on the CPU only.
-// Overrides the kEnableGPURasterization flag.
-const char kDisableGPURasterization[] = "disable-gpu-rasterization";
-
 // The height of the movable top controls.
 const char kTopControlsHeight[] = "top-controls-height";
 
@@ -126,13 +104,6 @@ const char kUIShowOccludingRects[] = "ui-show-occluding-rects";
 const char kShowNonOccludingRects[] = "show-nonoccluding-rects";
 const char kUIShowNonOccludingRects[] = "ui-show-nonoccluding-rects";
 
-// Enable rasterizer that writes directly to GPU memory.
-const char kEnableMapImage[] = "enable-map-image";
-
-// Disable rasterizer that writes directly to GPU memory.
-// Overrides the kEnableMapImage flag.
-const char kDisableMapImage[] = "disable-map-image";
-
 // Prevents the layer tree unit tests from timing out.
 const char kCCLayerTreeTestNoTimeout[] = "cc-layer-tree-test-no-timeout";
 
@@ -146,56 +117,5 @@ const char kDisable4444Textures[] = "disable-4444-textures";
 const char kDisableCompositorTouchHitTesting[] =
     "disable-compositor-touch-hit-testing";
 
-bool IsLCDTextEnabled() {
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kDisableLCDText))
-    return false;
-  else if (command_line->HasSwitch(switches::kEnableLCDText))
-    return true;
-
-#if defined(OS_ANDROID)
-  return false;
-#else
-  return true;
-#endif
-}
-
-bool IsGpuRasterizationEnabled() {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-
-  if (command_line.HasSwitch(switches::kDisableGPURasterization))
-    return false;
-  else if (command_line.HasSwitch(switches::kEnableGPURasterization))
-    return true;
-
-  return false;
-}
-
-bool IsImplSidePaintingEnabled() {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-
-  if (command_line.HasSwitch(switches::kDisableImplSidePainting))
-    return false;
-  else if (command_line.HasSwitch(switches::kEnableImplSidePainting))
-    return true;
-
-#if defined(OS_ANDROID)
-  return true;
-#else
-  return false;
-#endif
-}
-
-bool IsMapImageEnabled() {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-
-  if (command_line.HasSwitch(switches::kDisableMapImage))
-    return false;
-  else if (command_line.HasSwitch(switches::kEnableMapImage))
-    return true;
-
-  return false;
-}
-
 }  // namespace switches
 }  // namespace cc
diff --git a/cc/base/switches.h b/cc/base/switches.h
index cedb041..46548b3 100644
--- a/cc/base/switches.h
+++ b/cc/base/switches.h
@@ -16,15 +16,9 @@ namespace cc {
 namespace switches {
 
 // Switches for the renderer compositor only.
-CC_EXPORT extern const char kDisableLCDText[];
-CC_EXPORT extern const char kDisableGPURasterization[];
-CC_EXPORT extern const char kDisableImplSidePainting[];
 CC_EXPORT extern const char kDisableThreadedAnimation[];
 CC_EXPORT extern const char kDisableCompositedAntialiasing[];
-CC_EXPORT extern const char kEnableLCDText[];
-CC_EXPORT extern const char kEnableImplSidePainting[];
 CC_EXPORT extern const char kEnableTopControlsPositionCalculation[];
-CC_EXPORT extern const char kEnableGPURasterization[];
 CC_EXPORT extern const char kJankInsteadOfCheckerboard[];
 CC_EXPORT extern const char kTopControlsHeight[];
 CC_EXPORT extern const char kTopControlsHideThreshold[];
@@ -36,8 +30,6 @@ CC_EXPORT extern const char kMaxTilesForInterestArea[];
 CC_EXPORT extern const char kMaxUnusedResourceMemoryUsagePercentage[];
 CC_EXPORT extern const char kEnablePinchVirtualViewport[];
 CC_EXPORT extern const char kStrictLayerPropertyChangeChecking[];
-CC_EXPORT extern const char kEnableMapImage[];
-CC_EXPORT extern const char kDisableMapImage[];
 CC_EXPORT extern const char kDisable4444Textures[];
 CC_EXPORT extern const char kDisableCompositorTouchHitTesting[];
 
@@ -69,11 +61,6 @@ CC_EXPORT extern const char kUIShowNonOccludingRects[];
 CC_EXPORT extern const char kCCLayerTreeTestNoTimeout[];
 CC_EXPORT extern const char kCCRebaselinePixeltests[];
 
-CC_EXPORT bool IsLCDTextEnabled();
-CC_EXPORT bool IsGpuRasterizationEnabled();
-CC_EXPORT bool IsImplSidePaintingEnabled();
-CC_EXPORT bool IsMapImageEnabled();
-
 }  // namespace switches
 }  // namespace cc