diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 20:05:00 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 20:05:00 +0000 |
| commit | d7b5cc74aad6ae9f5f8425a9dba0c6f3b7a4e058 (patch) | |
| tree | 80ed4f402a2df66036b1c46a80ff29d77dd2fa64 /content/gpu/gpu_child_thread.cc | |
| parent | 863b582d75c8f9acf404751d7e709803df1f7bb9 (diff) | |
| download | chromium_src-d7b5cc74aad6ae9f5f8425a9dba0c6f3b7a4e058.zip chromium_src-d7b5cc74aad6ae9f5f8425a9dba0c6f3b7a4e058.tar.gz chromium_src-d7b5cc74aad6ae9f5f8425a9dba0c6f3b7a4e058.tar.bz2 | |
Move GPU device/driver info related code from content to gpu.
Try to reland r201380 with build fix.
This has been suggested by gman, and agreed by kbr and jam, for the following reasons:
1) These are gpu related code, and are independent of content / browser, so putting them under gpu/ is the right thing to do conceptually.
2) This enables us to set up tests in various places with the correct blacklisting/driver_bug_workarounds information. Otherwise, for the moment, gpu/ has no visibility into content/ side, so we have to duplicate the driver_bug_workarounds code and hardwire them for testing purpose. This is going to cause a lot of bugs in the future, as we have the two pieces of code for the same thing (one for chrome and one for testing) and people will easily forget to update one or the other.
As for this patch, I didn't change the logic, and try to minimize the refactoring. All improvements enabled by this relocation will be done in follow-up CLs.
BUG=230477
TEST=tree
TBR=apatrick@chromium.org, joi@chromium.org, kbr@chromium.org, piman@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/15745014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu/gpu_child_thread.cc')
| -rw-r--r-- | content/gpu/gpu_child_thread.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index a4bc0ff7..acd26d8 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -13,10 +13,10 @@ #include "build/build_config.h" #include "content/common/child_process.h" #include "content/common/gpu/gpu_messages.h" -#include "content/gpu/gpu_info_collector.h" #include "content/gpu/gpu_watchdog_thread.h" #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" +#include "gpu/config/gpu_info_collector.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_sync_message_filter.h" #include "ui/gl/gl_implementation.h" @@ -54,7 +54,7 @@ bool GpuProcessLogMessageHandler(int severity, GpuChildThread::GpuChildThread(GpuWatchdogThread* watchdog_thread, bool dead_on_arrival, - const GPUInfo& gpu_info) + const gpu::GPUInfo& gpu_info) : dead_on_arrival_(dead_on_arrival), gpu_info_(gpu_info), in_browser_process_(false) { @@ -176,15 +176,15 @@ void GpuChildThread::OnCollectGraphicsInfo() { in_browser_process_); #endif // OS_WIN - if (!gpu_info_collector::CollectContextGraphicsInfo(&gpu_info_)) - VLOG(1) << "gpu_info_collector::CollectGraphicsInfo failed"; + if (!gpu::CollectContextGraphicsInfo(&gpu_info_)) + VLOG(1) << "gpu::CollectGraphicsInfo failed"; GetContentClient()->SetGpuInfo(gpu_info_); #if defined(OS_WIN) // This is slow, but it's the only thing the unsandboxed GPU process does, // and GpuDataManager prevents us from sending multiple collecting requests, // so it's OK to be blocking. - gpu_info_collector::GetDxDiagnostics(&gpu_info_.dx_diagnostics); + gpu::GetDxDiagnostics(&gpu_info_.dx_diagnostics); gpu_info_.finalized = true; #endif // OS_WIN |