| 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 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 750 DCHECK(!media_source_delegate_); | 750 DCHECK(!media_source_delegate_); |
| 751 SetNeedsEstablishPeer(true); | 751 SetNeedsEstablishPeer(true); |
| 752 if (!paused()) | 752 if (!paused()) |
| 753 EstablishSurfaceTexturePeer(); | 753 EstablishSurfaceTexturePeer(); |
| 754 is_remote_ = false; | 754 is_remote_ = false; |
| 755 ReallocateVideoFrame(); | 755 ReallocateVideoFrame(); |
| 756 } | 756 } |
| 757 | 757 |
| 758 void WebMediaPlayerAndroid::OnDidEnterFullscreen() { | 758 void WebMediaPlayerAndroid::OnDidEnterFullscreen() { |
| 759 if (!manager_->IsInFullscreen(frame_)) { | 759 if (!manager_->IsInFullscreen(frame_)) { |
| 760 frame_->view()->willEnterFullScreen(); | |
| 761 frame_->view()->didEnterFullScreen(); | |
| 762 manager_->DidEnterFullscreen(frame_); | 760 manager_->DidEnterFullscreen(frame_); |
| 763 } | 761 } |
| 764 } | 762 } |
| 765 | 763 |
| 766 void WebMediaPlayerAndroid::OnDidExitFullscreen() { | 764 void WebMediaPlayerAndroid::OnDidExitFullscreen() { |
| 767 // |needs_external_surface_| is always false on non-TV devices. | 765 // |needs_external_surface_| is always false on non-TV devices. |
| 768 if (!needs_external_surface_) | 766 if (!needs_external_surface_) |
| 769 SetNeedsEstablishPeer(true); | 767 SetNeedsEstablishPeer(true); |
| 770 // We had the fullscreen surface connected to Android MediaPlayer, | 768 // We had the fullscreen surface connected to Android MediaPlayer, |
| 771 // so reconnect our surface texture for embedded playback. | 769 // so reconnect our surface texture for embedded playback. |
| 772 if (!paused() && needs_establish_peer_) | 770 if (!paused() && needs_establish_peer_) |
| 773 EstablishSurfaceTexturePeer(); | 771 EstablishSurfaceTexturePeer(); |
| 774 | 772 |
| 775 #if defined(VIDEO_HOLE) | 773 #if defined(VIDEO_HOLE) |
| 776 if (!paused() && needs_external_surface_) | 774 if (!paused() && needs_external_surface_) |
| 777 manager_->RequestExternalSurface(player_id_, last_computed_rect_); | 775 manager_->RequestExternalSurface(player_id_, last_computed_rect_); |
| 778 #endif // defined(VIDEO_HOLE) | 776 #endif // defined(VIDEO_HOLE) |
| 779 | 777 |
| 780 frame_->view()->willExitFullScreen(); | |
| 781 frame_->view()->didExitFullScreen(); | |
| 782 manager_->DidExitFullscreen(); | 778 manager_->DidExitFullscreen(); |
| 783 client_->repaint(); | 779 client_->repaint(); |
| 784 } | 780 } |
| 785 | 781 |
| 786 void WebMediaPlayerAndroid::OnMediaPlayerPlay() { | 782 void WebMediaPlayerAndroid::OnMediaPlayerPlay() { |
| 787 UpdatePlayingState(true); | 783 UpdatePlayingState(true); |
| 788 client_->playbackStateChanged(); | 784 client_->playbackStateChanged(); |
| 789 } | 785 } |
| 790 | 786 |
| 791 void WebMediaPlayerAndroid::OnMediaPlayerPause() { | 787 void WebMediaPlayerAndroid::OnMediaPlayerPause() { |
| (...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1553 | 1549 |
| 1554 void WebMediaPlayerAndroid::exitFullscreen() { | 1550 void WebMediaPlayerAndroid::exitFullscreen() { |
| 1555 manager_->ExitFullscreen(player_id_); | 1551 manager_->ExitFullscreen(player_id_); |
| 1556 } | 1552 } |
| 1557 | 1553 |
| 1558 bool WebMediaPlayerAndroid::canEnterFullscreen() const { | 1554 bool WebMediaPlayerAndroid::canEnterFullscreen() const { |
| 1559 return manager_->CanEnterFullscreen(frame_); | 1555 return manager_->CanEnterFullscreen(frame_); |
| 1560 } | 1556 } |
| 1561 | 1557 |
| 1562 } // namespace content | 1558 } // namespace content |
| OLD | NEW |