Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Unified Diff: cc/video_layer_impl.h

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/proxy.h ('K') | « cc/thread_proxy.cc ('k') | cc/video_layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/video_layer_impl.h
diff --git a/cc/video_layer_impl.h b/cc/video_layer_impl.h
index 6b97643cf2b2032ff01de08ee36b956a5cac6501..612a0065e30ca6ba16e7f5fbd1cf8054a8b8e825 100644
--- a/cc/video_layer_impl.h
+++ b/cc/video_layer_impl.h
@@ -20,6 +20,7 @@ class WebVideoFrame;
namespace cc {
class CCLayerTreeHostImpl;
+class CCProxy;
class CCVideoLayerImpl;
class CCVideoLayerImpl : public CCLayerImpl
@@ -27,7 +28,7 @@ class CCVideoLayerImpl : public CCLayerImpl
public:
static scoped_ptr<CCVideoLayerImpl> create(int id, WebKit::WebVideoFrameProvider* provider)
{
- return make_scoped_ptr(new CCVideoLayerImpl(id, provider));
+ return make_scoped_ptr(new CCVideoLayerImpl(id, provider, NULL)); // FIXME
}
virtual ~CCVideoLayerImpl();
@@ -59,7 +60,7 @@ public:
};
private:
- CCVideoLayerImpl(int, WebKit::WebVideoFrameProvider*);
+ CCVideoLayerImpl(int, WebKit::WebVideoFrameProvider*, CCProxy*);
static IntSize computeVisibleSize(const WebKit::WebVideoFrame&, unsigned plane);
virtual const char* layerTypeAsString() const OVERRIDE;
@@ -70,6 +71,8 @@ private:
void freePlaneData(CCResourceProvider*);
void freeUnusedPlaneData(CCResourceProvider*);
+ CCProxy* m_proxy;
+
// Guards the destruction of m_provider and the frame that it provides
base::Lock m_providerLock;
WebKit::WebVideoFrameProvider* m_provider;
« cc/proxy.h ('K') | « cc/thread_proxy.cc ('k') | cc/video_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698