summaryrefslogtreecommitdiffstats
path: root/content/gpu/gpu_watchdog_thread.cc
diff options
context:
space:
mode:
authorjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-23 03:49:02 +0000
committerjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-23 03:49:02 +0000
commit808f7fe7f54d770c411409d55a486437da664119 (patch)
treec31c85d40ae9ac7597902c32c6ec1d8be81c56c5 /content/gpu/gpu_watchdog_thread.cc
parentd8528c1042cb74073bea1a8adc0721be4c7eb64d (diff)
downloadchromium_src-808f7fe7f54d770c411409d55a486437da664119.zip
chromium_src-808f7fe7f54d770c411409d55a486437da664119.tar.gz
chromium_src-808f7fe7f54d770c411409d55a486437da664119.tar.bz2
Check the GPU watchdog after processing every 3D command.
Reduce the chance that a long stream of expensive 3D commands will cause the watchdog to go off by checking the watchdog after every 3D command. BUG=76603 TEST=none Review URL: http://codereview.chromium.org/6715006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu/gpu_watchdog_thread.cc')
-rw-r--r--content/gpu/gpu_watchdog_thread.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/content/gpu/gpu_watchdog_thread.cc b/content/gpu/gpu_watchdog_thread.cc
index a7d723c..0fda5b1 100644
--- a/content/gpu/gpu_watchdog_thread.cc
+++ b/content/gpu/gpu_watchdog_thread.cc
@@ -92,21 +92,21 @@ GpuWatchdogThread::GpuWatchdogTaskObserver::~GpuWatchdogTaskObserver() {
void GpuWatchdogThread::GpuWatchdogTaskObserver::WillProcessTask(
const Task* task)
{
- CheckArmed();
+ watchdog_->CheckArmed();
}
void GpuWatchdogThread::GpuWatchdogTaskObserver::DidProcessTask(
const Task* task)
{
- CheckArmed();
+ watchdog_->CheckArmed();
}
-void GpuWatchdogThread::GpuWatchdogTaskObserver::CheckArmed()
+void GpuWatchdogThread::CheckArmed()
{
// Acknowledge the watchdog if it has armed itself. The watchdog will not
// change its armed state until it is acknowledged.
- if (watchdog_->armed()) {
- watchdog_->PostAcknowledge();
+ if (armed()) {
+ PostAcknowledge();
}
}