Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

Side by Side Diff: content/common/gpu/gpu_channel_manager.h

Issue 10795037: Revert 147328 - Current status of patch: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/common/gpu/gpu_channel.cc ('k') | content/common/gpu/gpu_channel_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <vector>
9
10 #include "base/hash_tables.h" 8 #include "base/hash_tables.h"
11 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
14 #include "base/message_loop_proxy.h" 11 #include "base/message_loop_proxy.h"
15 #include "build/build_config.h" 12 #include "build/build_config.h"
16 #include "content/common/gpu/gpu_memory_manager.h" 13 #include "content/common/gpu/gpu_memory_manager.h"
17 #include "ipc/ipc_listener.h" 14 #include "ipc/ipc_listener.h"
18 #include "ipc/ipc_sender.h" 15 #include "ipc/ipc_sender.h"
19 #include "ui/gfx/native_widget_types.h" 16 #include "ui/gfx/native_widget_types.h"
20 17
21 namespace base { 18 namespace base {
22 class WaitableEvent; 19 class WaitableEvent;
23 } 20 }
24 21
25 namespace gfx { 22 namespace gfx {
26 class GLShareGroup; 23 class GLShareGroup;
27 } 24 }
28 25
29 namespace gpu { 26 namespace gpu {
30 namespace gles2 { 27 namespace gles2 {
31 class MailboxManager; 28 class MailboxManager;
32 class ProgramCache;
33 } 29 }
34 } 30 }
35 31
36 namespace IPC { 32 namespace IPC {
37 struct ChannelHandle; 33 struct ChannelHandle;
38 } 34 }
39 35
40 class ChildThread; 36 class ChildThread;
41 class GpuChannel; 37 class GpuChannel;
42 class GpuWatchdog; 38 class GpuWatchdog;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 // These objects manage channels to individual renderer processes there is 109 // These objects manage channels to individual renderer processes there is
114 // one channel for each renderer process that has connected to this GPU 110 // one channel for each renderer process that has connected to this GPU
115 // process. 111 // process.
116 typedef base::hash_map<int, scoped_refptr<GpuChannel> > GpuChannelMap; 112 typedef base::hash_map<int, scoped_refptr<GpuChannel> > GpuChannelMap;
117 GpuChannelMap gpu_channels_; 113 GpuChannelMap gpu_channels_;
118 scoped_refptr<gfx::GLShareGroup> share_group_; 114 scoped_refptr<gfx::GLShareGroup> share_group_;
119 scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_; 115 scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
120 GpuMemoryManager gpu_memory_manager_; 116 GpuMemoryManager gpu_memory_manager_;
121 GpuWatchdog* watchdog_; 117 GpuWatchdog* watchdog_;
122 scoped_refptr<SyncPointManager> sync_point_manager_; 118 scoped_refptr<SyncPointManager> sync_point_manager_;
123 scoped_ptr<gpu::gles2::ProgramCache> program_cache_;
124 119
125 DISALLOW_COPY_AND_ASSIGN(GpuChannelManager); 120 DISALLOW_COPY_AND_ASSIGN(GpuChannelManager);
126 }; 121 };
127 122
128 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_ 123 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_channel.cc ('k') | content/common/gpu/gpu_channel_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698