Cancel pending seek in ChunkDemuxer when a new seek occurs

webkit/media/webmediaplayer_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/webmediaplayer_proxy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "media/base/pipeline_status.h"
@@ skipping 171 matching lines @@
   render_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerProxy::NeedKeyTask, this, "", "",
       base::Passed(&init_data), init_data_size));
 }
 
 void WebMediaPlayerProxy::DemuxerStartWaitingForSeek() {
   if (chunk_demuxer_.get())
     chunk_demuxer_->StartWaitingForSeek();
 }
 
+void WebMediaPlayerProxy::DemuxerCancelPendingSeek() {
+  if (chunk_demuxer_.get())
+    chunk_demuxer_->CancelPendingSeek();
+}
+
 media::ChunkDemuxer::Status WebMediaPlayerProxy::DemuxerAddId(
     const std::string& id,
     const std::string& type,
     std::vector<std::string>& codecs) {
   return chunk_demuxer_->AddId(id, type, codecs);
 }
 
 bool WebMediaPlayerProxy::DemuxerSetTimestampOffset(
     const std::string& id, double offset) {
   return chunk_demuxer_->SetTimestampOffset(id, offset);
@@ skipping 105 matching lines @@
                                       const std::string& session_id,
                                       scoped_array<uint8> init_data,
                                       int init_data_size) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (webmediaplayer_)
     webmediaplayer_->OnNeedKey(key_system, session_id,
                                init_data.Pass(), init_data_size);
 }
 
 }  // namespace webkit_media