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