Revert 190067 "Re-land: cc: Enable solid color prediction by def..."

trunk/src/cc/base/switches.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/base/switches.h"
 
 #include "base/command_line.h"
 
 namespace cc {
 namespace switches {
 
 // On platforms where checkerboards are used, prefer background colors instead
 // of checkerboards.
 const char kBackgroundColorInsteadOfCheckerboard[] =
     "background-color-instead-of-checkerboard";
 
 const char kDisableThreadedAnimation[] = "disable-threaded-animation";
 
 // Send a message for every frame from the impl thread to the parent compositor.
 const char kEnableCompositorFrameMessage[] = "enable-compositor-frame-message";
 
-// Do not predict whether the tile will be either solid color or transparent.
-const char kDisableColorEstimator[] = "disable-color-estimator";
-
 // Paint content on the main thread instead of the compositor thread.
 // Overrides the kEnableImplSidePainting flag.
 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";
 
@@ skipping 24 matching lines @@
 
 // Re-rasters everything multiple times to simulate a much slower machine.
 // Give a scale factor to cause raster to take that many times longer to
 // complete, such as --slow-down-raster-scale-factor=25.
 const char kSlowDownRasterScaleFactor[] = "slow-down-raster-scale-factor";
 
 // Disable scheduling of rasterization jobs according to their estimated
 // processing cost.
 const char kDisableCheapnessEstimator[] = "disable-cheapness-estimator";
 
+// Predict whether the tile will be either solid color or transparent.
+const char kUseColorEstimator[] = "use-color-estimator";
+
 // The scale factor for low resolution tile contents.
 const char kLowResolutionContentsScaleFactor[] =
     "low-resolution-contents-scale-factor";
 
 // Causes the compositor to render to textures which are then sent to the parent
 // through the texture mailbox mechanism.
 // Requires --enable-compositor-frame-message.
 const char kCompositeToMailbox[] = "composite-to-mailbox";
 
 const char kEnablePartialSwap[] = "enable-partial-swap";
@@ skipping 56 matching lines @@
 
 #if defined(OS_ANDROID)
   return true;
 #else
   return false;
 #endif
 }
 
 }  // namespace switches
 }  // namespace cc