Index: content/browser/renderer_host/surface_texture_transport_client_android.h |
diff --git a/content/browser/renderer_host/surface_texture_transport_client_android.h b/content/browser/renderer_host/surface_texture_transport_client_android.h |
index 50374437465bbbc265315a5e0bb548b181cbcdbc..f211d897bc1b30fffdbe13c0c0109d8af6e753a0 100644 |
--- a/content/browser/renderer_host/surface_texture_transport_client_android.h |
+++ b/content/browser/renderer_host/surface_texture_transport_client_android.h |
@@ -7,7 +7,7 @@ |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
-#include "third_party/WebKit/Source/Platform/chromium/public/WebVideoFrameProvider.h" |
+#include "cc/VideoFrameProvider.h" |
jamesr
2013/01/03 23:35:55
should be video_frame_provider.h, no?
danakj
2013/01/04 14:01:29
er.. yeh.
|
#include "ui/gfx/native_widget_types.h" |
struct ANativeWindow; |
@@ -20,7 +20,7 @@ class VideoLayer; |
namespace content { |
class SurfaceTextureBridge; |
-class SurfaceTextureTransportClient : public WebKit::WebVideoFrameProvider { |
+class SurfaceTextureTransportClient : public cc::VideoFrameProvider { |
public: |
SurfaceTextureTransportClient(); |
virtual ~SurfaceTextureTransportClient(); |
@@ -29,10 +29,10 @@ class SurfaceTextureTransportClient : public WebKit::WebVideoFrameProvider { |
gfx::GLSurfaceHandle GetCompositingSurface(int surface_id); |
void SetSize(const gfx::Size& size); |
- // WebKit::WebVideoFrameProvider implementation. |
- virtual void setVideoFrameProviderClient(Client*) OVERRIDE {} |
- virtual WebKit::WebVideoFrame* getCurrentFrame() OVERRIDE; |
- virtual void putCurrentFrame(WebKit::WebVideoFrame* frame) OVERRIDE; |
+ // cc::VideoFrameProvider implementation. |
+ virtual void SetVideoFrameProviderClient(Client*) OVERRIDE {} |
+ virtual media::VideoFrame* GetCurrentFrame() OVERRIDE; |
+ virtual void PutCurrentFrame(media::VideoFrame* frame) OVERRIDE; |
private: |
void OnSurfaceTextureFrameAvailable(); |
@@ -40,7 +40,7 @@ class SurfaceTextureTransportClient : public WebKit::WebVideoFrameProvider { |
scoped_refptr<cc::VideoLayer> video_layer_; |
scoped_refptr<SurfaceTextureBridge> surface_texture_; |
ANativeWindow* window_; |
- scoped_ptr<WebKit::WebVideoFrame> video_frame_; |
+ scoped_refptr<media::VideoFrame> video_frame_; |
uint32 texture_id_; |
DISALLOW_COPY_AND_ASSIGN(SurfaceTextureTransportClient); |