diff options
| author | kbr <kbr@chromium.org> | 2015-03-17 19:29:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-18 02:30:57 +0000 |
| commit | 3f3c5c6bbbfcdb156635c686b822d4ab94797725 (patch) | |
| tree | edcd68abd524931dc444e4cf8753d7635e8988b5 /gpu | |
| parent | c0bde7562701892afcf977802e8e45bbbb01660b (diff) | |
| download | chromium_src-3f3c5c6bbbfcdb156635c686b822d4ab94797725.zip chromium_src-3f3c5c6bbbfcdb156635c686b822d4ab94797725.tar.gz chromium_src-3f3c5c6bbbfcdb156635c686b822d4ab94797725.tar.bz2 | |
Fixed race conditions in SystemInfo.getInfo.
SystemInfo.getInfo was not properly waiting for GPU information to be
collected when the GPU was available. Made this call asynchronous in
the browser DevTools protocol and hooked up GpuDataManager observers
to respond when it's collected. Return the data immediately when there
is no GPU available.
Note that it was not possible to wait for full GPU information to be
collected on Windows. This takes so long that internal 10-second
timeouts in the tests are hit in Debug mode on Windows. Fixed a bug in
MergeGpuInfo where the GpuDataManager would never think that full
information had been collected on Windows. Unfortunately it was not
easy to write a regression test for this fix.
Added a regression test in the gpu_process page set ensuring that the
gl_renderer string will always be available on the GPU bots.
BUG=454906
Review URL: https://codereview.chromium.org/999643002
Cr-Commit-Position: refs/heads/master@{#321058}
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/config/gpu_info_collector_win.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gpu/config/gpu_info_collector_win.cc b/gpu/config/gpu_info_collector_win.cc index c942852..cc935ea 100644 --- a/gpu/config/gpu_info_collector_win.cc +++ b/gpu/config/gpu_info_collector_win.cc @@ -506,6 +506,8 @@ void MergeGPUInfo(GPUInfo* basic_gpu_info, MergeGPUInfoGL(basic_gpu_info, context_gpu_info); + basic_gpu_info->dx_diagnostics_info_state = + context_gpu_info.dx_diagnostics_info_state; basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics; } |