diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/fileapi/obfuscated_file_system_file_util.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/resource_fetcher.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/resource_fetcher_unittest.cc | 3 | ||||
| -rw-r--r-- | webkit/glue/webkitplatformsupport_impl.cc | 4 | ||||
| -rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl_mac.mm | 5 | ||||
| -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 | ||||
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/simple_resource_loader_bridge.cc | 2 |
10 files changed, 19 insertions, 16 deletions
diff --git a/webkit/fileapi/obfuscated_file_system_file_util.cc b/webkit/fileapi/obfuscated_file_system_file_util.cc index f07adfa..6c51cba 100644 --- a/webkit/fileapi/obfuscated_file_system_file_util.cc +++ b/webkit/fileapi/obfuscated_file_system_file_util.cc @@ -1195,8 +1195,8 @@ void ObfuscatedFileSystemFileUtil::MarkUsed() { if (timer_.IsRunning()) timer_.Reset(); else - timer_.Start(base::TimeDelta::FromSeconds(kFlushDelaySeconds), this, - &ObfuscatedFileSystemFileUtil::DropDatabases); + timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kFlushDelaySeconds), + this, &ObfuscatedFileSystemFileUtil::DropDatabases); } void ObfuscatedFileSystemFileUtil::DropDatabases() { diff --git a/webkit/glue/resource_fetcher.cc b/webkit/glue/resource_fetcher.cc index a22af59..ae8c917 100644 --- a/webkit/glue/resource_fetcher.cc +++ b/webkit/glue/resource_fetcher.cc @@ -127,7 +127,7 @@ ResourceFetcherWithTimeout::ResourceFetcherWithTimeout( const GURL& url, WebFrame* frame, WebURLRequest::TargetType target_type, int timeout_secs, Callback* callback) : ResourceFetcher(url, frame, target_type, callback) { - timeout_timer_.Start(TimeDelta::FromSeconds(timeout_secs), this, + timeout_timer_.Start(FROM_HERE, TimeDelta::FromSeconds(timeout_secs), this, &ResourceFetcherWithTimeout::TimeoutFired); } diff --git a/webkit/glue/resource_fetcher_unittest.cc b/webkit/glue/resource_fetcher_unittest.cc index 9ef0fc6..be878f3 100644 --- a/webkit/glue/resource_fetcher_unittest.cc +++ b/webkit/glue/resource_fetcher_unittest.cc @@ -70,7 +70,8 @@ class FetcherDelegate { } void StartTimer() { - timer_.Start(base::TimeDelta::FromMilliseconds(kMaxWaitTimeMs), + timer_.Start(FROM_HERE, + base::TimeDelta::FromMilliseconds(kMaxWaitTimeMs), this, &FetcherDelegate::TimerFired); } diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index 6405431..b3dfaec 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -528,8 +528,8 @@ void WebKitPlatformSupportImpl::setSharedTimerFireInterval( interval = 0; shared_timer_.Stop(); - shared_timer_.Start(base::TimeDelta::FromMicroseconds(interval), this, - &WebKitPlatformSupportImpl::DoTimeout); + shared_timer_.Start(FROM_HERE, base::TimeDelta::FromMicroseconds(interval), + this, &WebKitPlatformSupportImpl::DoTimeout); } void WebKitPlatformSupportImpl::stopSharedTimer() { diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm index bdd6eac..5de0b59 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm +++ b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm @@ -122,7 +122,8 @@ class CarbonIdleEventSource { // Adds |delegate| to this visibility group. void RegisterDelegate(WebPluginDelegateImpl* delegate) { if (delegates_.empty()) { - timer_.Start(base::TimeDelta::FromMilliseconds(timer_period_), + timer_.Start(FROM_HERE, + base::TimeDelta::FromMilliseconds(timer_period_), this, &VisibilityGroup::SendIdleEvents); } delegates_.insert(delegate); @@ -1023,7 +1024,7 @@ void WebPluginDelegateImpl::PluginVisibilityChanged() { if (instance()->drawing_model() == NPDrawingModelCoreAnimation) { bool plugin_visible = container_is_visible_ && !clip_rect_.IsEmpty(); if (plugin_visible && !redraw_timer_->IsRunning() && windowed_handle()) { - redraw_timer_->Start( + redraw_timer_->Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kCoreAnimationRedrawPeriodMs), this, &WebPluginDelegateImpl::DrawLayerInSurface); } else if (!plugin_visible) { diff --git a/webkit/quota/quota_database.cc b/webkit/quota/quota_database.cc index c9f2056..d34451e 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(base::TimeDelta::FromMilliseconds(kCommitIntervalMs), this, - &QuotaDatabase::Commit); + timer_.Start(FROM_HERE, 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 b5d9196..60d7c32 100644 --- a/webkit/quota/quota_manager.cc +++ b/webkit/quota/quota_manager.cc @@ -507,7 +507,8 @@ 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(QuotaManager::kReportHistogramInterval, + manager()->histogram_timer_.Start(FROM_HERE, + QuotaManager::kReportHistogramInterval, manager(), &QuotaManager::ReportHistogram); } diff --git a/webkit/quota/quota_temporary_storage_evictor.cc b/webkit/quota/quota_temporary_storage_evictor.cc index 8990331..49229c3 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(kHistogramReportInterval, this, + histogram_timer_.Start(FROM_HERE, kHistogramReportInterval, this, &QuotaTemporaryStorageEvictor::ReportPerHourHistogram); } void QuotaTemporaryStorageEvictor::StartEvictionTimerWithDelay(int delay_ms) { if (eviction_timer_.IsRunning()) return; - eviction_timer_.Start(base::TimeDelta::FromMilliseconds(delay_ms), this, - &QuotaTemporaryStorageEvictor::ConsiderEviction); + eviction_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(delay_ms), + this, &QuotaTemporaryStorageEvictor::ConsiderEviction); } void QuotaTemporaryStorageEvictor::ConsiderEviction() { diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index 5a32064..4b3fda1 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -103,7 +103,7 @@ void LayoutTestController::WorkQueue::ProcessWorkSoon() { if (!queue_.empty()) { // We delay processing queued work to avoid recursion problems. - timer_.Start(base::TimeDelta(), this, &WorkQueue::ProcessWork); + timer_.Start(FROM_HERE, base::TimeDelta(), this, &WorkQueue::ProcessWork); } else if (!wait_until_done_) { shell_->TestFinished(); } diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index babefc1..73f9160 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -321,7 +321,7 @@ class RequestProxy : public net::URLRequest::Delegate, if (request_->has_upload() && params->load_flags & net::LOAD_ENABLE_UPLOAD_PROGRESS) { - upload_progress_timer_.Start( + upload_progress_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kUpdateUploadProgressIntervalMsec), this, &RequestProxy::MaybeUpdateUploadProgress); } |