diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 02:28:56 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 02:28:56 +0000 |
| commit | 6fd550bdd8d9ad83330bed01efa25d801379e9f9 (patch) | |
| tree | 6e8031e453ffeb9e192f1eafbf18ea8d4c54657c /webkit/quota | |
| parent | dd8d12a86e01b35b76f4add67cf5e222a475662b (diff) | |
| download | chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.zip chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.tar.gz chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.tar.bz2 | |
Revert "Currently, base/timer.cc calls PostTask with FROM_HERE as the Location,
so the original code that created the delayed callback is lost."
This reverts commit 4cf5cf73d319b69c32ad30af8954235755856455. (r99284)
TBR=jbates@chromium.org
Review URL: http://codereview.chromium.org/7825026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/quota')
| -rw-r--r-- | webkit/quota/quota_database.cc | 4 | ||||
| -rw-r--r-- | webkit/quota/quota_manager.cc | 3 | ||||
| -rw-r--r-- | webkit/quota/quota_temporary_storage_evictor.cc | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/webkit/quota/quota_database.cc b/webkit/quota/quota_database.cc index d34451e..c9f2056 100644 --- a/webkit/quota/quota_database.cc +++ b/webkit/quota/quota_database.cc @@ -430,8 +430,8 @@ void QuotaDatabase::Commit() { void QuotaDatabase::ScheduleCommit() { if (timer_.IsRunning()) return; - timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kCommitIntervalMs), - this, &QuotaDatabase::Commit); + timer_.Start(base::TimeDelta::FromMilliseconds(kCommitIntervalMs), this, + &QuotaDatabase::Commit); } bool QuotaDatabase::FindOriginUsedCount( diff --git a/webkit/quota/quota_manager.cc b/webkit/quota/quota_manager.cc index 60d7c32..b5d9196 100644 --- a/webkit/quota/quota_manager.cc +++ b/webkit/quota/quota_manager.cc @@ -507,8 +507,7 @@ class QuotaManager::InitializeTask : public QuotaManager::DatabaseTaskBase { virtual void DatabaseTaskCompleted() OVERRIDE { manager()->need_initialize_origins_ = need_initialize_origins_; manager()->DidInitializeTemporaryGlobalQuota(temporary_storage_quota_); - manager()->histogram_timer_.Start(FROM_HERE, - QuotaManager::kReportHistogramInterval, + manager()->histogram_timer_.Start(QuotaManager::kReportHistogramInterval, manager(), &QuotaManager::ReportHistogram); } diff --git a/webkit/quota/quota_temporary_storage_evictor.cc b/webkit/quota/quota_temporary_storage_evictor.cc index 49229c3..8990331 100644 --- a/webkit/quota/quota_temporary_storage_evictor.cc +++ b/webkit/quota/quota_temporary_storage_evictor.cc @@ -128,15 +128,15 @@ void QuotaTemporaryStorageEvictor::Start() { if (histogram_timer_.IsRunning()) return; - histogram_timer_.Start(FROM_HERE, kHistogramReportInterval, this, + histogram_timer_.Start(kHistogramReportInterval, this, &QuotaTemporaryStorageEvictor::ReportPerHourHistogram); } void QuotaTemporaryStorageEvictor::StartEvictionTimerWithDelay(int delay_ms) { if (eviction_timer_.IsRunning()) return; - eviction_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(delay_ms), - this, &QuotaTemporaryStorageEvictor::ConsiderEviction); + eviction_timer_.Start(base::TimeDelta::FromMilliseconds(delay_ms), this, + &QuotaTemporaryStorageEvictor::ConsiderEviction); } void QuotaTemporaryStorageEvictor::ConsiderEviction() { |