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 /content/renderer | |
| 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 'content/renderer')
| -rw-r--r-- | content/renderer/render_process_impl.cc | 2 | ||||
| -rw-r--r-- | content/renderer/render_thread.cc | 2 | ||||
| -rw-r--r-- | content/renderer/render_view.cc | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc index c5df75c..cc900cd 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_( - FROM_HERE, base::TimeDelta::FromSeconds(5), + 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 dcd0846..bda81425 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(FROM_HERE, + idle_timer_.Start( 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 4e04a09..9ea7d42 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(FROM_HERE, TimeDelta::FromSeconds(delay), this, - &RenderView::SyncNavigationState); + nav_state_sync_timer_.Start( + TimeDelta::FromSeconds(delay), this, &RenderView::SyncNavigationState); } void RenderView::setMouseOverURL(const WebURL& url) { @@ -2842,8 +2842,7 @@ void RenderView::didUpdateLayout(WebFrame* frame) { if (check_preferred_size_timer_.IsRunning()) return; - check_preferred_size_timer_.Start(FROM_HERE, - TimeDelta::FromMilliseconds(0), this, + check_preferred_size_timer_.Start(TimeDelta::FromMilliseconds(0), this, &RenderView::CheckPreferredSize); } |