cc: Trigger GPU rasterization based on a per-layer hint

cc/base/switches.cc

Index: cc/base/switches.cc
diff --git a/cc/base/switches.cc b/cc/base/switches.cc
index 1fb7ac98e37d6b3b87e1431a530bd25cd16a291e..90a8caff4053d6ec5532e90b494d3fc268acab92 100644
--- a/cc/base/switches.cc
+++ b/cc/base/switches.cc
@@ -4,6 +4,8 @@
 
 #include "cc/base/switches.h"
 
+#include <string>
+
 #include "base/command_line.h"
 
 namespace cc {
@@ -14,37 +16,15 @@ namespace switches {
 const char kBackgroundColorInsteadOfCheckerboard[] =
     "background-color-instead-of-checkerboard";
 
-// 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";
 
@@ -131,13 +111,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";
 
@@ -151,56 +124,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