Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 282073003: Add return-by-value implementations of blink::WebMediaPlayer::buffered() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/android/webmediaplayer_android.h" 5 #include "content/renderer/media/android/webmediaplayer_android.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 WebMediaPlayer::ReadyState WebMediaPlayerAndroid::readyState() const { 433 WebMediaPlayer::ReadyState WebMediaPlayerAndroid::readyState() const {
434 return ready_state_; 434 return ready_state_;
435 } 435 }
436 436
437 const WebTimeRanges& WebMediaPlayerAndroid::buffered() { 437 const WebTimeRanges& WebMediaPlayerAndroid::buffered() {
438 if (media_source_delegate_) 438 if (media_source_delegate_)
439 return media_source_delegate_->Buffered(); 439 return media_source_delegate_->Buffered();
440 return buffered_; 440 return buffered_;
441 } 441 }
442 442
443 WebTimeRanges WebMediaPlayerAndroid::buffered() const {
444 if (media_source_delegate_)
445 return media_source_delegate_->Buffered();
446 return buffered_;
447 }
448
443 double WebMediaPlayerAndroid::maxTimeSeekable() const { 449 double WebMediaPlayerAndroid::maxTimeSeekable() const {
444 // If we haven't even gotten to ReadyStateHaveMetadata yet then just 450 // If we haven't even gotten to ReadyStateHaveMetadata yet then just
445 // return 0 so that the seekable range is empty. 451 // return 0 so that the seekable range is empty.
446 if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata) 452 if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata)
447 return 0.0; 453 return 0.0;
448 454
449 return duration(); 455 return duration();
450 } 456 }
451 457
452 bool WebMediaPlayerAndroid::didLoadingProgress() const { 458 bool WebMediaPlayerAndroid::didLoadingProgress() const {
(...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1558 1564
1559 void WebMediaPlayerAndroid::exitFullscreen() { 1565 void WebMediaPlayerAndroid::exitFullscreen() {
1560 manager_->ExitFullscreen(player_id_); 1566 manager_->ExitFullscreen(player_id_);
1561 } 1567 }
1562 1568
1563 bool WebMediaPlayerAndroid::canEnterFullscreen() const { 1569 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
1564 return manager_->CanEnterFullscreen(frame_); 1570 return manager_->CanEnterFullscreen(frame_);
1565 } 1571 }
1566 1572
1567 } // namespace content 1573 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.h ('k') | content/renderer/media/buffered_data_source_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698