Remove static thread pointers from CC

webkit/compositor_bindings/web_compositor_support_impl.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 "config.h"
 #include "webkit/compositor_bindings/web_compositor_support_impl.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/settings.h"
 #include "webkit/compositor_bindings/web_animation_impl.h"
@@ skipping 37 matching lines @@
 using WebKit::WebCompositorImpl;
 
 namespace webkit {
 
 WebCompositorSupportImpl::WebCompositorSupportImpl() {
 }
 
 WebCompositorSupportImpl::~WebCompositorSupportImpl() {
 }
 
-void WebCompositorSupportImpl::initialize(WebKit::WebThread* thread) {
-  WebCompositorImpl::initialize(thread);
+void WebCompositorSupportImpl::initialize(WebKit::WebThread* implThread) {
+  ASSERT(!state_.mainThread);
+  state_.mainThread = CCThreadImpl::createForCurrentThread().release();
+  if (implThread)
+    state_.implThread = CCThreadImpl::createForDifferentThread(implThread)
+        .release();
 }
 
 bool WebCompositorSupportImpl::isThreadingEnabled() {
   return WebCompositorImpl::isThreadingEnabled();
 }
 
 void WebCompositorSupportImpl::shutdown() {
   WebCompositorImpl::shutdown();
 }
 
@@ skipping 11 matching lines @@
 
 void WebCompositorSupportImpl::setPageScalePinchZoomEnabled(bool enabled) {
   cc::Settings::setPageScalePinchZoomEnabled(enabled);
 }
 
 WebLayerTreeView* WebCompositorSupportImpl::createLayerTreeView(
     WebLayerTreeViewClient* client, const WebLayer& root,
     const WebLayerTreeView::Settings& settings) {
   scoped_ptr<WebKit::WebLayerTreeViewImpl> layerTreeViewImpl(
       new WebKit::WebLayerTreeViewImpl(client));
-  if (!layerTreeViewImpl->initialize(settings))
+  if (!layerTreeViewImpl->initialize(settings, &state_))
     return NULL;
   layerTreeViewImpl->setRootLayer(root);
   return layerTreeViewImpl.release();
 }
 
 WebLayer* WebCompositorSupportImpl::createLayer() {
   return new WebKit::WebLayerImpl();
 }
 
 WebContentLayer* WebCompositorSupportImpl::createContentLayer(
@@ skipping 46 matching lines @@
 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() {
   return new WebKit::WebFloatAnimationCurveImpl();
 }
 
 WebTransformAnimationCurve*
     WebCompositorSupportImpl::createTransformAnimationCurve() {
   return new WebKit::WebTransformAnimationCurveImpl();
 }
 
 }  // namespace webkit