| Index: gpu/command_buffer/client/gl_in_process_context.cc
|
| diff --git a/gpu/command_buffer/client/gl_in_process_context.cc b/gpu/command_buffer/client/gl_in_process_context.cc
|
| index cdbfc9f47c3f8828899a4f96f5011cb4f536353e..1e0d3cd2d9ae7f73d6dcd98dba72687a2b641a1a 100644
|
| --- a/gpu/command_buffer/client/gl_in_process_context.cc
|
| +++ b/gpu/command_buffer/client/gl_in_process_context.cc
|
| @@ -32,6 +32,10 @@
|
| #include "ui/gfx/size.h"
|
| #include "ui/gl/gl_image.h"
|
|
|
| +#if defined(OS_ANDROID)
|
| +#include "ui/gl/android/surface_texture_bridge.h"
|
| +#endif
|
| +
|
| namespace gpu {
|
|
|
| namespace {
|
| @@ -76,6 +80,11 @@ class GLInProcessContextImpl
|
| unsigned* image_id) OVERRIDE;
|
| virtual void DeleteGpuMemoryBuffer(unsigned image_id) OVERRIDE;
|
|
|
| +#if defined(OS_ANDROID)
|
| + virtual scoped_refptr<gfx::SurfaceTextureBridge> GetSurfaceTexture(
|
| + uint32 stream_id) OVERRIDE;
|
| +#endif
|
| +
|
| private:
|
| void Destroy();
|
| void PollQueryCallbacks();
|
| @@ -361,6 +370,13 @@ void GLInProcessContextImpl::SignalQuery(
|
| }
|
| }
|
|
|
| +#if defined(OS_ANDROID)
|
| +scoped_refptr<gfx::SurfaceTextureBridge>
|
| +GLInProcessContextImpl::GetSurfaceTexture(uint32 stream_id) {
|
| + return command_buffer_->GetSurfaceTexture(stream_id);
|
| +}
|
| +#endif
|
| +
|
| } // anonymous namespace
|
|
|
| GLInProcessContextAttribs::GLInProcessContextAttribs()
|
|
|