| Index: gpu/command_buffer/service/in_process_command_buffer.h
|
| diff --git a/gpu/command_buffer/service/in_process_command_buffer.h b/gpu/command_buffer/service/in_process_command_buffer.h
|
| index c406fbcd1b05018594052f3a76fd792265186348..e8ccb33ede2602b9f705e051506db2b0f26b4d50 100644
|
| --- a/gpu/command_buffer/service/in_process_command_buffer.h
|
| +++ b/gpu/command_buffer/service/in_process_command_buffer.h
|
| @@ -43,15 +43,6 @@ class GLSurface;
|
| class Size;
|
| }
|
|
|
| -#if defined(OS_ANDROID)
|
| -namespace gfx {
|
| -class SurfaceTexture;
|
| -}
|
| -namespace gpu {
|
| -class StreamTextureManagerInProcess;
|
| -}
|
| -#endif
|
| -
|
| namespace gpu {
|
| class SyncPointClient;
|
| class SyncPointOrderData;
|
| @@ -178,11 +169,6 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
|
| scoped_ptr<gpu::gles2::ProgramCache> program_cache_;
|
| };
|
|
|
| -#if defined(OS_ANDROID)
|
| - scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(uint32_t stream_id);
|
| - uint32_t CreateStreamTexture(uint32_t texture_id);
|
| -#endif
|
| -
|
| private:
|
| struct InitializeOnGpuThreadParams {
|
| bool is_offscreen;
|
| @@ -217,7 +203,6 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
|
| bool DestroyOnGpuThread();
|
| void FlushOnGpuThread(int32_t put_offset, uint32_t order_num);
|
| void ScheduleDelayedWorkOnGpuThread();
|
| - uint32_t CreateStreamTextureOnGpuThread(uint32_t client_texture_id);
|
| bool MakeCurrent();
|
| base::Closure WrapCallback(const base::Closure& callback);
|
| State GetStateFast();
|
| @@ -288,10 +273,6 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
|
| scoped_refptr<gfx::GLShareGroup> gl_share_group_;
|
| base::WaitableEvent fence_sync_wait_event_;
|
|
|
| -#if defined(OS_ANDROID)
|
| - scoped_ptr<StreamTextureManagerInProcess> stream_texture_manager_;
|
| -#endif
|
| -
|
| // Only used with explicit scheduling and the gpu thread is the same as
|
| // the client thread.
|
| scoped_ptr<base::SequenceChecker> sequence_checker_;
|
|
|