summaryrefslogtreecommitdiffstats
path: root/chrome/gpu
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-24 06:14:00 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-24 06:14:00 +0000
commit259750db9b2a4dbcde07d1e7078974df65c03053 (patch)
tree6b4833908726835b80a86b5572ea9163022cd78a /chrome/gpu
parentca4847f0a19f9565b6ca19fa47729bb746f5f736 (diff)
downloadchromium_src-259750db9b2a4dbcde07d1e7078974df65c03053.zip
chromium_src-259750db9b2a4dbcde07d1e7078974df65c03053.tar.gz
chromium_src-259750db9b2a4dbcde07d1e7078974df65c03053.tar.bz2
Revert 60421 - 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 TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/3398028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu')
-rw-r--r--chrome/gpu/gpu_thread.cc7
-rw-r--r--chrome/gpu/gpu_thread.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/gpu/gpu_thread.cc b/chrome/gpu/gpu_thread.cc
index 97cb5d1..cb2a89b 100644
--- a/chrome/gpu/gpu_thread.cc
+++ b/chrome/gpu/gpu_thread.cc
@@ -91,6 +91,8 @@ void GpuThread::OnControlMessageReceived(const IPC::Message& msg) {
OnCollectGraphicsInfo)
IPC_MESSAGE_HANDLER(GpuMsg_Crash,
OnCrash)
+ IPC_MESSAGE_HANDLER(GpuMsg_Hang,
+ OnHang)
IPC_END_MESSAGE_MAP_EX()
}
@@ -168,3 +170,8 @@ void GpuThread::OnCrash() {
volatile int* it_s_the_end_of_the_world_as_we_know_it = NULL;
*it_s_the_end_of_the_world_as_we_know_it = 0xdead;
}
+
+void GpuThread::OnHang() {
+ for (;;)
+ PlatformThread::Sleep(1000);
+}
diff --git a/chrome/gpu/gpu_thread.h b/chrome/gpu/gpu_thread.h
index 519b092..b896360 100644
--- a/chrome/gpu/gpu_thread.h
+++ b/chrome/gpu/gpu_thread.h
@@ -43,6 +43,7 @@ class GpuThread : public ChildThread {
void OnSynchronize();
void OnCollectGraphicsInfo();
void OnCrash();
+ void OnHang();
void OnNewRenderWidgetHostView(GpuNativeWindowHandle parent_window,
int32 routing_id);