summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 01:38:59 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 01:38:59 +0000
commit400d323d53525a13fbfc47efa8a95c4b13cbccb9 (patch)
treef647ecce497271c180d9e62d88a4fcfb73328dc9 /content
parent95d9e253aeb47ef0004edc29c9a8c442106b9488 (diff)
downloadchromium_src-400d323d53525a13fbfc47efa8a95c4b13cbccb9.zip
chromium_src-400d323d53525a13fbfc47efa8a95c4b13cbccb9.tar.gz
chromium_src-400d323d53525a13fbfc47efa8a95c4b13cbccb9.tar.bz2
Currently, base/timer.cc calls PostTask with FROM_HERE as the Location, so the original code that created the delayed callback is lost.
This change adds a tracked_objects::Location parameter to the APIs in base/timer.h so we can trace the PostTask callbacks. The other files are touched to add the FROM_HERE Location parameter. Review URL: http://codereview.chromium.org/7812036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/download/download_file_manager.cc3
-rw-r--r--content/browser/download/download_item.cc3
-rw-r--r--content/browser/download/download_resource_handler.cc3
-rw-r--r--content/browser/net/url_request_slow_http_job.cc2
-rw-r--r--content/browser/renderer_host/browser_render_process_host.cc2
-rw-r--r--content/browser/renderer_host/render_widget_host.cc2
-rw-r--r--content/browser/renderer_host/resource_dispatcher_host.cc2
-rw-r--r--content/renderer/render_process_impl.cc2
-rw-r--r--content/renderer/render_thread.cc2
-rw-r--r--content/renderer/render_view.cc7
10 files changed, 16 insertions, 12 deletions
diff --git a/content/browser/download/download_file_manager.cc b/content/browser/download/download_file_manager.cc
index f21c67b1..0df8a3f 100644
--- a/content/browser/download/download_file_manager.cc
+++ b/content/browser/download/download_file_manager.cc
@@ -88,7 +88,8 @@ DownloadFile* DownloadFileManager::GetDownloadFile(int id) {
void DownloadFileManager::StartUpdateTimer() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
if (!update_timer_.IsRunning()) {
- update_timer_.Start(base::TimeDelta::FromMilliseconds(kUpdatePeriodMs),
+ update_timer_.Start(FROM_HERE,
+ base::TimeDelta::FromMilliseconds(kUpdatePeriodMs),
this, &DownloadFileManager::UpdateInProgressDownloads);
}
}
diff --git a/content/browser/download/download_item.cc b/content/browser/download/download_item.cc
index eefb8dd..fa6c436 100644
--- a/content/browser/download/download_item.cc
+++ b/content/browser/download/download_item.cc
@@ -325,7 +325,8 @@ void DownloadItem::StartProgressTimer() {
// TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- update_timer_.Start(base::TimeDelta::FromMilliseconds(kUpdateTimeMs), this,
+ update_timer_.Start(FROM_HERE,
+ base::TimeDelta::FromMilliseconds(kUpdateTimeMs), this,
&DownloadItem::UpdateObservers);
}
diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc
index 5846c63..003a34e 100644
--- a/content/browser/download/download_resource_handler.cc
+++ b/content/browser/download/download_resource_handler.cc
@@ -238,7 +238,8 @@ DownloadResourceHandler::~DownloadResourceHandler() {
void DownloadResourceHandler::StartPauseTimer() {
if (!pause_timer_.IsRunning())
- pause_timer_.Start(base::TimeDelta::FromMilliseconds(kThrottleTimeMs), this,
+ pause_timer_.Start(FROM_HERE,
+ base::TimeDelta::FromMilliseconds(kThrottleTimeMs), this,
&DownloadResourceHandler::CheckWriteProgress);
}
diff --git a/content/browser/net/url_request_slow_http_job.cc b/content/browser/net/url_request_slow_http_job.cc
index 398298f..3f1a6b6 100644
--- a/content/browser/net/url_request_slow_http_job.cc
+++ b/content/browser/net/url_request_slow_http_job.cc
@@ -50,7 +50,7 @@ URLRequestSlowHTTPJob::URLRequestSlowHTTPJob(net::URLRequest* request,
: URLRequestMockHTTPJob(request, file_path) { }
void URLRequestSlowHTTPJob::Start() {
- delay_timer_.Start(TimeDelta::FromMilliseconds(kDelayMs), this,
+ delay_timer_.Start(FROM_HERE, TimeDelta::FromMilliseconds(kDelayMs), this,
&URLRequestSlowHTTPJob::RealStart);
}
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc
index 51f7b5c..29b3e86 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -185,7 +185,7 @@ BrowserRenderProcessHost::BrowserRenderProcessHost(
visible_widgets_(0),
backgrounded_(true),
ALLOW_THIS_IN_INITIALIZER_LIST(cached_dibs_cleaner_(
- base::TimeDelta::FromSeconds(5),
+ FROM_HERE, base::TimeDelta::FromSeconds(5),
this, &BrowserRenderProcessHost::ClearTransportDIBCache)),
accessibility_enabled_(false),
is_initialized_(false) {
diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc
index 2a506d0..e370fe4 100644
--- a/content/browser/renderer_host/render_widget_host.cc
+++ b/content/browser/renderer_host/render_widget_host.cc
@@ -482,7 +482,7 @@ void RenderWidgetHost::StartHangMonitorTimeout(TimeDelta delay) {
// fire sooner.
time_when_considered_hung_ = Time::Now() + delay;
hung_renderer_timer_.Stop();
- hung_renderer_timer_.Start(delay, this,
+ hung_renderer_timer_.Start(FROM_HERE, delay, this,
&RenderWidgetHost::CheckRendererIsUnresponsive);
}
diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc
index cccc121..d845c8f 100644
--- a/content/browser/renderer_host/resource_dispatcher_host.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host.cc
@@ -1575,7 +1575,7 @@ void ResourceDispatcherHost::InsertIntoResourceQueue(
// Make sure we have the load state monitor running
if (!update_load_states_timer_.IsRunning()) {
- update_load_states_timer_.Start(
+ update_load_states_timer_.Start(FROM_HERE,
TimeDelta::FromMilliseconds(kUpdateLoadStatesIntervalMsec),
this, &ResourceDispatcherHost::UpdateLoadStates);
}
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
index cc900cd..c5df75c 100644
--- a/content/renderer/render_process_impl.cc
+++ b/content/renderer/render_process_impl.cc
@@ -37,7 +37,7 @@
RenderProcessImpl::RenderProcessImpl()
: ALLOW_THIS_IN_INITIALIZER_LIST(shared_mem_cache_cleaner_(
- base::TimeDelta::FromSeconds(5),
+ FROM_HERE, base::TimeDelta::FromSeconds(5),
this, &RenderProcessImpl::ClearTransportDIBCache)),
transport_dib_next_sequence_number_(0) {
in_process_plugins_ = InProcessPlugins();
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index bda81425..dcd0846 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -688,7 +688,7 @@ void RenderThread::IdleHandler() {
void RenderThread::ScheduleIdleHandler(double initial_delay_s) {
idle_notification_delay_in_s_ = initial_delay_s;
idle_timer_.Stop();
- idle_timer_.Start(
+ idle_timer_.Start(FROM_HERE,
base::TimeDelta::FromSeconds(static_cast<int64>(initial_delay_s)),
this, &RenderThread::IdleHandler);
}
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 9ea7d42..4e04a09 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -1788,8 +1788,8 @@ void RenderView::StartNavStateSyncTimerIfNecessary() {
nav_state_sync_timer_.Stop();
}
- nav_state_sync_timer_.Start(
- TimeDelta::FromSeconds(delay), this, &RenderView::SyncNavigationState);
+ nav_state_sync_timer_.Start(FROM_HERE, TimeDelta::FromSeconds(delay), this,
+ &RenderView::SyncNavigationState);
}
void RenderView::setMouseOverURL(const WebURL& url) {
@@ -2842,7 +2842,8 @@ void RenderView::didUpdateLayout(WebFrame* frame) {
if (check_preferred_size_timer_.IsRunning())
return;
- check_preferred_size_timer_.Start(TimeDelta::FromMilliseconds(0), this,
+ check_preferred_size_timer_.Start(FROM_HERE,
+ TimeDelta::FromMilliseconds(0), this,
&RenderView::CheckPreferredSize);
}