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

content/renderer/media/android/webmediaplayer_android.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 "content/renderer/media/android/webmediaplayer_android.h"
 
 #include <limits>
 
 #include "base/android/build_info.h"
 #include "base/bind.h"
@@ skipping 502 matching lines @@
 WebMediaPlayer::ReadyState WebMediaPlayerAndroid::readyState() const {
   return ready_state_;
 }
 
 WebTimeRanges WebMediaPlayerAndroid::buffered() const {
   if (media_source_delegate_)
     return media_source_delegate_->Buffered();
   return buffered_;
 }
 
-double WebMediaPlayerAndroid::maxTimeSeekable() const {
-  // If we haven't even gotten to ReadyStateHaveMetadata yet then just
-  // return 0 so that the seekable range is empty.
+WebTimeRanges WebMediaPlayerAndroid::seekable() const {
+  // If we haven't even gotten to ReadyStateHaveMetadata yet then there
+  // are no seekable ranges.
   if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata)
-    return 0.0;
+    return WebTimeRanges();
 
-  return duration();
+  // If we have a duration then use [0, duration] as the seekable range.
+  const double duration = this->duration();

[DaleCurtis, 2014/09/29 16:52:43]

Avoid this-> with current_duration or something? It's unusual style for chromium
code.

[philipj_slow, 2014/09/29 19:51:46]

I don't like this style either, I was just going with the name you suggested :)
I'll use something different.

[philipj_slow, 2014/09/30 08:09:28]

seekable_end it is.

+  if (!duration)
+    return WebTimeRanges();
+
+  WebTimeRanges ranges(static_cast<size_t>(1));

[DaleCurtis, 2014/09/29 16:52:43]

Does 1 hit a compiler error somewhere? 1u should work if so.

[philipj_slow, 2014/09/29 19:51:46]

Yes, it's ambiguous because WebVector has so many constructors. I tried 1u and
that didn't work, but I'll see if there's something less ugly that
static_casting to be done.

[philipj_slow, 2014/09/30 08:09:28]

I went with the WebVector(const U* values, size_t size) constructor instead.

+  ranges[0].start = 0.0;
+  ranges[0].end = duration;
+  return ranges;
 }
 
 bool WebMediaPlayerAndroid::didLoadingProgress() {
   bool ret = did_loading_progress_;
   did_loading_progress_ = false;
   return ret;
 }
 
 bool WebMediaPlayerAndroid::EnsureTextureBackedSkBitmap(GrContext* gr,
                                                         SkBitmap& bitmap,
@@ skipping 1284 matching lines @@
 
 bool WebMediaPlayerAndroid::IsHLSStream() const {
   std::string mime;
   GURL url = redirected_url_.is_empty() ? url_ : redirected_url_;
   if (!net::GetMimeTypeFromFile(base::FilePath(url.path()), &mime))
     return false;
   return !mime.compare("application/x-mpegurl");
 }
 
 }  // namespace content