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

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 136113015: Fix fullscreen video race condition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address raised issues Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/android/renderer_media_player_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/android/webmediaplayer_android.cc
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index ef498c9b3de5b979b2be7dd6c2c5b25844dac89f..986a57de0c99eeb53d3b25b56aa32bcc954d2965 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -219,8 +219,8 @@ void WebMediaPlayerAndroid::load(LoadType load_type,
manager_->Initialize(
player_type_, player_id_, url, first_party_url, demuxer_client_id);
- if (manager_->IsInFullscreen(frame_))
- manager_->EnterFullscreen(player_id_);
+ if (manager_->ShouldEnterFullscreen(frame_))
+ manager_->EnterFullscreen(player_id_, frame_);
UpdateNetworkState(WebMediaPlayer::NetworkStateLoading);
UpdateReadyState(WebMediaPlayer::ReadyStateHaveNothing);
@@ -1404,7 +1404,7 @@ void WebMediaPlayerAndroid::DoReleaseRemotePlaybackTexture(uint32 sync_point) {
void WebMediaPlayerAndroid::enterFullscreen() {
if (manager_->CanEnterFullscreen(frame_)) {
- manager_->EnterFullscreen(player_id_);
+ manager_->EnterFullscreen(player_id_, frame_);
SetNeedsEstablishPeer(false);
}
}
« no previous file with comments | « content/renderer/media/android/renderer_media_player_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698