Upstream fullscreen video implementation for android

content/browser/android/surface_texture_peer_browser_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/surface_texture_peer_browser_impl.h"
 
 #include "content/browser/android/media_player_manager_android.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/android/surface_callback.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 20 matching lines @@
   }
 
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
   if (renderer_id) {
     RenderViewHostImpl* host = RenderViewHostImpl::FromID(
         renderer_id, render_view_id);
     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);
       }
     }
   }
 
   ReleaseSurface(j_surface);
   env->DeleteGlobalRef(j_surface);
 }
 
 SurfaceTexturePeerBrowserImpl::SurfaceTexturePeerBrowserImpl(
     bool player_in_render_process)
@@ skipping 34 matching lines @@
         player_id));
   }
 }
 
 bool SurfaceTexturePeerBrowserImpl::RegisterBrowserProcessSurfaceTexture(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content