summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 19:11:35 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 19:11:35 +0000
commitd4985e9da5c8b1aa3852c723625eaaf1518019a0 (patch)
tree2495a25151d503c9c2633cd55b021c48755294d3 /webkit
parent78eac2a2edb56ad0bd2714ab62154e5848f0d91d (diff)
downloadchromium_src-d4985e9da5c8b1aa3852c723625eaaf1518019a0.zip
chromium_src-d4985e9da5c8b1aa3852c723625eaaf1518019a0.tar.gz
chromium_src-d4985e9da5c8b1aa3852c723625eaaf1518019a0.tar.bz2
Really now... derive DomStorageTaskRunner from base::SequencedTaskRunner.
BUG=106763 Review URL: https://chromiumcodereview.appspot.com/9706004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/dom_storage/dom_storage_task_runner.cc15
-rw-r--r--webkit/dom_storage/dom_storage_task_runner.h15
2 files changed, 28 insertions, 2 deletions
diff --git a/webkit/dom_storage/dom_storage_task_runner.cc b/webkit/dom_storage/dom_storage_task_runner.cc
index 050cf16..4c051db 100644
--- a/webkit/dom_storage/dom_storage_task_runner.cc
+++ b/webkit/dom_storage/dom_storage_task_runner.cc
@@ -40,6 +40,21 @@ bool DomStorageTaskRunner::RunsTasksOnCurrentThread() const {
return true;
}
+bool DomStorageTaskRunner::PostNonNestableDelayedTask(
+ const tracked_objects::Location& from_here,
+ const base::Closure& task,
+ base::TimeDelta delay) {
+ return PostDelayedTask(from_here, task, delay);
+}
+
+bool DomStorageTaskRunner::PostNonNestableDelayedTask(
+ const tracked_objects::Location& from_here,
+ const base::Closure& task,
+ int64 delay_ms) {
+ return PostDelayedTask(
+ from_here, task, base::TimeDelta::FromMilliseconds(delay_ms));
+}
+
// DomStorageWorkerPoolTaskRunner
DomStorageWorkerPoolTaskRunner::DomStorageWorkerPoolTaskRunner(
diff --git a/webkit/dom_storage/dom_storage_task_runner.h b/webkit/dom_storage/dom_storage_task_runner.h
index 9fde32f..2ec2169 100644
--- a/webkit/dom_storage/dom_storage_task_runner.h
+++ b/webkit/dom_storage/dom_storage_task_runner.h
@@ -7,7 +7,7 @@
#pragma once
#include "base/memory/ref_counted.h"
-#include "base/task_runner.h"
+#include "base/sequenced_task_runner.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/time.h"
@@ -20,7 +20,7 @@ namespace dom_storage {
// Tasks must run serially with respect to one another, but may
// execute on different OS threads. The base class is implemented
// in terms of a MessageLoopProxy.
-class DomStorageTaskRunner : public base::TaskRunner {
+class DomStorageTaskRunner : public base::SequencedTaskRunner {
public:
explicit DomStorageTaskRunner(base::MessageLoopProxy* message_loop);
virtual ~DomStorageTaskRunner();
@@ -45,6 +45,17 @@ class DomStorageTaskRunner : public base::TaskRunner {
// value is hard coded to true.
virtual bool RunsTasksOnCurrentThread() const OVERRIDE;
+ // SequencedTaskRunner overrides, these are implemented in
+ // terms of PostDelayedTask and the latter is similarly deprecated.
+ virtual bool PostNonNestableDelayedTask(
+ const tracked_objects::Location& from_here,
+ const base::Closure& task,
+ base::TimeDelta delay) OVERRIDE;
+ virtual bool PostNonNestableDelayedTask(
+ const tracked_objects::Location& from_here,
+ const base::Closure& task,
+ int64 delay_ms) OVERRIDE;
+
protected:
const scoped_refptr<base::MessageLoopProxy> message_loop_;
};