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

Unified Diff: content/browser/android/surface_texture_peer_browser_impl.cc

Issue 10979047: Upstream fullscreen video implementation for android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merging latest changes Created 8 years, 2 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/browser/android/media_player_manager_android.cc ('k') | content/common/content_message_generator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/surface_texture_peer_browser_impl.cc
diff --git a/content/browser/android/surface_texture_peer_browser_impl.cc b/content/browser/android/surface_texture_peer_browser_impl.cc
index a68286df08b6e8fc247b8d5a5e9a6e6429f303ea..e1d1884270441357385ca4cbc719dcabf09b596b 100644
--- a/content/browser/android/surface_texture_peer_browser_impl.cc
+++ b/content/browser/android/surface_texture_peer_browser_impl.cc
@@ -38,8 +38,9 @@ static void SetSurfacePeer(jobject j_surface,
if (host) {
media::MediaPlayerBridge* player =
host->media_player_manager()->GetPlayer(player_id);
- if (player) {
- player->SetVideoSurface(j_surface);
+ if (player &&
+ player != host->media_player_manager()->GetFullscreenPlayer()) {
+ player->SetVideoSurface(j_surface);
}
}
}
« no previous file with comments | « content/browser/android/media_player_manager_android.cc ('k') | content/common/content_message_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698