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

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

Issue 25666014: Remove the ENABLE_GPU #define and enable_gpu gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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 | « build/common.gypi ('k') | content/common/gpu/gpu_channel.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_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 7
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 10
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 // The share group that all contexts associated with a particular renderer 237 // The share group that all contexts associated with a particular renderer
238 // process use. 238 // process use.
239 scoped_refptr<gfx::GLShareGroup> share_group_; 239 scoped_refptr<gfx::GLShareGroup> share_group_;
240 240
241 scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_; 241 scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
242 scoped_refptr<gpu::gles2::ImageManager> image_manager_; 242 scoped_refptr<gpu::gles2::ImageManager> image_manager_;
243 #if defined(OS_ANDROID) 243 #if defined(OS_ANDROID)
244 scoped_ptr<StreamTextureManagerAndroid> stream_texture_manager_; 244 scoped_ptr<StreamTextureManagerAndroid> stream_texture_manager_;
245 #endif 245 #endif
246 246
247 #if defined(ENABLE_GPU)
248 typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap; 247 typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap;
249 StubMap stubs_; 248 StubMap stubs_;
250 #endif // defined (ENABLE_GPU)
251 249
252 typedef IDMap<GpuVideoEncodeAccelerator, IDMapOwnPointer> EncoderMap; 250 typedef IDMap<GpuVideoEncodeAccelerator, IDMapOwnPointer> EncoderMap;
253 EncoderMap video_encoders_; 251 EncoderMap video_encoders_;
254 252
255 bool log_messages_; // True if we should log sent and received messages. 253 bool log_messages_; // True if we should log sent and received messages.
256 gpu::gles2::DisallowedFeatures disallowed_features_; 254 gpu::gles2::DisallowedFeatures disallowed_features_;
257 GpuWatchdog* watchdog_; 255 GpuWatchdog* watchdog_;
258 bool software_; 256 bool software_;
259 bool handle_messages_scheduled_; 257 bool handle_messages_scheduled_;
260 bool processed_get_state_fast_; 258 bool processed_get_state_fast_;
261 IPC::Message* currently_processing_message_; 259 IPC::Message* currently_processing_message_;
262 260
263 base::WeakPtrFactory<GpuChannel> weak_factory_; 261 base::WeakPtrFactory<GpuChannel> weak_factory_;
264 262
265 scoped_refptr<GpuChannelMessageFilter> filter_; 263 scoped_refptr<GpuChannelMessageFilter> filter_;
266 scoped_refptr<base::MessageLoopProxy> io_message_loop_; 264 scoped_refptr<base::MessageLoopProxy> io_message_loop_;
267 265
268 size_t num_stubs_descheduled_; 266 size_t num_stubs_descheduled_;
269 267
270 DISALLOW_COPY_AND_ASSIGN(GpuChannel); 268 DISALLOW_COPY_AND_ASSIGN(GpuChannel);
271 }; 269 };
272 270
273 } // namespace content 271 } // namespace content
274 272
275 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_H_ 273 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_H_
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | content/common/gpu/gpu_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698