Commit d228aeec authored by scherkus@chromium.org's avatar scherkus@chromium.org

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
parent cfef2480
...@@ -168,7 +168,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( ...@@ -168,7 +168,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
incremented_externally_allocated_memory_(false), incremented_externally_allocated_memory_(false),
gpu_factories_(RenderThreadImpl::current()->GetGpuFactories()), gpu_factories_(RenderThreadImpl::current()->GetGpuFactories()),
supports_save_(true), supports_save_(true),
starting_(false),
chunk_demuxer_(NULL), chunk_demuxer_(NULL),
// Threaded compositing isn't enabled universally yet. // Threaded compositing isn't enabled universally yet.
compositor_task_runner_( compositor_task_runner_(
...@@ -341,7 +340,7 @@ void WebMediaPlayerImpl::seek(double seconds) { ...@@ -341,7 +340,7 @@ void WebMediaPlayerImpl::seek(double seconds) {
base::TimeDelta seek_time = ConvertSecondsToTimestamp(seconds); base::TimeDelta seek_time = ConvertSecondsToTimestamp(seconds);
if (starting_ || seeking_) { if (seeking_) {
pending_seek_ = true; pending_seek_ = true;
pending_seek_seconds_ = seconds; pending_seek_seconds_ = seconds;
if (chunk_demuxer_) if (chunk_demuxer_)
...@@ -902,7 +901,6 @@ void WebMediaPlayerImpl::InvalidateOnMainThread() { ...@@ -902,7 +901,6 @@ void WebMediaPlayerImpl::InvalidateOnMainThread() {
void WebMediaPlayerImpl::OnPipelineSeek(PipelineStatus status) { void WebMediaPlayerImpl::OnPipelineSeek(PipelineStatus status) {
DVLOG(1) << __FUNCTION__ << "(" << status << ")"; DVLOG(1) << __FUNCTION__ << "(" << status << ")";
DCHECK(main_loop_->BelongsToCurrentThread()); DCHECK(main_loop_->BelongsToCurrentThread());
starting_ = false;
seeking_ = false; seeking_ = false;
if (pending_seek_) { if (pending_seek_) {
pending_seek_ = false; pending_seek_ = false;
...@@ -1199,7 +1197,7 @@ void WebMediaPlayerImpl::StartPipeline() { ...@@ -1199,7 +1197,7 @@ void WebMediaPlayerImpl::StartPipeline() {
} }
// ... and we're ready to go! // ... and we're ready to go!
starting_ = true; seeking_ = true;
pipeline_.Start( pipeline_.Start(
filter_collection.Pass(), filter_collection.Pass(),
BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineEnded), BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineEnded),
......
...@@ -310,8 +310,6 @@ class WebMediaPlayerImpl ...@@ -310,8 +310,6 @@ class WebMediaPlayerImpl
bool supports_save_; bool supports_save_;
bool starting_;
// These two are mutually exclusive: // These two are mutually exclusive:
// |data_source_| is used for regular resource loads. // |data_source_| is used for regular resource loads.
// |chunk_demuxer_| is used for Media Source resource loads. // |chunk_demuxer_| is used for Media Source resource loads.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment