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

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

Issue 281803002: Revert of Don't use webmediaplayer to inform webview about fullscreen change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | Annotate | Revision Log
« no previous file with comments | « content/browser/media/android/browser_media_player_manager.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
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();
760 manager_->DidEnterFullscreen(frame_); 762 manager_->DidEnterFullscreen(frame_);
761 } 763 }
762 } 764 }
763 765
764 void WebMediaPlayerAndroid::OnDidExitFullscreen() { 766 void WebMediaPlayerAndroid::OnDidExitFullscreen() {
765 // |needs_external_surface_| is always false on non-TV devices. 767 // |needs_external_surface_| is always false on non-TV devices.
766 if (!needs_external_surface_) 768 if (!needs_external_surface_)
767 SetNeedsEstablishPeer(true); 769 SetNeedsEstablishPeer(true);
768 // We had the fullscreen surface connected to Android MediaPlayer, 770 // We had the fullscreen surface connected to Android MediaPlayer,
769 // so reconnect our surface texture for embedded playback. 771 // so reconnect our surface texture for embedded playback.
770 if (!paused() && needs_establish_peer_) 772 if (!paused() && needs_establish_peer_)
771 EstablishSurfaceTexturePeer(); 773 EstablishSurfaceTexturePeer();
772 774
773 #if defined(VIDEO_HOLE) 775 #if defined(VIDEO_HOLE)
774 if (!paused() && needs_external_surface_) 776 if (!paused() && needs_external_surface_)
775 manager_->RequestExternalSurface(player_id_, last_computed_rect_); 777 manager_->RequestExternalSurface(player_id_, last_computed_rect_);
776 #endif // defined(VIDEO_HOLE) 778 #endif // defined(VIDEO_HOLE)
777 779
780 frame_->view()->willExitFullScreen();
781 frame_->view()->didExitFullScreen();
778 manager_->DidExitFullscreen(); 782 manager_->DidExitFullscreen();
779 client_->repaint(); 783 client_->repaint();
780 } 784 }
781 785
782 void WebMediaPlayerAndroid::OnMediaPlayerPlay() { 786 void WebMediaPlayerAndroid::OnMediaPlayerPlay() {
783 UpdatePlayingState(true); 787 UpdatePlayingState(true);
784 client_->playbackStateChanged(); 788 client_->playbackStateChanged();
785 } 789 }
786 790
787 void WebMediaPlayerAndroid::OnMediaPlayerPause() { 791 void WebMediaPlayerAndroid::OnMediaPlayerPause() {
(...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after
1549 1553
1550 void WebMediaPlayerAndroid::exitFullscreen() { 1554 void WebMediaPlayerAndroid::exitFullscreen() {
1551 manager_->ExitFullscreen(player_id_); 1555 manager_->ExitFullscreen(player_id_);
1552 } 1556 }
1553 1557
1554 bool WebMediaPlayerAndroid::canEnterFullscreen() const { 1558 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
1555 return manager_->CanEnterFullscreen(frame_); 1559 return manager_->CanEnterFullscreen(frame_);
1556 } 1560 }
1557 1561
1558 } // namespace content 1562 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/android/browser_media_player_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698