Remove LayerTreeSettings::impl_side_painting.

It's always true, and we don't branch on it ever. So it can go.

R=enne, vmpstr
TBR=jam,aelias
BUG=413479
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

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

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

11 files changed, 3 insertions, 16 deletions

diff --git a/cc/scheduler/scheduler_settings.cc b/cc/scheduler/scheduler_settings.cc
index cb45ac3..d1d3a6f 100644
--- a/cc/scheduler/scheduler_settings.cc
+++ b/cc/scheduler/scheduler_settings.cc
@@ -12,7 +12,6 @@ SchedulerSettings::SchedulerSettings()
     : use_external_begin_frame_source(false),
       main_frame_while_swap_throttled_enabled(false),
       main_frame_before_activation_enabled(false),
-      impl_side_painting(true),
       commit_to_active_tree(false),
       timeout_and_draw_when_animation_checkerboards(true),
       using_synchronous_renderer_compositor(false),
@@ -33,7 +32,6 @@ SchedulerSettings::AsValue() const {
                     main_frame_while_swap_throttled_enabled);
   state->SetBoolean("main_frame_before_activation_enabled",
                     main_frame_before_activation_enabled);
-  state->SetBoolean("impl_side_painting", impl_side_painting);
   state->SetBoolean("commit_to_active_tree", commit_to_active_tree);
   state->SetBoolean("timeout_and_draw_when_animation_checkerboards",
                     timeout_and_draw_when_animation_checkerboards);
