Fix fullscreen video race condition.

content/renderer/media/android/renderer_media_player_manager.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 53 matching lines @@
   // Sets the player volume.
   void SetVolume(int player_id, double volume);
 
   // Releases resources for the player.
   void ReleaseResources(int player_id);
 
   // Destroys the player in the browser process
   void DestroyPlayer(int player_id);
 
   // Requests the player to enter fullscreen.
-  void EnterFullscreen(int player_id);
+  void EnterFullscreen(int player_id, blink::WebFrame* frame);
 
   // Requests the player to exit fullscreen.
   void ExitFullscreen(int player_id);
 
 #if defined(VIDEO_HOLE)
   // Requests an external surface for out-of-band compositing.
   void RequestExternalSurface(int player_id, const gfx::RectF& geometry);
 
   // RenderViewObserver overrides.
   virtual void DidCommitCompositorFrame() OVERRIDE;
@@ skipping 31 matching lines @@
   // Checks whether a player can enter fullscreen.
   bool CanEnterFullscreen(blink::WebFrame* frame);
 
   // Called when a player entered or exited fullscreen.
   void DidEnterFullscreen(blink::WebFrame* frame);
   void DidExitFullscreen();
 
   // Checks whether the Webframe is in fullscreen.
   bool IsInFullscreen(blink::WebFrame* frame);
 
+  // True if a newly created media player should enter fullscreen.
+  bool ShouldEnterFullscreen(blink::WebFrame* frame);
+
   // Gets the pointer to WebMediaPlayerAndroid given the |player_id|.
   WebMediaPlayerAndroid* GetMediaPlayer(int player_id);
 
   // Gets the pointer to ProxyMediaKeys given the |media_keys_id|.
   ProxyMediaKeys* GetMediaKeys(int media_keys_id);
 
 #if defined(VIDEO_HOLE)
   // Gets the list of media players with video geometry changes.
   void RetrieveGeometryChanges(std::map<int, gfx::RectF>* changes);
 #endif  // defined(VIDEO_HOLE)
@@ skipping 40 matching lines @@
 
   // Info for all available ProxyMediaKeys. There must be at most one
   // ProxyMediaKeys for each available WebMediaPlayerAndroid.
   std::map<int, ProxyMediaKeys*> media_keys_;
 
   int next_media_player_id_;
 
   // WebFrame of the fullscreen video.
   blink::WebFrame* fullscreen_frame_;
 
+  // WebFrame of pending fullscreen request.
+  blink::WebFrame* pending_fullscreen_frame_;
+
   DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_