diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 19:16:49 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 19:16:49 +0000 |
| commit | d228aeec0a4c94f9e7b5df9b8d53c751bf9cb1a3 (patch) | |
| tree | 37c491bf4d48faac0b9a7d075f23270f84963979 /content/renderer | |
| parent | cfef24807374687c56448caeee1725e3431bb9ed (diff) | |
| download | chromium_src-d228aeec0a4c94f9e7b5df9b8d53c751bf9cb1a3.zip chromium_src-d228aeec0a4c94f9e7b5df9b8d53c751bf9cb1a3.tar.gz chromium_src-d228aeec0a4c94f9e7b5df9b8d53c751bf9cb1a3.tar.bz2 | |
Remove WebMediaPlayerImpl::starting_ as it's redundant.
WebMediaPlayerImpl::seeking_ essentially tracks the same state.
BUG=144683
Review URL: https://codereview.chromium.org/343053003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/media/webmediaplayer_impl.cc | 6 | ||||
| -rw-r--r-- | content/renderer/media/webmediaplayer_impl.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc index 088d545..12153eea 100644 --- a/content/renderer/media/webmediaplayer_impl.cc +++ b/content/renderer/media/webmediaplayer_impl.cc @@ -168,7 +168,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( incremented_externally_allocated_memory_(false), gpu_factories_(RenderThreadImpl::current()->GetGpuFactories()), supports_save_(true), - starting_(false), chunk_demuxer_(NULL), // Threaded compositing isn't enabled universally yet. compositor_task_runner_( @@ -341,7 +340,7 @@ void WebMediaPlayerImpl::seek(double seconds) { base::TimeDelta seek_time = ConvertSecondsToTimestamp(seconds); - if (starting_ || seeking_) { + if (seeking_) { pending_seek_ = true; pending_seek_seconds_ = seconds; if (chunk_demuxer_) @@ -902,7 +901,6 @@ void WebMediaPlayerImpl::InvalidateOnMainThread() { void WebMediaPlayerImpl::OnPipelineSeek(PipelineStatus status) { DVLOG(1) << __FUNCTION__ << "(" << status << ")"; DCHECK(main_loop_->BelongsToCurrentThread()); - starting_ = false; seeking_ = false; if (pending_seek_) { pending_seek_ = false; @@ -1199,7 +1197,7 @@ void WebMediaPlayerImpl::StartPipeline() { } // ... and we're ready to go! - starting_ = true; + seeking_ = true; pipeline_.Start( filter_collection.Pass(), BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineEnded), diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h index 87c180e..ad932b8 100644 --- a/content/renderer/media/webmediaplayer_impl.h +++ b/content/renderer/media/webmediaplayer_impl.h @@ -310,8 +310,6 @@ class WebMediaPlayerImpl bool supports_save_; - bool starting_; - // These two are mutually exclusive: // |data_source_| is used for regular resource loads. // |chunk_demuxer_| is used for Media Source resource loads. |