diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-18 03:23:09 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-18 03:23:09 +0000 |
| commit | 0885d6180f5cd146001a40e9e65983e79253e97a (patch) | |
| tree | 4f4e55eac8def0e7b6cc1a802e0800a294094233 /media | |
| parent | 4a391b720923236edaf4197dba6f7bfa932a7d4a (diff) | |
| download | chromium_src-0885d6180f5cd146001a40e9e65983e79253e97a.zip chromium_src-0885d6180f5cd146001a40e9e65983e79253e97a.tar.gz chromium_src-0885d6180f5cd146001a40e9e65983e79253e97a.tar.bz2 | |
Upgrade DCHECK(pending_callbacks_.get()) to CHECK().
Collecting data to track down use-after-free crashes when executing callbacks in media::Pipeline.
BUG=143440
Review URL: https://chromiumcodereview.appspot.com/10857062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/pipeline.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc index 4d30319..a27bfc3 100644 --- a/media/base/pipeline.cc +++ b/media/base/pipeline.cc @@ -424,7 +424,7 @@ TimeDelta Pipeline::TimeForByteOffset_Locked(int64 byte_offset) const { void Pipeline::DoPause(const PipelineStatusCB& done_cb) { DCHECK(message_loop_->BelongsToCurrentThread()); - DCHECK(!pending_callbacks_.get()); + CHECK(!pending_callbacks_.get()); SerialRunner::Queue bound_fns; if (audio_renderer_) @@ -438,7 +438,7 @@ void Pipeline::DoPause(const PipelineStatusCB& done_cb) { void Pipeline::DoFlush(const PipelineStatusCB& done_cb) { DCHECK(message_loop_->BelongsToCurrentThread()); - DCHECK(!pending_callbacks_.get()); + CHECK(!pending_callbacks_.get()); SerialRunner::Queue bound_fns; if (audio_renderer_) @@ -452,7 +452,7 @@ void Pipeline::DoFlush(const PipelineStatusCB& done_cb) { void Pipeline::DoPlay(const PipelineStatusCB& done_cb) { DCHECK(message_loop_->BelongsToCurrentThread()); - DCHECK(!pending_callbacks_.get()); + CHECK(!pending_callbacks_.get()); SerialRunner::Queue bound_fns; if (audio_renderer_) @@ -466,7 +466,7 @@ void Pipeline::DoPlay(const PipelineStatusCB& done_cb) { void Pipeline::DoStop(const PipelineStatusCB& done_cb) { DCHECK(message_loop_->BelongsToCurrentThread()); - DCHECK(!pending_callbacks_.get()); + CHECK(!pending_callbacks_.get()); SerialRunner::Queue bound_fns; if (demuxer_) @@ -877,7 +877,7 @@ void Pipeline::AudioDisabledTask() { void Pipeline::FilterStateTransitionTask() { DCHECK(message_loop_->BelongsToCurrentThread()); - DCHECK(pending_callbacks_.get()) + CHECK(pending_callbacks_.get()) << "Filter state transitions must be completed via pending_callbacks_"; pending_callbacks_.reset(); @@ -1197,7 +1197,7 @@ void Pipeline::DoSeek(base::TimeDelta seek_timestamp, bool skip_demuxer_seek, const PipelineStatusCB& done_cb) { DCHECK(message_loop_->BelongsToCurrentThread()); - DCHECK(!pending_callbacks_.get()); + CHECK(!pending_callbacks_.get()); SerialRunner::Queue bound_fns; if (!skip_demuxer_seek) { |