summaryrefslogtreecommitdiffstats
path: root/chrome/gpu
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 01:04:07 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 01:04:07 +0000
commit5ea0531c8ca788207d7e5c2b5c95a9127916a73a (patch)
treeb1d1cec6da7f2b48026fde2b2a794ea1a44ca605 /chrome/gpu
parent6ec61ab284475f5e9d03cfdc47b1c406dc32c720 (diff)
downloadchromium_src-5ea0531c8ca788207d7e5c2b5c95a9127916a73a.zip
chromium_src-5ea0531c8ca788207d7e5c2b5c95a9127916a73a.tar.gz
chromium_src-5ea0531c8ca788207d7e5c2b5c95a9127916a73a.tar.bz2
Enable GPU watchdog timer.
TEST=try BUG=none Review URL: http://codereview.chromium.org/4655003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu')
-rw-r--r--chrome/gpu/gpu_main.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/gpu/gpu_main.cc b/chrome/gpu/gpu_main.cc
index 2139e27..7ee9622c 100644
--- a/chrome/gpu/gpu_main.cc
+++ b/chrome/gpu/gpu_main.cc
@@ -134,13 +134,6 @@ int GpuMain(const MainFunctionParams& parameters) {
enable_watchdog = false;
#endif
-// TODO(apatrick): Disable for this commit. I want to enable this feature with
-// a simple single file change that can easily be reverted if need be without
-// losing all the other features of the patch.
-#if 1
- enable_watchdog = false;
-#endif
-
scoped_refptr<GpuWatchdogThread> watchdog_thread;
if (enable_watchdog) {
watchdog_thread = new GpuWatchdogThread(MessageLoop::current(),