Always create a ContentVideoView when entering fullscreen on Android

media/blink/webmediaplayer_impl.h

Index: media/blink/webmediaplayer_impl.h
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
index 9a127640bbf5fa8b6c1d4909d4c6ea2b7a5c724b..6133eb25c3fa074a74238035c2c7a681109ad7d9 100644
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
@@ -11,6 +11,7 @@
 #include <string>
 #include <vector>
 
+#include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
@@ -260,6 +261,11 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
   // Called when the data source is downloading or paused.
   void NotifyDownloading(bool is_downloading);
 
+  // Called by SurfaceManager when a surface is created.
+  void OnSurfaceCreated(int surface_id);
+
+  // Called by GpuVideoDecoder on Android to request a surface to render to (if
+  // necessary).
   void OnSurfaceRequested(const SurfaceCreatedCB& surface_created_cb);
 
   // Creates a Renderer via the |renderer_factory_|.
@@ -423,11 +429,6 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
   // Whether the current decoder requires a restart on fullscreen transitions.
   bool decoder_requires_restart_for_fullscreen_;
 
-  // What to return from supportsOverlayFullscreenVideo(). This is usually
-  // equal to |decoder_requires_restart_for_fullscreen_| except that it doesn't
-  // change while we're in fullscreen. See supportsOverlayFullscreenVideo().
-  bool supports_overlay_fullscreen_video_;
-
   blink::WebMediaPlayerClient* client_;
   blink::WebMediaPlayerEncryptedMediaClient* encrypted_client_;
 
@@ -496,6 +497,17 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
   // This will be null everywhere but Android.
   SurfaceManager* surface_manager_;
 
+  // For canceling ongoing surface creation requests when exiting fullscreen.
+  base::CancelableCallback<void(int)> surface_created_cb_;
+
+  // The current fullscreen surface id. Populated while in fullscreen once the
+  // surface is created.
+  int fullscreen_surface_id_;
+
+  // If a surface is requested before it's finished being created, the request
+  // is saved and satisfied once the surface is available.
+  SurfaceCreatedCB pending_surface_request_cb_;
+
   // Suppresses calls to OnPipelineError() after destruction / shutdown has been
   // started; prevents us from spuriously logging errors that are transient or
   // unimportant.