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

Unified Diff: content/browser/gpu/gpu_process_host.cc

Issue 15385003: Move GPU device/driver info related code from content to gpu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/gpu/gpu_process_host.h ('k') | content/browser/gpu/gpu_process_host_ui_shim.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 + "-" +
« no previous file with comments | « content/browser/gpu/gpu_process_host.h ('k') | content/browser/gpu/gpu_process_host_ui_shim.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698