Remove static thread pointers from 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 "base/bind.h"
@@ skipping 88 matching lines @@
   if (WebKit::Platform::current() == NULL) {
     LOG(WARNING) << "CompositorImpl(Android)::Initialize(): WebKit::Platform "
                  << "is not initialized, COMPOSITOR IS NOT INITIALIZED "
                  << "(this is OK and expected if you're running Android"
                  << "WebView tests).";
     // We only ever want to run this hack in single process mode.
     CHECK(CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kSingleProcess));
     return;
   }
+#if 0
   WebKit::Platform::current()->compositorSupport()->initialize(NULL);
+#endif
 }
 
 // static
 bool CompositorImpl::IsInitialized() {
   return g_initialized;
 }
 
 CompositorImpl::CompositorImpl(Compositor::Client* client)
     : window_(NULL),
       surface_id_(0),
@@ skipping 34 matching lines @@
     tracker->SetSurfaceHandle(
         surface_id_,
         gfx::GLSurfaceHandle(gfx::kDummyPluginWindow, false));
 
     DCHECK(!host_.get());
     WebKit::WebLayerTreeView::Settings settings;
     settings.refreshRate = 60.0;
     WebKit::WebCompositorSupport* compositor_support =
         WebKit::Platform::current()->compositorSupport();
     host_.reset(
-        compositor_support->createLayerTreeView(this, *root_layer_, settings));
+        compositor_support->createLayerTreeView(this, *root_layer_, settings,
+                                                NULL));
     host_->setVisible(true);
     host_->setSurfaceReady();
     host_->setViewportSize(size_);
   }
 }
 
 void CompositorImpl::SetWindowBounds(const gfx::Size& size) {
   if (size_ == size)
     return;
 
@@ skipping 155 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