Refactor part of CompositorImpl::SetVisible() into its own method.

content/browser/renderer_host/compositor_impl_android.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 "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
@@ skipping 371 matching lines @@
     base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
     window = ANativeWindow_fromSurface(env, surface);
   }
   if (window) {
     SetWindowSurface(window);
     ANativeWindow_release(window);
     RegisterViewSurface(surface_id_, j_surface.obj());
   }
 }
 
+void CompositorImpl::CreateLayerTreeHost() {
+  DCHECK(!host_);
+  DCHECK(!WillCompositeThisFrame());
+  needs_composite_ = false;
+  defer_composite_for_gpu_channel_ = false;
+  pending_swapbuffers_ = 0;
+  cc::LayerTreeSettings settings;
+  settings.renderer_settings.refresh_rate = 60.0;
+  settings.renderer_settings.allow_antialiasing = false;
+  settings.renderer_settings.highp_threshold_min = 2048;
+  settings.impl_side_painting = false;
+  settings.calculate_top_controls_position = false;
+
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  settings.initial_debug_state.SetRecordRenderingStats(
+      command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking));
+  settings.initial_debug_state.show_fps_counter =
+      command_line->HasSwitch(cc::switches::kUIShowFPSCounter);
+  // TODO(enne): Update this this compositor to use the scheduler.
+  settings.single_thread_proxy_scheduler = false;
+
+  host_ = cc::LayerTreeHost::CreateSingleThreaded(
+      this,
+      this,
+      HostSharedBitmapManager::current(),
+      BrowserGpuMemoryBufferManager::current(),
+      settings,
+      base::MessageLoopProxy::current(),
+      nullptr);
+  host_->SetRootLayer(root_layer_);
+
+  host_->SetVisible(true);
+  host_->SetLayerTreeHostClientReady();
+  host_->SetViewportSize(size_);
+  host_->set_has_transparent_background(has_transparent_background_);
+  host_->SetDeviceScaleFactor(device_scale_factor_);
+}
+
 void CompositorImpl::SetVisible(bool visible) {
   if (!visible) {
     DCHECK(host_);
     // Look for any layers that were attached to the root for readback
     // and are waiting for Composite() to happen.
     bool readback_pending = false;
     for (size_t i = 0; i < root_layer_->children().size(); ++i) {
       if (root_layer_->children()[i]->HasCopyRequest()) {
         readback_pending = true;
         break;
       }
     }
     if (readback_pending) {
       ignore_schedule_composite_ = true;
       host_->Composite(base::TimeTicks::Now());
       ignore_schedule_composite_ = false;
     }
     if (WillComposite())
       CancelComposite();
     ui_resource_provider_.SetLayerTreeHost(NULL);
     host_.reset();
     display_client_.reset();
     if (current_composite_task_) {
       current_composite_task_->Cancel();
       current_composite_task_.reset();
     }
   } else if (!host_) {
-    DCHECK(!WillCompositeThisFrame());
-    needs_composite_ = false;
-    defer_composite_for_gpu_channel_ = false;
-    pending_swapbuffers_ = 0;
-    cc::LayerTreeSettings settings;
-    settings.renderer_settings.refresh_rate = 60.0;
-    settings.renderer_settings.allow_antialiasing = false;
-    settings.renderer_settings.highp_threshold_min = 2048;
-    settings.impl_side_painting = false;
-    settings.calculate_top_controls_position = false;
-
-    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-    settings.initial_debug_state.SetRecordRenderingStats(
-        command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking));
-    settings.initial_debug_state.show_fps_counter =
-        command_line->HasSwitch(cc::switches::kUIShowFPSCounter);
-    // TODO(enne): Update this this compositor to use the scheduler.
-    settings.single_thread_proxy_scheduler = false;
-
-    host_ = cc::LayerTreeHost::CreateSingleThreaded(
-        this,
-        this,
-        HostSharedBitmapManager::current(),
-        BrowserGpuMemoryBufferManager::current(),
-        settings,
-        base::MessageLoopProxy::current(),
-        nullptr);
-    host_->SetRootLayer(root_layer_);
-
-    host_->SetVisible(true);
-    host_->SetLayerTreeHostClientReady();
-    host_->SetViewportSize(size_);
-    host_->set_has_transparent_background(has_transparent_background_);
-    host_->SetDeviceScaleFactor(device_scale_factor_);
+    CreateLayerTreeHost();
     ui_resource_provider_.SetLayerTreeHost(host_.get());
   }
 }
 
 void CompositorImpl::setDeviceScaleFactor(float factor) {
   device_scale_factor_ = factor;
   if (host_)
     host_->SetDeviceScaleFactor(factor);
 }
 
@@ skipping 212 matching lines @@
 }
 
 void CompositorImpl::SetNeedsAnimate() {
   if (!host_)
     return;
 
   host_->SetNeedsAnimate();
 }
 
 }  // namespace content