diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 04:46:58 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 04:46:58 +0000 |
commit | 915a3abe017a65e6f3bcc76d2968df476efc4a6e (patch) | |
tree | 1f4b847f98e86893241883414aa6953513686f80 /chrome/browser | |
parent | f67739c609e177346004fcdd977ba0b192d1da43 (diff) | |
download | chromium_src-915a3abe017a65e6f3bcc76d2968df476efc4a6e.zip chromium_src-915a3abe017a65e6f3bcc76d2968df476efc4a6e.tar.gz chromium_src-915a3abe017a65e6f3bcc76d2968df476efc4a6e.tar.bz2 |
Revert 60373, trying to track down a perf regression (see bug 56752)- Add about:gpuhang
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/3447023
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/3398027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/browser_about_handler.cc | 8 | ||||
-rw-r--r-- | chrome/browser/gpu_process_host.cc | 5 | ||||
-rw-r--r-- | chrome/browser/gpu_process_host.h | 4 |
3 files changed, 2 insertions, 15 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 69ad244..4406a31 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -271,7 +271,7 @@ std::string AboutAbout() { html.append(kAllAboutPaths[i]); html.append("</a>\n"); } - const char *debug[] = { "crash", "hang", "shorthang", "gpucrash", "gpuhang" }; + const char *debug[] = { "crash", "hang", "shorthang", "gpucrash" }; html.append("</ul><h2>For Debug</h2>"); html.append("</ul><p>The following pages are for debugging purposes only. " "Because they crash or hang the renderer, they're not linked " @@ -1160,15 +1160,11 @@ bool WillHandleBrowserAboutURL(GURL* url, Profile* profile) { return true; } - // Handle URLs to wreck the gpu process. + // Handle URL to crash the gpu process. if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutGpuCrashURL)) { GpuProcessHost::SendAboutGpuCrash(); return true; } - if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutGpuHangURL)) { - GpuProcessHost::SendAboutGpuHang(); - return true; - } // There are a few about: URLs that we hand over to the renderer. If the // renderer wants them, don't do any rewriting. diff --git a/chrome/browser/gpu_process_host.cc b/chrome/browser/gpu_process_host.cc index f4c6164..f2bba1f 100644 --- a/chrome/browser/gpu_process_host.cc +++ b/chrome/browser/gpu_process_host.cc @@ -127,11 +127,6 @@ void GpuProcessHost::SendAboutGpuCrash() { Get()->Send(new GpuMsg_Crash()); } -// static -void GpuProcessHost::SendAboutGpuHang() { - Get()->Send(new GpuMsg_Hang()); -} - bool GpuProcessHost::Send(IPC::Message* msg) { if (!EnsureInitialized()) return false; diff --git a/chrome/browser/gpu_process_host.h b/chrome/browser/gpu_process_host.h index e4d4559..d885408 100644 --- a/chrome/browser/gpu_process_host.h +++ b/chrome/browser/gpu_process_host.h @@ -31,10 +31,6 @@ class GpuProcessHost : public BrowserChildProcessHost { // Tells the GPU process to crash. Useful for testing. static void SendAboutGpuCrash(); - // Tells the GPU process to let its main thread enter an infinite loop. - // Useful for testing. - static void SendAboutGpuHang(); - // Shutdown routine, which should only be called upon process // termination. static void Shutdown(); |