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 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
758 DCHECK(main_thread_checker_.CalledOnValidThread()); | 758 DCHECK(main_thread_checker_.CalledOnValidThread()); |
759 DCHECK(!media_source_delegate_); | 759 DCHECK(!media_source_delegate_); |
760 SetNeedsEstablishPeer(true); | 760 SetNeedsEstablishPeer(true); |
761 if (!paused()) | 761 if (!paused()) |
762 EstablishSurfaceTexturePeer(); | 762 EstablishSurfaceTexturePeer(); |
763 is_remote_ = false; | 763 is_remote_ = false; |
764 ReallocateVideoFrame(); | 764 ReallocateVideoFrame(); |
765 } | 765 } |
766 | 766 |
767 void WebMediaPlayerAndroid::OnDidEnterFullscreen() { | 767 void WebMediaPlayerAndroid::OnDidEnterFullscreen() { |
768 if (!player_manager_->IsInFullscreen(frame_)) { | 768 if (!player_manager_->IsInFullscreen(frame_)) |
769 frame_->view()->willEnterFullScreen(); | |
770 frame_->view()->didEnterFullScreen(); | |
771 player_manager_->DidEnterFullscreen(frame_); | 769 player_manager_->DidEnterFullscreen(frame_); |
772 } | |
773 } | 770 } |
774 | 771 |
775 void WebMediaPlayerAndroid::OnDidExitFullscreen() { | 772 void WebMediaPlayerAndroid::OnDidExitFullscreen() { |
776 // |needs_external_surface_| is always false on non-TV devices. | 773 // |needs_external_surface_| is always false on non-TV devices. |
777 if (!needs_external_surface_) | 774 if (!needs_external_surface_) |
778 SetNeedsEstablishPeer(true); | 775 SetNeedsEstablishPeer(true); |
779 // We had the fullscreen surface connected to Android MediaPlayer, | 776 // We had the fullscreen surface connected to Android MediaPlayer, |
780 // so reconnect our surface texture for embedded playback. | 777 // so reconnect our surface texture for embedded playback. |
781 if (!paused() && needs_establish_peer_) | 778 if (!paused() && needs_establish_peer_) |
782 EstablishSurfaceTexturePeer(); | 779 EstablishSurfaceTexturePeer(); |
783 | 780 |
784 #if defined(VIDEO_HOLE) | 781 #if defined(VIDEO_HOLE) |
785 if (!paused() && needs_external_surface_) | 782 if (!paused() && needs_external_surface_) |
786 player_manager_->RequestExternalSurface(player_id_, last_computed_rect_); | 783 player_manager_->RequestExternalSurface(player_id_, last_computed_rect_); |
787 #endif // defined(VIDEO_HOLE) | 784 #endif // defined(VIDEO_HOLE) |
788 | 785 |
789 frame_->view()->willExitFullScreen(); | |
790 frame_->view()->didExitFullScreen(); | |
791 player_manager_->DidExitFullscreen(); | 786 player_manager_->DidExitFullscreen(); |
792 client_->repaint(); | 787 client_->repaint(); |
793 } | 788 } |
794 | 789 |
795 void WebMediaPlayerAndroid::OnMediaPlayerPlay() { | 790 void WebMediaPlayerAndroid::OnMediaPlayerPlay() { |
796 UpdatePlayingState(true); | 791 UpdatePlayingState(true); |
797 client_->playbackStateChanged(); | 792 client_->playbackStateChanged(); |
798 } | 793 } |
799 | 794 |
800 void WebMediaPlayerAndroid::OnMediaPlayerPause() { | 795 void WebMediaPlayerAndroid::OnMediaPlayerPause() { |
(...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1546 | 1541 |
1547 void WebMediaPlayerAndroid::exitFullscreen() { | 1542 void WebMediaPlayerAndroid::exitFullscreen() { |
1548 player_manager_->ExitFullscreen(player_id_); | 1543 player_manager_->ExitFullscreen(player_id_); |
1549 } | 1544 } |
1550 | 1545 |
1551 bool WebMediaPlayerAndroid::canEnterFullscreen() const { | 1546 bool WebMediaPlayerAndroid::canEnterFullscreen() const { |
1552 return player_manager_->CanEnterFullscreen(frame_); | 1547 return player_manager_->CanEnterFullscreen(frame_); |
1553 } | 1548 } |
1554 | 1549 |
1555 } // namespace content | 1550 } // namespace content |
OLD | NEW |