| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_MANAGER_H_ | 5 #ifndef CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_ |
| 6 #define CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_ | 6 #define CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 return sync_point_manager_.get(); | 99 return sync_point_manager_.get(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 gfx::GLSurface* GetDefaultOffscreenSurface(); | 102 gfx::GLSurface* GetDefaultOffscreenSurface(); |
| 103 | 103 |
| 104 GpuMemoryBufferFactory* gpu_memory_buffer_factory() { | 104 GpuMemoryBufferFactory* gpu_memory_buffer_factory() { |
| 105 return gpu_memory_buffer_factory_.get(); | 105 return gpu_memory_buffer_factory_.get(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 private: | 108 private: |
| 109 typedef base::ScopedPtrHashMap<int, GpuChannel> GpuChannelMap; | 109 typedef base::ScopedPtrHashMap<int, scoped_ptr<GpuChannel>> GpuChannelMap; |
| 110 | 110 |
| 111 // Message handlers. | 111 // Message handlers. |
| 112 void OnEstablishChannel(int client_id, | 112 void OnEstablishChannel(int client_id, |
| 113 bool share_context, | 113 bool share_context, |
| 114 bool allow_future_sync_points); | 114 bool allow_future_sync_points); |
| 115 void OnCloseChannel(const IPC::ChannelHandle& channel_handle); | 115 void OnCloseChannel(const IPC::ChannelHandle& channel_handle); |
| 116 void OnVisibilityChanged( | 116 void OnVisibilityChanged( |
| 117 int32 render_view_id, int32 client_id, bool visible); | 117 int32 render_view_id, int32 client_id, bool visible); |
| 118 void OnCreateViewCommandBuffer( | 118 void OnCreateViewCommandBuffer( |
| 119 const gfx::GLSurfaceHandle& window, | 119 const gfx::GLSurfaceHandle& window, |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 // that any WeakPtrs to Controller are invalidated before its members | 165 // that any WeakPtrs to Controller are invalidated before its members |
| 166 // variable's destructors are executed, rendering them invalid. | 166 // variable's destructors are executed, rendering them invalid. |
| 167 base::WeakPtrFactory<GpuChannelManager> weak_factory_; | 167 base::WeakPtrFactory<GpuChannelManager> weak_factory_; |
| 168 | 168 |
| 169 DISALLOW_COPY_AND_ASSIGN(GpuChannelManager); | 169 DISALLOW_COPY_AND_ASSIGN(GpuChannelManager); |
| 170 }; | 170 }; |
| 171 | 171 |
| 172 } // namespace content | 172 } // namespace content |
| 173 | 173 |
| 174 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_ | 174 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_ |
| OLD | NEW |