| Index: content/common/gpu/stream_texture_android.h
|
| diff --git a/content/common/gpu/stream_texture_android.h b/content/common/gpu/stream_texture_android.h
|
| index a5afb8eaca0ec01d2256c3c642acc50f70eb4ecc..e19fc1b321a23cff8c83892b195c7517fa2113e7 100644
|
| --- a/content/common/gpu/stream_texture_android.h
|
| +++ b/content/common/gpu/stream_texture_android.h
|
| @@ -14,6 +14,10 @@
|
| #include "ui/gl/android/surface_texture.h"
|
| #include "ui/gl/gl_image.h"
|
|
|
| +namespace ui {
|
| +class ScopedMakeCurrent;
|
| +}
|
| +
|
| namespace gfx {
|
| class Size;
|
| }
|
| @@ -56,6 +60,10 @@ class StreamTexture : public gl::GLImage,
|
| // GpuCommandBufferStub::DestructionObserver implementation.
|
| void OnWillDestroyStub() override;
|
|
|
| + scoped_ptr<ui::ScopedMakeCurrent> MakeStubCurrent();
|
| +
|
| + void UpdateTexImage();
|
| +
|
| // Called when a new frame is available for the SurfaceTexture.
|
| void OnFrameAvailable();
|
|
|
| @@ -86,6 +94,13 @@ class StreamTexture : public gl::GLImage,
|
| bool has_listener_;
|
| uint32_t texture_id_;
|
|
|
| + unsigned framebuffer_;
|
| + unsigned vertex_shader_;
|
| + unsigned fragment_shader_;
|
| + unsigned program_;
|
| + unsigned vertex_buffer_;
|
| + int u_xform_location_;
|
| +
|
| base::WeakPtrFactory<StreamTexture> weak_factory_;
|
| DISALLOW_COPY_AND_ASSIGN(StreamTexture);
|
| };
|
|
|