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; |