diff options
| author | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 19:33:28 +0000 |
|---|---|---|
| committer | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 19:33:28 +0000 |
| commit | 923b561488b3b5fd733c703c287c720d3c3f3088 (patch) | |
| tree | e0b12a9565a87d67c2c3efc92f2fdcee2f4dd540 /chrome/browser/browser_about_handler.cc | |
| parent | b4c158db2d55a600c9e92691fdbe8709d04f84c8 (diff) | |
| download | chromium_src-923b561488b3b5fd733c703c287c720d3c3f3088.zip chromium_src-923b561488b3b5fd733c703c287c720d3c3f3088.tar.gz chromium_src-923b561488b3b5fd733c703c287c720d3c3f3088.tar.bz2 | |
Revert 63388 - http://build.chromium.org/buildbot/waterfall/builders/Mac10.6%20Tests%20(dbg)(2)/builds/10949
- 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
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/3979004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63396 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, 14 insertions, 24 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 432474a..3cba7dc 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -762,38 +762,28 @@ 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>\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("<h2>GPU Information</h2><ul>\n"); + html.append("<li><strong>Vendor ID:</strong> "); html.append(base::StringPrintf("0x%04x", gpu_info.vendor_id())); - html.append("</td></tr><tr><td>"); - html.append("<strong>Device ID</strong></td><td>"); + html.append("<li><strong>Device ID:</strong> "); html.append(base::StringPrintf("0x%04x", gpu_info.device_id())); - html.append("</td></tr><tr><td>"); - html.append("<strong>Driver Version</strong></td><td>"); + html.append("<li><strong>Driver Version:</strong> "); html.append(WideToASCII(gpu_info.driver_version()).c_str()); - 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("<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(VersionNumberToString( - gpu_info.vertex_shader_version()).c_str()); - html.append("</td></tr><tr><td>"); - html.append("<strong>GL Version</strong></td><td>"); + gpu_info.vertex_shader_version()).c_str()); + html.append("<li><strong>GL Version:</strong> "); html.append(VersionNumberToString(gpu_info.gl_version()).c_str()); - html.append("</td></tr></table>"); #if defined(OS_WIN) - html.append("<h2>DirectX Diagnostics</h2>"); + html.append("<li><strong>DirectX Diagnostics:</strong> "); DxDiagNodeToHTML(&html, gpu_info.dx_diagnostics()); #endif - html.append("</body></html>"); + html.append("</ul></body></html> "); } return html; } @@ -1130,11 +1120,11 @@ bool WillHandleBrowserAboutURL(GURL* url, Profile* profile) { // Handle URLs to wreck the gpu process. if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutGpuCrashURL)) { - GpuProcessHostUIShim::Get()->SendAboutGpuCrash(); + GpuProcessHost::SendAboutGpuCrash(); return true; } if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutGpuHangURL)) { - GpuProcessHostUIShim::Get()->SendAboutGpuHang(); + GpuProcessHost::SendAboutGpuHang(); return true; } |