Switch from WebMediaPlayer::maxTimeSeekable() to seekable()

media/blink/webmediaplayer_impl.cc

 // Copyright 2013 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 "media/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 466 matching lines @@
       pipeline_.GetBufferedTimeRanges();
 
   const base::TimeDelta duration = pipeline_.GetMediaDuration();
   if (duration != kInfiniteDuration()) {
     buffered_data_source_host_.AddBufferedTimeRanges(
         &buffered_time_ranges, duration);
   }
   return ConvertToWebTimeRanges(buffered_time_ranges);
 }
 
-double WebMediaPlayerImpl::maxTimeSeekable() const {
+blink::WebTimeRanges WebMediaPlayerImpl::seekable() const {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
-  // If we haven't even gotten to ReadyStateHaveMetadata yet then just
-  // return 0 so that the seekable range is empty.
+  // If we haven't even gotten to ReadyStateHaveMetadata yet then there
+  // are no seekable ranges.
   if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata)
-    return 0.0;
+    return blink::WebTimeRanges();
 
   // We don't support seeking in streaming media.
   if (data_source_ && data_source_->IsStreaming())
-    return 0.0;
-  return duration();
+    return blink::WebTimeRanges();
+

[DaleCurtis, 2014/09/26 20:45:24]

Ditto.

+  // If we have a duration then use [0, duration] as the seekable range.

[scherkus (not reviewing), 2014/09/26 18:53:27]

ditto

+  if (double range_end = duration()) {
+    blink::WebTimeRanges ranges(static_cast<size_t>(1));
+    ranges[0].start = 0.0;
+    ranges[0].end = range_end;
+    return ranges;
+  }
+
+  return blink::WebTimeRanges();
 }
 
 bool WebMediaPlayerImpl::didLoadingProgress() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   bool pipeline_progress = pipeline_.DidLoadingProgress();
   bool data_progress = buffered_data_source_host_.DidLoadingProgress();
   return pipeline_progress || data_progress;
 }
 
 void WebMediaPlayerImpl::paint(blink::WebCanvas* canvas,
@@ skipping 513 matching lines @@
   compositor_task_runner_->PostTask(FROM_HERE,
                                     base::Bind(&GetCurrentFrameAndSignal,
                                                base::Unretained(compositor_),
                                                &video_frame,
                                                &event));
   event.Wait();
   return video_frame;
 }
 
 }  // namespace media