Remove static thread pointers from CC

cc/video_layer_impl.cc

 // Copyright 2011 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/video_layer_impl.h"
 
 #include "CCIOSurfaceDrawQuad.h"
 #include "NotImplemented.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/proxy.h"
 #include "cc/quad_sink.h"
 #include "cc/resource_provider.h"
 #include "cc/stream_video_draw_quad.h"
 #include "cc/texture_draw_quad.h"
 #include "cc/yuv_video_draw_quad.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include <public/WebVideoFrame.h>
 
 namespace cc {
 
-CCVideoLayerImpl::CCVideoLayerImpl(int id, WebKit::WebVideoFrameProvider* provider)
+CCVideoLayerImpl::CCVideoLayerImpl(int id, WebKit::WebVideoFrameProvider* provider, CCProxy* proxy)
     : CCLayerImpl(id)
+    , m_proxy(proxy)
     , m_provider(provider)
     , m_frame(0)
     , m_externalTextureResource(0)
 {
     // This matrix is the default transformation for stream textures, and flips on the Y axis.
     m_streamTextureMatrix = WebKit::WebTransformationMatrix(
         1, 0, 0, 0,
         0, -1, 0, 0,
         0, 0, 1, 0,
         0, 1, 0, 1);
 
     // This only happens during a commit on the compositor thread while the main
     // thread is blocked. That makes this a thread-safe call to set the video
     // frame provider client that does not require a lock. The same is true of
     // the call in the destructor.
-    DCHECK(CCProxy::isMainThreadBlocked());
+    DCHECK(m_proxy->isMainThreadBlocked());
     m_provider->setVideoFrameProviderClient(this);
 }
 
 CCVideoLayerImpl::~CCVideoLayerImpl()
 {
     // See comment in constructor for why this doesn't need a lock.
-    DCHECK(CCProxy::isMainThreadBlocked());
+    DCHECK(m_proxy->isMainThreadBlocked());
     if (m_provider) {
         m_provider->setVideoFrameProviderClient(0);
         m_provider = 0;
     }
     freePlaneData(layerTreeHostImpl()->resourceProvider());
 
 #ifndef NDEBUG
     for (unsigned i = 0; i < WebKit::WebVideoFrame::maxPlanes; ++i)
       DCHECK(!m_framePlanes[i].resourceId);
     DCHECK(!m_externalTextureResource);
@@ skipping 22 matching lines @@
     case WebKit::WebVideoFrame::FormatRGB32:
     case WebKit::WebVideoFrame::FormatEmpty:
     case WebKit::WebVideoFrame::FormatI420:
         notImplemented();
     }
     return GL_INVALID_VALUE;
 }
 
 void CCVideoLayerImpl::willDraw(CCResourceProvider* resourceProvider)
 {
-    DCHECK(CCProxy::isImplThread());
+    DCHECK(m_proxy->isImplThread());
     CCLayerImpl::willDraw(resourceProvider);
 
     // Explicitly acquire and release the provider mutex so it can be held from
     // willDraw to didDraw. Since the compositor thread is in the middle of
     // drawing, the layer will not be destroyed before didDraw is called.
     // Therefore, the only thing that will prevent this lock from being released
     // is the GPU process locking it. As the GPU process can't cause the
     // destruction of the provider (calling stopUsingProvider), holding this
     // lock should not cause a deadlock.
     m_providerLock.Acquire();
 
     willDrawInternal(resourceProvider);
     freeUnusedPlaneData(resourceProvider);
 
     if (!m_frame)
         m_providerLock.Release();
 }
 
 void CCVideoLayerImpl::willDrawInternal(CCResourceProvider* resourceProvider)
 {
-    DCHECK(CCProxy::isImplThread());
+    DCHECK(m_proxy->isImplThread());
     DCHECK(!m_externalTextureResource);
 
     if (!m_provider) {
         m_frame = 0;
         return;
     }
 
     m_frame = m_provider->getCurrentFrame();
 
     if (!m_frame)
@@ skipping 24 matching lines @@
         m_frame = 0;
         return;
     }
 
     if (m_format == GL_TEXTURE_2D)
         m_externalTextureResource = resourceProvider->createResourceFromExternalTexture(m_frame->textureId());
 }
 
 void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData)
 {
-    DCHECK(CCProxy::isImplThread());
+    DCHECK(m_proxy->isImplThread());
 
     if (!m_frame)
         return;
 
     CCSharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
     appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData);
 
     // FIXME: When we pass quads out of process, we need to double-buffer, or
     // otherwise synchonize use of all textures in the quad.
 
@@ skipping 42 matching lines @@
         quadSink.append(streamVideoQuad.PassAs<CCDrawQuad>(), appendQuadsData);
         break;
     }
     default:
         CRASH(); // Someone updated convertVFCFormatToGC3DFormat above but update this!
     }
 }
 
 void CCVideoLayerImpl::didDraw(CCResourceProvider* resourceProvider)
 {
-    DCHECK(CCProxy::isImplThread());
+    DCHECK(m_proxy->isImplThread());
     CCLayerImpl::didDraw(resourceProvider);
 
     if (!m_frame)
         return;
 
     if (m_format == GL_TEXTURE_2D) {
         DCHECK(m_externalTextureResource);
         // FIXME: the following assert will not be true when sending resources to a
         // parent compositor. We will probably need to hold on to m_frame for
         // longer, and have several "current frames" in the pipeline.
@@ skipping 147 matching lines @@
     str->append("video layer\n");
     CCLayerImpl::dumpLayerProperties(str, indent);
 }
 
 const char* CCVideoLayerImpl::layerTypeAsString() const
 {
     return "VideoLayer";
 }
 
 }