diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
| commit | 7dbb3d5cf0c15f500944d211057644d6a2f37371 (patch) | |
| tree | 701119ba0596f51b0ab466d6472b0f98211359c5 /content/common/gpu/gpu_channel.h | |
| parent | b2ecf4836a0eb284ddac7746b1f7ba613777a739 (diff) | |
| download | chromium_org-7dbb3d5cf0c15f500944d211057644d6a2f37371.tar.gz | |
Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
Diffstat (limited to 'content/common/gpu/gpu_channel.h')
| -rw-r--r-- | content/common/gpu/gpu_channel.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h index ba017054d4..854a8591ea 100644 --- a/content/common/gpu/gpu_channel.h +++ b/content/common/gpu/gpu_channel.h @@ -124,6 +124,7 @@ class GpuChannel : public IPC::Listener, GpuCommandBufferStub* LookupCommandBuffer(int32 route_id); void LoseAllContexts(); + void MarkAllContextsLost(); // Destroy channel and all contained contexts. void DestroySoon(); @@ -228,6 +229,9 @@ class GpuChannel : public IPC::Listener, scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_; scoped_refptr<gpu::gles2::ImageManager> image_manager_; +#if defined(OS_ANDROID) + scoped_ptr<StreamTextureManagerAndroid> stream_texture_manager_; +#endif #if defined(ENABLE_GPU) typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap; @@ -242,10 +246,6 @@ class GpuChannel : public IPC::Listener, bool processed_get_state_fast_; IPC::Message* currently_processing_message_; -#if defined(OS_ANDROID) - scoped_ptr<StreamTextureManagerAndroid> stream_texture_manager_; -#endif - base::WeakPtrFactory<GpuChannel> weak_factory_; scoped_refptr<GpuChannelMessageFilter> filter_; |