Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_COMMON_GPU_GPU_CHANNEL_H_ | 5 #ifndef CONTENT_COMMON_GPU_GPU_CHANNEL_H_ |
| 6 #define CONTENT_COMMON_GPU_GPU_CHANNEL_H_ | 6 #define CONTENT_COMMON_GPU_GPU_CHANNEL_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 MessageRouter router_; | 171 MessageRouter router_; |
| 172 | 172 |
| 173 // The share group that all contexts associated with a particular renderer | 173 // The share group that all contexts associated with a particular renderer |
| 174 // process use. | 174 // process use. |
| 175 scoped_refptr<gfx::GLShareGroup> share_group_; | 175 scoped_refptr<gfx::GLShareGroup> share_group_; |
| 176 | 176 |
| 177 #if defined(ENABLE_GPU) | 177 #if defined(ENABLE_GPU) |
| 178 typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap; | 178 typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap; |
| 179 StubMap stubs_; | 179 StubMap stubs_; |
| 180 | 180 |
| 181 std::map<int32, GpuCommandBufferStub*> stubs_by_video_decoder_id_; | |
|
Ami GONE FROM CHROMIUM
2011/06/30 22:20:39
Does it work to use an IDMap<GpuCommandBufferStub,
vrk (LEFT CHROMIUM)
2011/07/01 18:12:14
No need for this map anymore! Create/Destroy messa
| |
| 182 | |
| 181 typedef IDMap<GpuSurfaceStub, IDMapOwnPointer> SurfaceMap; | 183 typedef IDMap<GpuSurfaceStub, IDMapOwnPointer> SurfaceMap; |
| 182 SurfaceMap surfaces_; | 184 SurfaceMap surfaces_; |
| 183 | 185 |
| 184 std::set<int32> latched_routes_; | 186 std::set<int32> latched_routes_; |
| 185 #endif // defined (ENABLE_GPU) | 187 #endif // defined (ENABLE_GPU) |
| 186 | 188 |
| 187 // A collection of transport textures created. | 189 // A collection of transport textures created. |
| 188 typedef IDMap<TransportTexture, IDMapOwnPointer> TransportTextureMap; | 190 typedef IDMap<TransportTexture, IDMapOwnPointer> TransportTextureMap; |
| 189 TransportTextureMap transport_textures_; | 191 TransportTextureMap transport_textures_; |
| 190 | 192 |
| 191 bool log_messages_; // True if we should log sent and received messages. | 193 bool log_messages_; // True if we should log sent and received messages. |
| 192 gpu::gles2::DisallowedExtensions disallowed_extensions_; | 194 gpu::gles2::DisallowedExtensions disallowed_extensions_; |
| 193 GpuWatchdog* watchdog_; | 195 GpuWatchdog* watchdog_; |
| 194 | 196 |
| 195 DISALLOW_COPY_AND_ASSIGN(GpuChannel); | 197 DISALLOW_COPY_AND_ASSIGN(GpuChannel); |
| 196 }; | 198 }; |
| 197 | 199 |
| 198 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_H_ | 200 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_H_ |
| OLD | NEW |