diff options
author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 19:20:41 +0000 |
---|---|---|
committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 19:20:41 +0000 |
commit | 2dcf702dacaaf1c46e29101da213c26f0465732a (patch) | |
tree | 026d73ae3053a78fec1a0f01b06bb1c89f6cc50a /content/gpu | |
parent | 4c76d7cc78ca3eef79535a3c2a4d934f436c6797 (diff) | |
download | chromium_src-2dcf702dacaaf1c46e29101da213c26f0465732a.zip chromium_src-2dcf702dacaaf1c46e29101da213c26f0465732a.tar.gz chromium_src-2dcf702dacaaf1c46e29101da213c26f0465732a.tar.bz2 |
Inverted dependency between code in content/common/gpu and the GpuWatchdogThread class.This completes the split between code in content/gpu, which only ever runs in the GPU process and code in content/common/gpu, which can run in any process, though in practice only the GPU process or the browser process.I updated the DEPS file in content/common to enforce the dependency and prevent code that could run in either process depend on code that should only run in the GPU process.TEST=tryBUG=none
TEST=try
BUG=none
Review URL: http://codereview.chromium.org/6840041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
-rw-r--r-- | content/gpu/gpu_watchdog_thread.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/content/gpu/gpu_watchdog_thread.h b/content/gpu/gpu_watchdog_thread.h index 68aeea7..df4a471 100644 --- a/content/gpu/gpu_watchdog_thread.h +++ b/content/gpu/gpu_watchdog_thread.h @@ -11,10 +11,12 @@ #include "base/task.h" #include "base/threading/thread.h" #include "base/time.h" +#include "content/common/gpu/gpu_watchdog.h" // A thread that intermitently sends tasks to a group of watched message loops // and deliberately crashes if one of them does not respond after a timeout. class GpuWatchdogThread : public base::Thread, + public GpuWatchdog, public base::RefCountedThreadSafe<GpuWatchdogThread> { public: explicit GpuWatchdogThread(int timeout); @@ -23,7 +25,9 @@ class GpuWatchdogThread : public base::Thread, // Accessible on watched thread but only modified by watchdog thread. bool armed() const { return armed_; } void PostAcknowledge(); - void CheckArmed(); + + // Implement GpuWatchdog. + virtual void CheckArmed(); protected: virtual void Init(); |