content/blimp: Remove unused compositing mode switches.

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 2013 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 "content/renderer/gpu/render_widget_compositor.h"
 
 #include <stddef.h>
 #include <limits>
 #include <string>
 #include <utility>
@@ skipping 223 matching lines @@
       remote_proto_channel_receiver_(nullptr),
       weak_factory_(this) {}
 
 void RenderWidgetCompositor::Initialize(float device_scale_factor) {
   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   cc::LayerTreeSettings settings =
       GenerateLayerTreeSettings(*cmd, compositor_deps_, device_scale_factor);
 
   animation_host_ = cc::AnimationHost::CreateMainInstance();
 
-  if (cmd->HasSwitch(switches::kUseRemoteCompositing) &&
-      cmd->HasSwitch(switches::kUseLayerTreeHostRemote)) {
+  if (cmd->HasSwitch(switches::kUseRemoteCompositing)) {
     DCHECK(!threaded_);
 
     cc::LayerTreeHostRemote::InitParams params;
     params.client = this;
     params.main_task_runner =
         compositor_deps_->GetCompositorMainThreadTaskRunner();
     params.mutator_host = animation_host_.get();
     params.remote_compositor_bridge =
         GetContentClient()->renderer()->CreateRemoteCompositorBridge(
             this, params.main_task_runner);
     params.engine_picture_cache =
         compositor_deps_->GetImageSerializationProcessor()
             ->CreateEnginePictureCache();
     params.settings = &settings;
     layer_tree_host_ = base::MakeUnique<cc::LayerTreeHostRemote>(&params);
-    return;
+  } else {
+    cc::LayerTreeHostInProcess::InitParams params;
+    params.client = this;
+    params.settings = &settings;
+    params.task_graph_runner = compositor_deps_->GetTaskGraphRunner();
+    params.main_task_runner =
+        compositor_deps_->GetCompositorMainThreadTaskRunner();
+    params.mutator_host = animation_host_.get();
+    if (!threaded_) {
+      // Single-threaded layout tests.
+      layer_tree_host_ =
+          cc::LayerTreeHostInProcess::CreateSingleThreaded(this, &params);
+    } else {
+      layer_tree_host_ = cc::LayerTreeHostInProcess::CreateThreaded(
+          compositor_deps_->GetCompositorImplThreadTaskRunner(), &params);
+    }
   }
 
-  cc::LayerTreeHostInProcess::InitParams params;
-  params.client = this;
-  params.settings = &settings;
-  params.task_graph_runner = compositor_deps_->GetTaskGraphRunner();
-  params.main_task_runner =
-      compositor_deps_->GetCompositorMainThreadTaskRunner();
-  params.mutator_host = animation_host_.get();
-
-  if (cmd->HasSwitch(switches::kUseRemoteCompositing)) {
-    DCHECK(!threaded_);
-    params.image_serialization_processor =
-        compositor_deps_->GetImageSerializationProcessor();
-    layer_tree_host_ =
-        cc::LayerTreeHostInProcess::CreateRemoteServer(this, &params);
-  } else if (!threaded_) {
-    // Single-threaded layout tests.
-    layer_tree_host_ =
-        cc::LayerTreeHostInProcess::CreateSingleThreaded(this, &params);
-  } else {
-    layer_tree_host_ = cc::LayerTreeHostInProcess::CreateThreaded(
-        compositor_deps_->GetCompositorImplThreadTaskRunner(), &params);
-  }
   DCHECK(layer_tree_host_);
 }
 
 RenderWidgetCompositor::~RenderWidgetCompositor() = default;
 
 // static
 cc::LayerTreeSettings RenderWidgetCompositor::GenerateLayerTreeSettings(
     const base::CommandLine& cmd,
     CompositorDependencies* compositor_deps,
     float device_scale_factor) {
@@ skipping 853 matching lines @@
     float device_scale) {
   layer_tree_host_->GetLayerTree()->SetPaintedDeviceScaleFactor(device_scale);
 }
 
 void RenderWidgetCompositor::SetDeviceColorSpace(
     const gfx::ColorSpace& color_space) {
   layer_tree_host_->GetLayerTree()->SetDeviceColorSpace(color_space);
 }
 
 }  // namespace content