diff --git a/cc/scheduler/scheduler_settings.h b/cc/scheduler/scheduler_settings.h
index 985e456..e624cf8 100644
--- a/cc/scheduler/scheduler_settings.h
+++ b/cc/scheduler/scheduler_settings.h
@@ -26,7 +26,6 @@ class CC_EXPORT SchedulerSettings {
   bool use_external_begin_frame_source;
   bool main_frame_while_swap_throttled_enabled;
   bool main_frame_before_activation_enabled;
-  bool impl_side_painting;
   bool commit_to_active_tree;
   bool timeout_and_draw_when_animation_checkerboards;
   bool using_synchronous_renderer_compositor;
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 77ec0763..6cd5a6a 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -803,7 +803,6 @@ void LayerTreeTest::RunTest(bool threaded, bool delegating_renderer) {
   settings_.background_animation_rate = 200.0;
   settings_.verify_property_trees = verify_property_trees_;
   InitializeSettings(&settings_);
-  DCHECK(settings_.impl_side_painting);
   InitializeLayerSettings(&layer_settings_);
 
   main_task_runner_->PostTask(
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index f3b50fa..1d8689e 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -120,7 +120,7 @@ LayerTreeHost::LayerTreeHost(InitParams* params)
       task_graph_runner_(params->task_graph_runner),
       surface_id_namespace_(0u),
       next_surface_sequence_(1u) {
-  DCHECK_IMPLIES(settings_.impl_side_painting, task_graph_runner_);
+  DCHECK(task_graph_runner_);
   if (settings_.accelerated_animation_enabled)
     animation_registrar_ = AnimationRegistrar::Create();
   rendering_stats_instrumentation_->set_record_rendering_stats(
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 360b75c..76f86aa 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -233,7 +233,6 @@ LayerTreeHostImpl::LayerTreeHostImpl(
       is_likely_to_require_a_draw_(false),
       frame_timing_tracker_(FrameTimingTracker::Create(this)) {
   DCHECK(proxy_->IsImplThread());
-  DCHECK_IMPLIES(settings.impl_side_painting, task_graph_runner_);
   DCHECK_IMPLIES(settings.use_one_copy, !settings.use_zero_copy);
   DCHECK_IMPLIES(settings.use_zero_copy, !settings.use_one_copy);
   DidVisibilityChange(this, visible_);
diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc
index 9aa348f..2c78c51 100644
--- a/cc/trees/layer_tree_settings.cc
+++ b/cc/trees/layer_tree_settings.cc
@@ -20,8 +20,7 @@ LayerSettings::~LayerSettings() {
 }
 
 LayerTreeSettings::LayerTreeSettings()
-    : impl_side_painting(true),
-      single_thread_proxy_scheduler(true),
+    : single_thread_proxy_scheduler(true),
       use_external_begin_frame_source(false),
       main_frame_before_activation_enabled(false),
       using_synchronous_renderer_compositor(false),
@@ -83,7 +82,6 @@ SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const {
       use_external_begin_frame_source;
   scheduler_settings.main_frame_before_activation_enabled =
       main_frame_before_activation_enabled;
-  scheduler_settings.impl_side_painting = impl_side_painting;
   scheduler_settings.timeout_and_draw_when_animation_checkerboards =
       timeout_and_draw_when_animation_checkerboards;
   scheduler_settings.using_synchronous_renderer_compositor =
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
index 2d47aef..6592fae 100644
--- a/cc/trees/layer_tree_settings.h
+++ b/cc/trees/layer_tree_settings.h
@@ -29,7 +29,6 @@ class CC_EXPORT LayerTreeSettings {
   ~LayerTreeSettings();
 
   RendererSettings renderer_settings;
-  bool impl_side_painting;
   bool single_thread_proxy_scheduler;
   bool use_external_begin_frame_source;
   bool main_frame_before_activation_enabled;
diff --git a/components/html_viewer/web_layer_tree_view_impl.cc b/components/html_viewer/web_layer_tree_view_impl.cc
index c47f094..d43227d 100644
--- a/components/html_viewer/web_layer_tree_view_impl.cc
+++ b/components/html_viewer/web_layer_tree_view_impl.cc
@@ -32,7 +32,6 @@ WebLayerTreeViewImpl::WebLayerTreeViewImpl(
 
   cc::LayerTreeSettings settings;
 
-  settings.impl_side_painting = true;
   settings.use_image_texture_target = GL_TEXTURE_2D;
   settings.use_one_copy = true;
   // TODO(jam): use multiple compositor raster threads and set gather_pixel_refs
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index c3509ae..9440da5 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -431,7 +431,6 @@ void CompositorImpl::CreateLayerTreeHost() {
   settings.renderer_settings.refresh_rate = 60.0;
   settings.renderer_settings.allow_antialiasing = false;
   settings.renderer_settings.highp_threshold_min = 2048;
-  settings.impl_side_painting = true;
   settings.use_zero_copy = true;
   settings.use_one_copy = false;
 
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 7cdabac..e6e6a77 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -277,7 +277,6 @@ void RenderWidgetCompositor::Initialize() {
 
   settings.gpu_rasterization_msaa_sample_count =
       compositor_deps_->GetGpuRasterizationMSAASampleCount();
-  settings.impl_side_painting = true;
   settings.gpu_rasterization_forced =
       compositor_deps_->IsGpuRasterizationForced();
   settings.gpu_rasterization_enabled =
@@ -312,8 +311,7 @@ void RenderWidgetCompositor::Initialize() {
   }
 
   settings.verify_property_trees =
-      cmd->HasSwitch(cc::switches::kEnablePropertyTreeVerification) &&
-      settings.impl_side_painting;
+      cmd->HasSwitch(cc::switches::kEnablePropertyTreeVerification);
   settings.renderer_settings.allow_antialiasing &=
       !cmd->HasSwitch(cc::switches::kDisableCompositedAntialiasing);
   // The means the renderer compositor has 2 possible modes:
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index c3d5f75..b36168c 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -123,7 +123,6 @@ Compositor::Compositor(gfx::AcceleratedWidget widget,
   settings.initial_debug_state.SetRecordRenderingStats(
       command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking));
 
-  settings.impl_side_painting = true;
   settings.use_display_lists = IsUISlimmingPaintEnabled();
 
   settings.use_zero_copy = IsUIZeroCopyEnabled();