Index: content/browser/renderer_host/surface_texture_transport_client_android.cc |
diff --git a/content/browser/renderer_host/surface_texture_transport_client_android.cc b/content/browser/renderer_host/surface_texture_transport_client_android.cc |
index 83d5901db276aeeb2ab01426e470813a35cb7455..1a96232980c5386a58d994cbeefd47c90e7a2a42 100644 |
--- a/content/browser/renderer_host/surface_texture_transport_client_android.cc |
+++ b/content/browser/renderer_host/surface_texture_transport_client_android.cc |
@@ -62,10 +62,10 @@ SurfaceTextureTransportClient::GetCompositingSurface(int surface_id) { |
void SurfaceTextureTransportClient::SetSize(const gfx::Size& size) { |
surface_texture_->SetDefaultBufferSize(size.width(), size.height()); |
video_layer_->setBounds(size); |
- video_frame_.reset(); |
+ video_frame_ = NULL; |
} |
-WebKit::WebVideoFrame* SurfaceTextureTransportClient::getCurrentFrame() { |
+media::VideoFrame* SurfaceTextureTransportClient::GetCurrentFrame() { |
if (!texture_id_) { |
WebKit::WebGraphicsContext3D* context = |
ImageTransportFactoryAndroid::GetInstance()->GetContext3D(); |
@@ -75,24 +75,22 @@ WebKit::WebVideoFrame* SurfaceTextureTransportClient::getCurrentFrame() { |
} |
if (!video_frame_.get()) { |
const gfx::Size size = video_layer_->bounds(); |
- video_frame_.reset( |
- new webkit_media::WebVideoFrameImpl( |
- media::VideoFrame::WrapNativeTexture( |
- texture_id_, kGLTextureExternalOES, |
- size, |
- gfx::Rect(gfx::Point(), size), |
- size, |
- base::TimeDelta(), |
- media::VideoFrame::ReadPixelsCB(), |
- base::Closure()))); |
+ video_frame_ = media::VideoFrame::WrapNativeTexture( |
+ texture_id_, kGLTextureExternalOES, |
+ size, |
+ gfx::Rect(gfx::Point(), size), |
+ size, |
+ base::TimeDelta(), |
+ media::VideoFrame::ReadPixelsCB(), |
+ base::Closure()); |
} |
surface_texture_->UpdateTexImage(); |
return video_frame_.get(); |
} |
-void SurfaceTextureTransportClient::putCurrentFrame( |
- WebKit::WebVideoFrame* frame) { |
+void SurfaceTextureTransportClient::PutCurrentFrame( |
+ media::VideoFrame* frame) { |
} |
void SurfaceTextureTransportClient::OnSurfaceTextureFrameAvailable() { |