| Index: content/browser/renderer_host/compositor_impl_android.cc
|
| diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
|
| index 8550172bc83a4a6e50cb54232cea09abef73e9eb..738c1271183727e7de780e1b1fdc87ffeaf1d5da 100644
|
| --- a/content/browser/renderer_host/compositor_impl_android.cc
|
| +++ b/content/browser/renderer_host/compositor_impl_android.cc
|
| @@ -91,7 +91,6 @@ class OutputSurfaceWithoutParent : public cc::OutputSurface {
|
| };
|
|
|
| static bool g_initialized = false;
|
| -static base::Thread* g_impl_thread = NULL;
|
|
|
| } // anonymous namespace
|
|
|
| @@ -120,11 +119,6 @@ bool CompositorImpl::IsInitialized() {
|
| }
|
|
|
| // 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();
|
| @@ -226,12 +220,7 @@ void CompositorImpl::SetVisible(bool visible) {
|
| 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);
|
|
|