diff options
| author | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 01:38:59 +0000 |
|---|---|---|
| committer | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 01:38:59 +0000 |
| commit | 400d323d53525a13fbfc47efa8a95c4b13cbccb9 (patch) | |
| tree | f647ecce497271c180d9e62d88a4fcfb73328dc9 /media | |
| parent | 95d9e253aeb47ef0004edc29c9a8c442106b9488 (diff) | |
| download | chromium_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 'media')
| -rw-r--r-- | media/audio/audio_input_controller.cc | 2 | ||||
| -rw-r--r-- | media/audio/audio_output_dispatcher.cc | 2 | ||||
| -rw-r--r-- | media/filters/adaptive_demuxer.cc | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc index da957e6..cedbb24 100644 --- a/media/audio/audio_input_controller.cc +++ b/media/audio/audio_input_controller.cc @@ -21,7 +21,7 @@ AudioInputController::AudioInputController(EventHandler* handler, SyncWriter* sync_writer) : handler_(handler), stream_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(no_data_timer_( + ALLOW_THIS_IN_INITIALIZER_LIST(no_data_timer_(FROM_HERE, base::TimeDelta::FromSeconds(kTimerResetInterval), this, &AudioInputController::DoReportNoDataError)), diff --git a/media/audio/audio_output_dispatcher.cc b/media/audio/audio_output_dispatcher.cc index c707069..ac08bcb 100644 --- a/media/audio/audio_output_dispatcher.cc +++ b/media/audio/audio_output_dispatcher.cc @@ -18,7 +18,7 @@ AudioOutputDispatcher::AudioOutputDispatcher( pause_delay_milliseconds_(2 * params.samples_per_packet * base::Time::kMillisecondsPerSecond / params.sample_rate), paused_proxies_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(close_timer_( + ALLOW_THIS_IN_INITIALIZER_LIST(close_timer_(FROM_HERE, base::TimeDelta::FromMilliseconds(close_delay_ms), this, &AudioOutputDispatcher::ClosePendingStreams)) { } diff --git a/media/filters/adaptive_demuxer.cc b/media/filters/adaptive_demuxer.cc index f08e32d..5902900 100644 --- a/media/filters/adaptive_demuxer.cc +++ b/media/filters/adaptive_demuxer.cc @@ -98,7 +98,8 @@ void StreamSwitchManager::Play() { playing_ = true; if (video_ids_.size() > 1) { - timer_.Start(base::TimeDelta::FromMilliseconds(kSwitchTimerPeriod), + timer_.Start(FROM_HERE, + base::TimeDelta::FromMilliseconds(kSwitchTimerPeriod), this, &StreamSwitchManager::OnSwitchTimer); } } |