OLD | NEW |
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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
427 } | 427 } |
428 | 428 |
429 WebMediaPlayer::NetworkState WebMediaPlayerAndroid::networkState() const { | 429 WebMediaPlayer::NetworkState WebMediaPlayerAndroid::networkState() const { |
430 return network_state_; | 430 return network_state_; |
431 } | 431 } |
432 | 432 |
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() { | |
438 if (media_source_delegate_) | |
439 return media_source_delegate_->Buffered(); | |
440 return buffered_; | |
441 } | |
442 | |
443 WebTimeRanges WebMediaPlayerAndroid::buffered() const { | 437 WebTimeRanges WebMediaPlayerAndroid::buffered() const { |
444 if (media_source_delegate_) | 438 if (media_source_delegate_) |
445 return media_source_delegate_->Buffered(); | 439 return media_source_delegate_->Buffered(); |
446 return buffered_; | 440 return buffered_; |
447 } | 441 } |
448 | 442 |
449 double WebMediaPlayerAndroid::maxTimeSeekable() const { | 443 double WebMediaPlayerAndroid::maxTimeSeekable() const { |
450 // If we haven't even gotten to ReadyStateHaveMetadata yet then just | 444 // If we haven't even gotten to ReadyStateHaveMetadata yet then just |
451 // return 0 so that the seekable range is empty. | 445 // return 0 so that the seekable range is empty. |
452 if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata) | 446 if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata) |
(...skipping 1107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1560 | 1554 |
1561 void WebMediaPlayerAndroid::exitFullscreen() { | 1555 void WebMediaPlayerAndroid::exitFullscreen() { |
1562 manager_->ExitFullscreen(player_id_); | 1556 manager_->ExitFullscreen(player_id_); |
1563 } | 1557 } |
1564 | 1558 |
1565 bool WebMediaPlayerAndroid::canEnterFullscreen() const { | 1559 bool WebMediaPlayerAndroid::canEnterFullscreen() const { |
1566 return manager_->CanEnterFullscreen(frame_); | 1560 return manager_->CanEnterFullscreen(frame_); |
1567 } | 1561 } |
1568 | 1562 |
1569 } // namespace content | 1563 } // namespace content |
OLD | NEW |