diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
| commit | 4e180b6a0b4720a9b8e9e959a882386f690f08ff (patch) | |
| tree | 788435d09362885908ba5ba9ef868b852ca82c0b /content/common/gpu/gpu_channel.h | |
| parent | 1179b92b08db0c652a0cf003ab4d89b31ce3610f (diff) | |
| download | chromium_org-4e180b6a0b4720a9b8e9e959a882386f690f08ff.tar.gz | |
Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
Diffstat (limited to 'content/common/gpu/gpu_channel.h')
| -rw-r--r-- | content/common/gpu/gpu_channel.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h index 23c27e0a0a..b02fafb62e 100644 --- a/content/common/gpu/gpu_channel.h +++ b/content/common/gpu/gpu_channel.h @@ -244,10 +244,8 @@ class GpuChannel : public IPC::Listener, scoped_ptr<StreamTextureManagerAndroid> stream_texture_manager_; #endif -#if defined(ENABLE_GPU) typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap; StubMap stubs_; -#endif // defined (ENABLE_GPU) typedef IDMap<GpuVideoEncodeAccelerator, IDMapOwnPointer> EncoderMap; EncoderMap video_encoders_; |