Remove static thread pointers from CC

cc/software_renderer.cc

 // Copyright 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 "cc/software_renderer.h"
 
 #include "CCDebugBorderDrawQuad.h"
 #include "cc/render_pass_draw_quad.h"
@@ skipping 47 matching lines @@
 {
     return SkScalarNearlyZero(matrix[SkMatrix::kMSkewX]) &&
            SkScalarNearlyZero(matrix[SkMatrix::kMSkewY]) &&
            SkScalarNearlyZero(matrix[SkMatrix::kMPersp0]) &&
            SkScalarNearlyZero(matrix[SkMatrix::kMPersp1]) &&
            SkScalarNearlyZero(matrix[SkMatrix::kMPersp2] - 1.0f);
 }
 
 } // anonymous namespace
 
-scoped_ptr<SoftwareRenderer> SoftwareRenderer::create(RendererClient* client, ResourceProvider* resourceProvider, WebCompositorSoftwareOutputDevice* outputDevice)
+scoped_ptr<SoftwareRenderer> SoftwareRenderer::create(RendererClient* client, ResourceProvider* resourceProvider, WebCompositorSoftwareOutputDevice* outputDevice, bool hasImplThread)
 {
-    return make_scoped_ptr(new SoftwareRenderer(client, resourceProvider, outputDevice));
+    return make_scoped_ptr(new SoftwareRenderer(client, resourceProvider, outputDevice, hasImplThread));
 }
 
-SoftwareRenderer::SoftwareRenderer(RendererClient* client, ResourceProvider* resourceProvider, WebCompositorSoftwareOutputDevice* outputDevice)
+SoftwareRenderer::SoftwareRenderer(RendererClient* client, ResourceProvider* resourceProvider, WebCompositorSoftwareOutputDevice* outputDevice, bool hasImplThread)
     : DirectRenderer(client, resourceProvider)
+    , m_hasImplThread(hasImplThread)
     , m_visible(true)
     , m_outputDevice(outputDevice)
     , m_skCurrentCanvas(0)
 {
     m_resourceProvider->setDefaultResourceType(ResourceProvider::Bitmap);
 
     m_capabilities.maxTextureSize = INT_MAX;
     m_capabilities.bestTextureFormat = GL_RGBA;
     m_capabilities.contextHasCachedFrontBuffer = true;
     m_capabilities.usingSetVisibility = true;
@@ skipping 241 matching lines @@
 
 void SoftwareRenderer::drawUnsupportedQuad(const DrawingFrame& frame, const DrawQuad* quad)
 {
     m_skCurrentPaint.setColor(SK_ColorMAGENTA);
     m_skCurrentPaint.setAlpha(quad->opacity() * 255);
     m_skCurrentCanvas->drawRect(toSkRect(quadVertexRect()), m_skCurrentPaint);
 }
 
 bool SoftwareRenderer::swapBuffers()
 {
-    if (Proxy::hasImplThread())
+    if (m_hasImplThread)
         m_client->onSwapBuffersComplete();
     return true;
 }
 
 void SoftwareRenderer::getFramebufferPixels(void *pixels, const IntRect& rect)
 {
     SkBitmap fullBitmap = m_outputDevice->lock(false)->getSkBitmap();
     SkBitmap subsetBitmap;
     SkIRect invertRect = SkIRect::MakeXYWH(rect.x(), viewportSize().height() - rect.maxY(), rect.width(), rect.height());
     fullBitmap.extractSubset(&subsetBitmap, invertRect);
     subsetBitmap.copyPixelsTo(pixels, rect.width() * rect.height() * 4, rect.width() * 4);
     m_outputDevice->unlock();
 }
 
 void SoftwareRenderer::setVisible(bool visible)
 {
     if (m_visible == visible)
         return;
     m_visible = visible;
 }
 
 }