ui: Remove the --ui-disable-impl-side-painting flag.

R=jam@chromium.org
BUG=413479

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

Cr-Commit-Position: refs/heads/master@{#334737}

5 files changed, 4 insertions, 38 deletions

diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 823b25e..c3d5f75 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -123,7 +123,7 @@ Compositor::Compositor(gfx::AcceleratedWidget widget,
   settings.initial_debug_state.SetRecordRenderingStats(
       command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking));
 
-  settings.impl_side_painting = IsUIImplSidePaintingEnabled();
+  settings.impl_side_painting = true;
   settings.use_display_lists = IsUISlimmingPaintEnabled();
 
   settings.use_zero_copy = IsUIZeroCopyEnabled();
diff --git a/ui/compositor/compositor_switches.cc b/ui/compositor/compositor_switches.cc
index e4cad58..df96e10 100644
--- a/ui/compositor/compositor_switches.cc
+++ b/ui/compositor/compositor_switches.cc
@@ -20,8 +20,6 @@ const char kUIDisableThreadedCompositing[] = "ui-disable-threaded-compositing";
 const char kUIEnableCompositorAnimationTimelines[] =
     "ui-enable-compositor-animation-timelines";
 
-const char kUIDisableImplSidePainting[] = "ui-disable-impl-side-painting";
-
 const char kUIDisableSlimmingPaint[] = "ui-disable-slimming-paint";
 
 const char kUIEnableZeroCopy[] = "ui-enable-zero-copy";
@@ -32,13 +30,6 @@ const char kUIShowPaintRects[] = "ui-show-paint-rects";
 
 namespace ui {
 
-bool IsUIImplSidePaintingEnabled() {
-  const base::CommandLine& command_line =
-      *base::CommandLine::ForCurrentProcess();
-
-  return !command_line.HasSwitch(switches::kUIDisableImplSidePainting);
-}
-
 bool IsUIZeroCopyEnabled() {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
diff --git a/ui/compositor/compositor_switches.h b/ui/compositor/compositor_switches.h
index b5e5bac..bc3f569 100644
--- a/ui/compositor/compositor_switches.h
+++ b/ui/compositor/compositor_switches.h
@@ -14,7 +14,6 @@ COMPOSITOR_EXPORT extern const char kEnablePixelOutputInTests[];
 COMPOSITOR_EXPORT extern const char kUIDisableSlimmingPaint[];
 COMPOSITOR_EXPORT extern const char kUIDisableThreadedCompositing[];
 COMPOSITOR_EXPORT extern const char kUIEnableCompositorAnimationTimelines[];
-COMPOSITOR_EXPORT extern const char kUIDisableImplSidePainting[];
 COMPOSITOR_EXPORT extern const char kUIEnableZeroCopy[];
 COMPOSITOR_EXPORT extern const char kUIShowPaintRects[];
 
@@ -22,7 +21,6 @@ COMPOSITOR_EXPORT extern const char kUIShowPaintRects[];
 
 namespace ui {
 
-COMPOSITOR_EXPORT bool IsUIImplSidePaintingEnabled();
 bool IsUIZeroCopyEnabled();
 bool IsUIOneCopyEnabled();
 bool IsUISlimmingPaintEnabled();
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 895b39c..78b6bd75 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -14,7 +14,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/base/scoped_ptr_algorithm.h"
-#include "cc/layers/content_layer.h"
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/picture_layer.h"
@@ -47,15 +46,6 @@ const ui::Layer* GetRoot(const ui::Layer* layer) {
   return layer;
 }
 
-struct UIImplSidePaintingStatus {
-  UIImplSidePaintingStatus()
-      : enabled(ui::IsUIImplSidePaintingEnabled()) {
-  }
-  bool enabled;
-};
-base::LazyInstance<UIImplSidePaintingStatus> g_ui_impl_side_painting_status =
-    LAZY_INSTANCE_INITIALIZER;
-
 base::LazyInstance<cc::LayerSettings> g_ui_layer_settings =
     LAZY_INSTANCE_INITIALIZER;
 
@@ -134,11 +124,6 @@ Layer::~Layer() {
 }
 
 // static
-bool Layer::UsingPictureLayer() {
-  return g_ui_impl_side_painting_status.Get().enabled;
-}
-
-// static
 const cc::LayerSettings& Layer::UILayerSettings() {
   return g_ui_layer_settings.Get();
 }
@@ -543,11 +528,8 @@ void Layer::SwitchToLayer(scoped_refptr<cc::Layer> new_layer) {
 }
 
 void Layer::SwitchCCLayerForTest() {
-  scoped_refptr<cc::Layer> new_layer;
-  if (Layer::UsingPictureLayer())
-    new_layer = cc::PictureLayer::Create(UILayerSettings(), this);
-  else
-    new_layer = cc::ContentLayer::Create(UILayerSettings(), this);
+  scoped_refptr<cc::Layer> new_layer =
+      cc::PictureLayer::Create(UILayerSettings(), this);
   SwitchToLayer(new_layer);
   content_layer_ = new_layer;
 }
@@ -1063,10 +1045,7 @@ void Layer::CreateCcLayer() {
     nine_patch_layer_ = cc::NinePatchLayer::Create(UILayerSettings());
     cc_layer_ = nine_patch_layer_.get();
   } else {
-    if (Layer::UsingPictureLayer())
-      content_layer_ = cc::PictureLayer::Create(UILayerSettings(), this);
-    else
-      content_layer_ = cc::ContentLayer::Create(UILayerSettings(), this);
+    content_layer_ = cc::PictureLayer::Create(UILayerSettings(), this);
     cc_layer_ = content_layer_.get();
   }
   cc_layer_->SetTransformOrigin(gfx::Point3F());
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index 623e56c..23d1bdc 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -76,8 +76,6 @@ class COMPOSITOR_EXPORT Layer
   explicit Layer(LayerType type);
   ~Layer() override;
 
-  static bool UsingPictureLayer();
-
   static const cc::LayerSettings& UILayerSettings();
   static void InitializeUILayerSettings();