summaryrefslogtreecommitdiffstats
path: root/cc/video_layer_impl.cc
diff options
context:
space:
mode:
authoraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-08 07:03:44 +0000
committeraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-08 07:03:44 +0000
commit61de581375ce3d76628772a78719cad63f0aabae (patch)
tree90e5818095cfa31182ceca09224c42d999644e4d /cc/video_layer_impl.cc
parentde8686ed05a28324b0978b2bb81cf3407f13762b (diff)
downloadchromium_src-61de581375ce3d76628772a78719cad63f0aabae.zip
chromium_src-61de581375ce3d76628772a78719cad63f0aabae.tar.gz
chromium_src-61de581375ce3d76628772a78719cad63f0aabae.tar.bz2
Remove static thread pointers from CC, attempt 3
BUG=152904 Review URL: https://chromiumcodereview.appspot.com/11232051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166627 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/video_layer_impl.cc')
-rw-r--r--cc/video_layer_impl.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc
index 0c94817..6e6796f 100644
--- a/cc/video_layer_impl.cc
+++ b/cc/video_layer_impl.cc
@@ -9,7 +9,6 @@
#include "base/logging.h"
#include "cc/io_surface_draw_quad.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"
@@ -43,14 +42,12 @@ VideoLayerImpl::VideoLayerImpl(int id, WebKit::WebVideoFrameProvider* provider,
// 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(Proxy::isMainThreadBlocked());
m_provider->setVideoFrameProviderClient(this);
}
VideoLayerImpl::~VideoLayerImpl()
{
// See comment in constructor for why this doesn't need a lock.
- DCHECK(Proxy::isMainThreadBlocked());
if (m_provider) {
m_provider->setVideoFrameProviderClient(0);
m_provider = 0;
@@ -119,7 +116,6 @@ size_t VideoLayerImpl::numPlanes() const
void VideoLayerImpl::willDraw(ResourceProvider* resourceProvider)
{
- DCHECK(Proxy::isImplThread());
LayerImpl::willDraw(resourceProvider);
// Explicitly acquire and release the provider mutex so it can be held from
@@ -140,7 +136,6 @@ void VideoLayerImpl::willDraw(ResourceProvider* resourceProvider)
void VideoLayerImpl::willDrawInternal(ResourceProvider* resourceProvider)
{
- DCHECK(Proxy::isImplThread());
DCHECK(!m_externalTextureResource);
if (!m_provider) {
@@ -191,8 +186,6 @@ void VideoLayerImpl::willDrawInternal(ResourceProvider* resourceProvider)
void VideoLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuadsData)
{
- DCHECK(Proxy::isImplThread());
-
if (!m_frame)
return;
@@ -253,7 +246,6 @@ void VideoLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuad
void VideoLayerImpl::didDraw(ResourceProvider* resourceProvider)
{
- DCHECK(Proxy::isImplThread());
LayerImpl::didDraw(resourceProvider);
if (!m_frame)