Index: content/browser/gpu/gpu_process_host.cc |
=================================================================== |
--- content/browser/gpu/gpu_process_host.cc (revision 201163) |
+++ content/browser/gpu/gpu_process_host.cc (working copy) |
@@ -706,14 +706,14 @@ |
// If GPU features are already blacklisted, no need to establish the channel. |
if (!GpuDataManagerImpl::GetInstance()->GpuAccessAllowed(NULL)) { |
- callback.Run(IPC::ChannelHandle(), GPUInfo()); |
+ callback.Run(IPC::ChannelHandle(), gpu::GPUInfo()); |
return; |
} |
if (Send(new GpuMsg_EstablishChannel(client_id, share_context))) { |
channel_requests_.push(callback); |
} else { |
- callback.Run(IPC::ChannelHandle(), GPUInfo()); |
+ callback.Run(IPC::ChannelHandle(), gpu::GPUInfo()); |
} |
if (!CommandLine::ForCurrentProcess()->HasSwitch( |
@@ -793,7 +793,7 @@ |
if (!channel_handle.name.empty() && |
!GpuDataManagerImpl::GetInstance()->GpuAccessAllowed(NULL)) { |
Send(new GpuMsg_CloseChannel(channel_handle)); |
- callback.Run(IPC::ChannelHandle(), GPUInfo()); |
+ callback.Run(IPC::ChannelHandle(), gpu::GPUInfo()); |
RouteOnUIThread(GpuHostMsg_OnLogMessage( |
logging::LOG_WARNING, |
"WARNING", |
@@ -1189,7 +1189,7 @@ |
while (!channel_requests_.empty()) { |
EstablishChannelCallback callback = channel_requests_.front(); |
channel_requests_.pop(); |
- callback.Run(IPC::ChannelHandle(), GPUInfo()); |
+ callback.Run(IPC::ChannelHandle(), gpu::GPUInfo()); |
} |
while (!create_command_buffer_requests_.empty()) { |
@@ -1211,7 +1211,7 @@ |
std::string GpuProcessHost::GetShaderPrefixKey() { |
if (shader_prefix_key_.empty()) { |
- GPUInfo info = GpuDataManagerImpl::GetInstance()->GetGPUInfo(); |
+ gpu::GPUInfo info = GpuDataManagerImpl::GetInstance()->GetGPUInfo(); |
std::string in_str = GetContentClient()->GetProduct() + "-" + |
info.gl_vendor + "-" + info.gl_renderer + "-" + |