media/filters/audio_renderer_base.cc - Issue 9717021: Make Callback::Reset() return a copy to support use-cases where Run() ends up modifying |*this|.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/audio_renderer_base.cc

Issue 9717021: Make Callback::Reset() return a copy to support use-cases where Run() ends up modifying |*this|. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: no base:: Created 8 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: media/filters/audio_renderer_base.cc

diff --git a/media/filters/audio_renderer_base.cc b/media/filters/audio_renderer_base.cc

index a319f64d126c6b1aa9a842bb59704d43f4bad930..eda4d9eca6532b191fb62581f64332f967eb2176 100644

--- a/media/filters/audio_renderer_base.cc

+++ b/media/filters/audio_renderer_base.cc

@@ -9,6 +9,7 @@

#include "base/bind.h"

#include "base/callback.h"

+#include "base/callback_helpers.h"

#include "base/logging.h"

#include "media/base/filter_host.h"

@@ -176,7 +177,7 @@ void AudioRendererBase::DecodedAudioReady(scoped_refptr<Buffer> buffer) {

if (buffer && !buffer->IsEndOfStream())

algorithm_->EnqueueBuffer(buffer);

DCHECK(!pending_read_);

- ResetAndRunCB(&pause_cb_);

+ base::ResetAndReturn(&pause_cb_).Run();

return;

case kSeeking:

if (IsBeforeSeekTime(buffer)) {

@@ -189,7 +190,7 @@ void AudioRendererBase::DecodedAudioReady(scoped_refptr<Buffer> buffer) {

return;

}

state_ = kPaused;

- ResetAndRunCB(&seek_cb_, PIPELINE_OK);

+ base::ResetAndReturn(&seek_cb_).Run(PIPELINE_OK);

return;

case kPlaying:

case kUnderflow:

« no previous file with comments | « media/base/filters.cc ('k') | media/filters/gpu_video_decoder.cc » ('j') | no next file with comments »