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

Side by Side Diff: content/common/gpu/client/gpu_channel_host.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
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_CLIENT_GPU_CHANNEL_HOST_H_ 5 #ifndef CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_
6 #define CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_ 6 #define CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // The GPU stats reported by the GPU process. 102 // The GPU stats reported by the GPU process.
103 const gpu::GPUInfo& gpu_info() const { return gpu_info_; } 103 const gpu::GPUInfo& gpu_info() const { return gpu_info_; }
104 104
105 // IPC::Sender implementation: 105 // IPC::Sender implementation:
106 virtual bool Send(IPC::Message* msg) OVERRIDE; 106 virtual bool Send(IPC::Message* msg) OVERRIDE;
107 107
108 // Create and connect to a command buffer in the GPU process. 108 // Create and connect to a command buffer in the GPU process.
109 CommandBufferProxyImpl* CreateViewCommandBuffer( 109 CommandBufferProxyImpl* CreateViewCommandBuffer(
110 int32 surface_id, 110 int32 surface_id,
111 CommandBufferProxyImpl* share_group, 111 CommandBufferProxyImpl* share_group,
112 const std::string& allowed_extensions,
113 const std::vector<int32>& attribs, 112 const std::vector<int32>& attribs,
114 const GURL& active_url, 113 const GURL& active_url,
115 gfx::GpuPreference gpu_preference); 114 gfx::GpuPreference gpu_preference);
116 115
117 // Create and connect to a command buffer in the GPU process. 116 // Create and connect to a command buffer in the GPU process.
118 CommandBufferProxyImpl* CreateOffscreenCommandBuffer( 117 CommandBufferProxyImpl* CreateOffscreenCommandBuffer(
119 const gfx::Size& size, 118 const gfx::Size& size,
120 CommandBufferProxyImpl* share_group, 119 CommandBufferProxyImpl* share_group,
121 const std::string& allowed_extensions,
122 const std::vector<int32>& attribs, 120 const std::vector<int32>& attribs,
123 const GURL& active_url, 121 const GURL& active_url,
124 gfx::GpuPreference gpu_preference); 122 gfx::GpuPreference gpu_preference);
125 123
126 // Creates a video decoder in the GPU process. 124 // Creates a video decoder in the GPU process.
127 scoped_ptr<media::VideoDecodeAccelerator> CreateVideoDecoder( 125 scoped_ptr<media::VideoDecodeAccelerator> CreateVideoDecoder(
128 int command_buffer_route_id, 126 int command_buffer_route_id,
129 media::VideoCodecProfile profile, 127 media::VideoCodecProfile profile,
130 media::VideoDecodeAccelerator::Client* client); 128 media::VideoDecodeAccelerator::Client* client);
131 129
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 // Used to look up a proxy from its routing id. 249 // Used to look up a proxy from its routing id.
252 typedef base::hash_map<int, CommandBufferProxyImpl*> ProxyMap; 250 typedef base::hash_map<int, CommandBufferProxyImpl*> ProxyMap;
253 ProxyMap proxies_; 251 ProxyMap proxies_;
254 252
255 DISALLOW_COPY_AND_ASSIGN(GpuChannelHost); 253 DISALLOW_COPY_AND_ASSIGN(GpuChannelHost);
256 }; 254 };
257 255
258 } // namespace content 256 } // namespace content
259 257
260 #endif // CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_ 258 #endif // CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698