diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 22:37:07 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 22:37:07 +0000 |
| commit | 6e3a70077033a4d37cb87bf521d5f99cc91921c8 (patch) | |
| tree | b16ade911872e86f9e18378dacd0eb081494e13b /chrome/test/gpu | |
| parent | 4ef777e8a4bebda665adb30c6631b4551e6b25b6 (diff) | |
| download | chromium_src-6e3a70077033a4d37cb87bf521d5f99cc91921c8.zip chromium_src-6e3a70077033a4d37cb87bf521d5f99cc91921c8.tar.gz chromium_src-6e3a70077033a4d37cb87bf521d5f99cc91921c8.tar.bz2 | |
Revert 72704 - Defered collect DirectX diagnostics until they are needed for about:gpu.
This is because collecting the stats often crashes.
Added a guard to prevent the collection of diagnostics on multiple threads simultaneously.
Renamed GPUInfo::Progress to GPUInfo::Level.
TEST=try, about:gpu does not cause concurrent diagnostics collection
BUG=none
Review URL: http://codereview.chromium.org/6364013
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/6370013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
| -rw-r--r-- | chrome/test/gpu/gpu_pixel_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index 221448f..8fcd37e 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -116,9 +116,9 @@ bool CollectGPUInfo(GPUInfo* client_info) { if (!gpu_host_shim) return false; GPUInfo info = gpu_host_shim->gpu_info(); - if (info.level() == GPUInfo::kUninitialized) { + if (info.progress() == GPUInfo::kUninitialized) { GPUInfoCollectedObserver observer(gpu_host_shim); - gpu_host_shim->CollectGraphicsInfoAsynchronously(GPUInfo::kPartial); + gpu_host_shim->CollectGraphicsInfoAsynchronously(); ui_test_utils::RunMessageLoop(); if (!observer.gpu_info_collected()) return false; |