diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 03:46:24 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 03:46:24 +0000 |
| commit | 3f9ab536e81f6ba3fb21123c71130781e0da0ca3 (patch) | |
| tree | 4669ea7adfce1724d0a1eca7771cbd0d96792a31 /content/gpu | |
| parent | b3f4b4c568ed1483b015a10269b365cd2e33528a (diff) | |
| download | chromium_src-3f9ab536e81f6ba3fb21123c71130781e0da0ca3.zip chromium_src-3f9ab536e81f6ba3fb21123c71130781e0da0ca3.tar.gz chromium_src-3f9ab536e81f6ba3fb21123c71130781e0da0ca3.tar.bz2 | |
Re-enable the GPU watchdog on Windows
We're seeing a lot of plugin and renderer-process hangs that are probably caused by GPU hangs, so we can try re-enabling the GPU watchdog to prevent them and see what's causing the GPU hangs.
BUG=144221
Review URL: https://chromiumcodereview.appspot.com/10993026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_child_thread.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index 2e318a7..952dbc1 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -148,15 +148,6 @@ void GpuChildThread::OnInitialize() { enable_watchdog = false; #endif - // Disable the watchdog for Windows. It tends to abort when the GPU process - // is not hung but still taking a long time to do something. Instead, the - // browser process displays a dialog when it notices that the child window - // is hung giving the user an opportunity to terminate it. This is the - // same mechanism used to abort hung plugins. -#if defined(OS_WIN) - enable_watchdog = false; -#endif - // Start the GPU watchdog only after anything that is expected to be time // consuming has completed, otherwise the process is liable to be aborted. if (enable_watchdog) { |