Remove --background-color-instead-of-checkerboard flag.

This is now unused on all platforms.

R=aelias
BUG=350142

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

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

12 files changed, 9 insertions, 23 deletions

diff --git a/cc/base/switches.cc b/cc/base/switches.cc
index 1fb7ac9..72bb14e 100644
--- a/cc/base/switches.cc
+++ b/cc/base/switches.cc
@@ -9,11 +9,6 @@
 namespace cc {
 namespace switches {
 
-// On platforms where checkerboards are used, prefer background colors instead
-// of checkerboards.
-const char kBackgroundColorInsteadOfCheckerboard[] =
-    "background-color-instead-of-checkerboard";
-
 // Disables LCD text.
 const char kDisableLCDText[] = "disable-lcd-text";
 
diff --git a/cc/base/switches.h b/cc/base/switches.h
index 689f0e9..cedb041 100644
--- a/cc/base/switches.h
+++ b/cc/base/switches.h
@@ -16,7 +16,6 @@ namespace cc {
 namespace switches {
 
 // Switches for the renderer compositor only.
-CC_EXPORT extern const char kBackgroundColorInsteadOfCheckerboard[];
 CC_EXPORT extern const char kDisableLCDText[];
 CC_EXPORT extern const char kDisableGPURasterization[];
 CC_EXPORT extern const char kDisableImplSidePainting[];
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 97d3753..312ae97 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -298,7 +298,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
   }
 
   void SetDrawCheckerboardForMissingTiles(bool checkerboard);
-  bool DrawCheckerboardForMissingTiles() const {
+  bool draw_checkerboard_for_missing_tiles() const {
     return draw_checkerboard_for_missing_tiles_;
   }
 
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 46fa012..dc5d85b 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -464,11 +464,6 @@ InputHandler::ScrollStatus LayerImpl::TryScroll(
   return InputHandler::ScrollStarted;
 }
 
-bool LayerImpl::DrawCheckerboardForMissingTiles() const {
-  return draw_checkerboard_for_missing_tiles_ &&
-      !layer_tree_impl()->settings().background_color_instead_of_checkerboard;
-}
-
 gfx::Rect LayerImpl::LayerRectToContentRect(
     const gfx::RectF& layer_rect) const {
   gfx::RectF content_rect =
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index e1fcfc1..856151e 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -425,7 +425,9 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   void SetDrawCheckerboardForMissingTiles(bool checkerboard) {
     draw_checkerboard_for_missing_tiles_ = checkerboard;
   }
-  bool DrawCheckerboardForMissingTiles() const;
+  bool draw_checkerboard_for_missing_tiles() const {
+    return draw_checkerboard_for_missing_tiles_;
+  }
 
   InputHandler::ScrollStatus TryScroll(
       const gfx::PointF& screen_space_point,
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 7242bae..e439e8d 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -564,8 +564,10 @@ TEST_F(LayerTest, CheckPropertyChangeCausesCorrectBehavior) {
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetDoubleSided(false));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetTouchEventHandlerRegion(
       gfx::Rect(10, 10)));
-  EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetDrawCheckerboardForMissingTiles(
-      !test_layer->DrawCheckerboardForMissingTiles()));
+  EXPECT_SET_NEEDS_COMMIT(
+      1,
+      test_layer->SetDrawCheckerboardForMissingTiles(
+          !test_layer->draw_checkerboard_for_missing_tiles()));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetForceRenderSurface(true));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHideLayerAndSubtree(true));
 
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index f2c3c3e..b8a4ff7 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -222,7 +222,7 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
     gfx::Rect geometry_rect = iter.geometry_rect();
     gfx::Rect visible_geometry_rect = geometry_rect;
     if (!*iter || !iter->IsReadyToDraw()) {
-      if (DrawCheckerboardForMissingTiles()) {
+      if (draw_checkerboard_for_missing_tiles()) {
         // TODO(enne): Figure out how to show debug "invalidated checker" color
         scoped_ptr<CheckerboardDrawQuad> quad = CheckerboardDrawQuad::Create();
         SkColor color = DebugColors::DefaultCheckerboardColor();
diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc
index 647e3af..08be4bd 100644
--- a/cc/trees/layer_tree_settings.cc
+++ b/cc/trees/layer_tree_settings.cc
@@ -21,7 +21,6 @@ LayerTreeSettings::LayerTreeSettings()
       per_tile_painting_enabled(false),
       partial_swap_enabled(false),
       accelerated_animation_enabled(true),
-      background_color_instead_of_checkerboard(false),
       show_overdraw_in_tracing(false),
       can_use_lcd_text(true),
       should_clear_root_render_pass(true),
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
index 0a48b47..53cdc67 100644
--- a/cc/trees/layer_tree_settings.h
+++ b/cc/trees/layer_tree_settings.h
@@ -26,7 +26,6 @@ class CC_EXPORT LayerTreeSettings {
   bool per_tile_painting_enabled;
   bool partial_swap_enabled;
   bool accelerated_animation_enabled;
-  bool background_color_instead_of_checkerboard;
   bool show_overdraw_in_tracing;
   bool can_use_lcd_text;
   bool should_clear_root_render_pass;
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
index b00d259..0ede82c 100644
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -156,7 +156,6 @@ std::string DeriveCommandLine(const GURL& start_url,
       // Please keep these in alphabetical order. Non-UI Compositor switches
       // here should also be added to
       // content/browser/renderer_host/render_process_host_impl.cc.
-      cc::switches::kBackgroundColorInsteadOfCheckerboard,
       cc::switches::kCompositeToMailbox,
       cc::switches::kDisableCompositedAntialiasing,
       cc::switches::kDisableCompositorTouchHitTesting,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 0657776..8bb7d71 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1094,7 +1094,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kWebGLCommandBufferSizeKb,
     // Please keep these in alphabetical order. Compositor switches here should
     // also be added to chrome/browser/chromeos/login/chrome_restart_request.cc.
-    cc::switches::kBackgroundColorInsteadOfCheckerboard,
     cc::switches::kCompositeToMailbox,
     cc::switches::kDisableCompositedAntialiasing,
     cc::switches::kDisableCompositorTouchHitTesting,
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 8eeeb99..d5d8880 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -167,8 +167,6 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
         settings.top_controls_hide_threshold = hide_threshold;
   }
 
-  settings.background_color_instead_of_checkerboard =
-      cmd->HasSwitch(cc::switches::kBackgroundColorInsteadOfCheckerboard);
   settings.show_overdraw_in_tracing =
       cmd->HasSwitch(cc::switches::kTraceOverdraw);
   settings.can_use_lcd_text = cc::switches::IsLCDTextEnabled();
@@ -240,7 +238,6 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
   settings.use_map_image = cc::switches::IsMapImageEnabled();
 
 #if defined(OS_ANDROID)
-  // TODO(danakj): Move these to the android code.
   settings.max_partial_texture_updates = 0;
   settings.scrollbar_animator = cc::LayerTreeSettings::LinearFade;
   settings.solid_color_scrollbar_color =