A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2

webkit/compositor_bindings/web_layer_tree_view_impl.cc

Index: webkit/compositor_bindings/web_layer_tree_view_impl.cc
===================================================================
--- webkit/compositor_bindings/web_layer_tree_view_impl.cc	(revision 165906)
+++ webkit/compositor_bindings/web_layer_tree_view_impl.cc	(working copy)
@@ -9,7 +9,6 @@
 #include "cc/input_handler.h"
 #include "cc/layer.h"
 #include "cc/layer_tree_host.h"
-#include "cc/thread.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandler.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
@@ -28,7 +27,7 @@
 WebLayerTreeView* WebLayerTreeView::create(WebLayerTreeViewClient* client, const WebLayer& root, const WebLayerTreeView::Settings& settings)
 {
     scoped_ptr<WebLayerTreeViewImpl> layerTreeViewImpl(new WebLayerTreeViewImpl(client));
-    if (!layerTreeViewImpl->initialize(settings, scoped_ptr<Thread>(NULL)))
+    if (!layerTreeViewImpl->initialize(settings))
         return 0;
     layerTreeViewImpl->setRootLayer(root);
     return layerTreeViewImpl.release();
@@ -36,7 +35,6 @@
 
 WebLayerTreeViewImpl::WebLayerTreeViewImpl(WebLayerTreeViewClient* client)
     : m_client(client)
-    , m_hasImplThread(false)
 {
 }
 
@@ -44,7 +42,7 @@
 {
 }
 
-bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSettings, scoped_ptr<Thread> implThread)
+bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSettings)
 {
     LayerTreeSettings settings;
     settings.acceleratePainting = webSettings.acceleratePainting;
@@ -55,9 +53,7 @@
     settings.refreshRate = webSettings.refreshRate;
     settings.defaultTileSize = webSettings.defaultTileSize;
     settings.maxUntiledLayerSize = webSettings.maxUntiledLayerSize;
-    m_layerTreeHost = LayerTreeHost::create(this, settings, implThread.Pass());
-    if (implThread)
-        m_hasImplThread = true;
+    m_layerTreeHost = LayerTreeHost::create(this, settings);
     if (!m_layerTreeHost.get())
         return false;
     return true;
@@ -154,7 +150,7 @@
 
 void WebLayerTreeViewImpl::composite()
 {
-    if (m_hasImplThread)
+    if (Proxy::hasImplThread())
         m_layerTreeHost->setNeedsCommit();
     else
         m_layerTreeHost->composite();