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

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

Issue 23660006: FeatureInfo: Remove allowed_extensions and init workarounds early (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android_webview build Created 7 years, 3 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_command_buffer_stub.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_COMMAND_BUFFER_STUB_H_ 5 #ifndef CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
6 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ 6 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 LatencyInfoCallback; 63 LatencyInfoCallback;
64 64
65 GpuCommandBufferStub( 65 GpuCommandBufferStub(
66 GpuChannel* channel, 66 GpuChannel* channel,
67 GpuCommandBufferStub* share_group, 67 GpuCommandBufferStub* share_group,
68 const gfx::GLSurfaceHandle& handle, 68 const gfx::GLSurfaceHandle& handle,
69 gpu::gles2::MailboxManager* mailbox_manager, 69 gpu::gles2::MailboxManager* mailbox_manager,
70 gpu::gles2::ImageManager* image_manager, 70 gpu::gles2::ImageManager* image_manager,
71 const gfx::Size& size, 71 const gfx::Size& size,
72 const gpu::gles2::DisallowedFeatures& disallowed_features, 72 const gpu::gles2::DisallowedFeatures& disallowed_features,
73 const std::string& allowed_extensions,
74 const std::vector<int32>& attribs, 73 const std::vector<int32>& attribs,
75 gfx::GpuPreference gpu_preference, 74 gfx::GpuPreference gpu_preference,
76 bool use_virtualized_gl_context, 75 bool use_virtualized_gl_context,
77 int32 route_id, 76 int32 route_id,
78 int32 surface_id, 77 int32 surface_id,
79 GpuWatchdog* watchdog, 78 GpuWatchdog* watchdog,
80 bool software, 79 bool software,
81 const GURL& active_url); 80 const GURL& active_url);
82 81
83 virtual ~GpuCommandBufferStub(); 82 virtual ~GpuCommandBufferStub();
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 // GpuChannels destroy all the GpuCommandBufferStubs that they own when they 206 // GpuChannels destroy all the GpuCommandBufferStubs that they own when they
208 // are destroyed. So a raw pointer is safe. 207 // are destroyed. So a raw pointer is safe.
209 GpuChannel* channel_; 208 GpuChannel* channel_;
210 209
211 // The group of contexts that share namespaces with this context. 210 // The group of contexts that share namespaces with this context.
212 scoped_refptr<gpu::gles2::ContextGroup> context_group_; 211 scoped_refptr<gpu::gles2::ContextGroup> context_group_;
213 212
214 gfx::GLSurfaceHandle handle_; 213 gfx::GLSurfaceHandle handle_;
215 gfx::Size initial_size_; 214 gfx::Size initial_size_;
216 gpu::gles2::DisallowedFeatures disallowed_features_; 215 gpu::gles2::DisallowedFeatures disallowed_features_;
217 std::string allowed_extensions_;
218 std::vector<int32> requested_attribs_; 216 std::vector<int32> requested_attribs_;
219 gfx::GpuPreference gpu_preference_; 217 gfx::GpuPreference gpu_preference_;
220 bool use_virtualized_gl_context_; 218 bool use_virtualized_gl_context_;
221 int32 route_id_; 219 int32 route_id_;
222 int32 surface_id_; 220 int32 surface_id_;
223 bool software_; 221 bool software_;
224 uint32 last_flush_count_; 222 uint32 last_flush_count_;
225 223
226 scoped_ptr<gpu::CommandBufferService> command_buffer_; 224 scoped_ptr<gpu::CommandBufferService> command_buffer_;
227 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_; 225 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
(...skipping 26 matching lines...) Expand all
254 size_t active_url_hash_; 252 size_t active_url_hash_;
255 253
256 size_t total_gpu_memory_; 254 size_t total_gpu_memory_;
257 255
258 DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub); 256 DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
259 }; 257 };
260 258
261 } // namespace content 259 } // namespace content
262 260
263 #endif // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ 261 #endif // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_channel.cc ('k') | content/common/gpu/gpu_command_buffer_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698