Introduce separate client and init path for single-threaded cc

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 <map>
 
@@ skipping 73 matching lines @@
     content::CommandBufferProxyImpl* command_buffer_proxy =
         command_buffer_context->GetCommandBufferProxy();
     DCHECK(command_buffer_proxy);
     command_buffer_proxy->SetLatencyInfo(frame->metadata.latency_info);
 
     OutputSurface::SwapBuffers(frame);
   }
 };
 
 static bool g_initialized = false;
-static base::Thread* g_impl_thread = NULL;
 
 } // anonymous namespace
 
 namespace content {
 
 typedef std::map<int, base::android::ScopedJavaGlobalRef<jobject> >
     SurfaceMap;
 static base::LazyInstance<SurfaceMap>
     g_surface_map = LAZY_INSTANCE_INITIALIZER;
 static base::LazyInstance<base::Lock> g_surface_map_lock;
 
 // static
 Compositor* Compositor::Create(CompositorClient* client) {
   return client ? new CompositorImpl(client) : NULL;
 }
 
 // static
 void Compositor::Initialize() {
   DCHECK(!CompositorImpl::IsInitialized());
   g_initialized = true;
 }
 
 // static
 bool CompositorImpl::IsInitialized() {
   return g_initialized;
 }
 
 // static
-bool CompositorImpl::IsThreadingEnabled() {
-  return g_impl_thread;
-}
-
-// static
 jobject CompositorImpl::GetSurface(int surface_id) {
   base::AutoLock lock(g_surface_map_lock.Get());
   SurfaceMap* surfaces = g_surface_map.Pointer();
   SurfaceMap::iterator it = surfaces->find(surface_id);
   jobject jsurface = it == surfaces->end() ? NULL : it->second.obj();
 
   LOG_IF(WARNING, !jsurface) << "No surface for surface id " << surface_id;
   return jsurface;
 }
 
@@ skipping 81 matching lines @@
   } else if (!host_) {
     cc::LayerTreeSettings settings;
     settings.refresh_rate = 60.0;
     settings.impl_side_painting = false;
     settings.allow_antialiasing = false;
     settings.calculate_top_controls_position = false;
     settings.top_controls_height = 0.f;
     settings.use_memory_management = false;
     settings.highp_threshold_min = 2048;
 
-    scoped_refptr<base::SingleThreadTaskRunner> impl_thread_task_runner =
-        g_impl_thread ? g_impl_thread->message_loop()->message_loop_proxy()
-                      : NULL;
-
-    host_ = cc::LayerTreeHost::Create(
-        this, NULL, settings, impl_thread_task_runner);
+    host_ = cc::LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings);
     host_->SetRootLayer(root_layer_);
 
     host_->SetVisible(true);
     host_->SetLayerTreeHostClientReady();
     host_->SetViewportSize(size_);
     host_->set_has_transparent_background(has_transparent_background_);
     // Need to recreate the UI resources because a new LayerTreeHost has been
     // created.
     client_->DidLoseUIResources();
   }
@@ skipping 246 matching lines @@
     case ANDROID_BITMAP_FORMAT_RGBA_8888:
       return GL_UNSIGNED_BYTE;
       break;
     case ANDROID_BITMAP_FORMAT_RGB_565:
     default:
       return GL_UNSIGNED_SHORT_5_6_5;
   }
 }
 
 } // namespace content