diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 18:43:22 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 18:43:22 +0000 |
| commit | dcc7b326b585c5de60590cd808aed91342311d05 (patch) | |
| tree | 3743f9a91ccbbffb0961b6569622ac8d10867f75 /chrome/browser/browser_about_handler.cc | |
| parent | 155e86ad19e6b938796ceeffcf2c6143b78614d1 (diff) | |
| download | chromium_src-dcc7b326b585c5de60590cd808aed91342311d05.zip chromium_src-dcc7b326b585c5de60590cd808aed91342311d05.tar.gz chromium_src-dcc7b326b585c5de60590cd808aed91342311d05.tar.bz2 | |
Relanding 61718.
I disabled the GPU watchdog in three new cases:
- If the OSMesa software renderer is in use. This will disable it on bots.
- When running on valgrind, whether on a bot or locally.
- In debug builds
I added a GPU process initialization time to the GPU info.
I moved the GPU initialization code outside the watchdog protection because it can take a long time and trigger the watchdog.
I increased the timeout. I set up a field trial with different timeouts to see the rate of failure for each period.
I made ui_tests always run with OSMesa, for consistent operation on bots and when run locally.
Original CL description:
I added a watchdog thread that intermitently checks the main thread can respond
to tasks posted on its message queue.
I fixed some bugs that preventede GGL from failing when the GPU channel was
lost.
Added a command line swith to disable the watchdog thread for debugging
purposes.
TEST=try, local testing of all features
BUG=none
Review URL: http://codereview.chromium.org/3794011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_about_handler.cc')
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 3cba7dc..432474a 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -762,28 +762,38 @@ std::string AboutGpu() { html.append("</body></html> "); } else { html.append("<html><head><title>About GPU</title></head><body>\n"); - html.append("<h2>GPU Information</h2><ul>\n"); - html.append("<li><strong>Vendor ID:</strong> "); + html.append("<h2>GPU Information</h2>\n"); + html.append("<table><tr>"); + html.append("<td><strong>Initialization time</strong></td><td>"); + html.append(base::Int64ToString( + gpu_info.initialization_time().InMilliseconds())); + html.append("</td></tr><tr><td>"); + html.append("<strong>Vendor ID</strong></td><td>"); html.append(base::StringPrintf("0x%04x", gpu_info.vendor_id())); - html.append("<li><strong>Device ID:</strong> "); + html.append("</td></tr><tr><td>"); + html.append("<strong>Device ID</strong></td><td>"); html.append(base::StringPrintf("0x%04x", gpu_info.device_id())); - html.append("<li><strong>Driver Version:</strong> "); + html.append("</td></tr><tr><td>"); + html.append("<strong>Driver Version</strong></td><td>"); html.append(WideToASCII(gpu_info.driver_version()).c_str()); - html.append("<li><strong>Pixel Shader Version:</strong> "); - html.append(VersionNumberToString( - gpu_info.pixel_shader_version()).c_str()); - html.append("<li><strong>Vertex Shader Version:</strong> "); + html.append("</td></tr><tr><td>"); + html.append("<strong>Pixel Shader Version</strong></td><td>"); + html.append(VersionNumberToString(gpu_info.pixel_shader_version()).c_str()); + html.append("</td></tr><tr><td>"); + html.append("<strong>Vertex Shader Version</strong></td><td>"); html.append(VersionNumberToString( - gpu_info.vertex_shader_version()).c_str()); - html.append("<li><strong>GL Version:</strong> "); + gpu_info.vertex_shader_version()).c_str()); + html.append("</td></tr><tr><td>"); + html.append("<strong>GL Version</strong></td><td>"); html.append(VersionNumberToString(gpu_info.gl_version()).c_str()); + html.append("</td></tr></table>"); #if defined(OS_WIN) - html.append("<li><strong>DirectX Diagnostics:</strong> "); + html.append("<h2>DirectX Diagnostics</h2>"); DxDiagNodeToHTML(&html, gpu_info.dx_diagnostics()); #endif - html.append("</ul></body></html> "); + html.append("</body></html>"); } return html; } @@ -1120,11 +1130,11 @@ bool WillHandleBrowserAboutURL(GURL* url, Profile* profile) { // Handle URLs to wreck the gpu process. if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutGpuCrashURL)) { - GpuProcessHost::SendAboutGpuCrash(); + GpuProcessHostUIShim::Get()->SendAboutGpuCrash(); return true; } if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutGpuHangURL)) { - GpuProcessHost::SendAboutGpuHang(); + GpuProcessHostUIShim::Get()->SendAboutGpuHang(); return true; } |