Fix ChunkDemuxer so it properly outputs buffered ranges.

webkit/media/webmediaplayer_impl.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_impl.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 638 matching lines @@
 }
 
 bool WebMediaPlayerImpl::sourceRemoveId(const WebKit::WebString& id) {
   DCHECK(!id.isEmpty());
   proxy_->DemuxerRemoveId(id.utf8().data());
   return true;
 }
 
 WebKit::WebTimeRanges WebMediaPlayerImpl::sourceBuffered(
     const WebKit::WebString& id) {
-  media::ChunkDemuxer::Ranges buffered_ranges;
-  if (!proxy_->DemuxerBufferedRange(id.utf8().data(), &buffered_ranges))
-    return WebKit::WebTimeRanges();
+  media::Ranges<base::TimeDelta> buffered_ranges =

[Ami GONE FROM CHROMIUM, 2012/06/19 17:40:37]

dedup against buffered()?

[acolwell GONE FROM CHROMIUM, 2012/06/19 19:50:15]

Done. Created a ConvertToWebTimeRanges() helper function to remove the duplicate
logic.

+      proxy_->DemuxerBufferedRange(id.utf8().data());
 
   WebKit::WebTimeRanges ranges(buffered_ranges.size());
   for (size_t i = 0; i < buffered_ranges.size(); i++) {
-    ranges[i].start = buffered_ranges[i].first.InSecondsF();
-    ranges[i].end = buffered_ranges[i].second.InSecondsF();
+    ranges[i].start = buffered_ranges.start(i).InSecondsF();
+    ranges[i].end = buffered_ranges.end(i).InSecondsF();
   }
   return ranges;
 }
 
 bool WebMediaPlayerImpl::sourceAppend(const unsigned char* data,
                                       unsigned length) {
   return sourceAppend(WebKit::WebString::fromUTF8("DefaultSourceId"),
                       data, length);
 }
 
@@ skipping 344 matching lines @@
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media