Move ExternalVideoSurfaceHolder from WebContents UserData to BrowserMediaPlayerManager.

content/browser/media/android/browser_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_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 13 matching lines @@
 #include "url/gurl.h"
 
 namespace media {
 class DemuxerAndroid;
 class MediaDrmBridge;
 }
 
 namespace content {
 class BrowserDemuxerAndroid;
 class ContentViewCoreImpl;
+class ExternalVideoSurfaceContainer;
 class WebContents;
 
 // This class manages all the MediaPlayerAndroid objects. It receives
 // control operations from the the render process, and forwards
 // them to corresponding MediaPlayerAndroid object. Callbacks from
 // MediaPlayerAndroid objects are converted to IPCs and then sent to the
 // render process.
 class CONTENT_EXPORT BrowserMediaPlayerManager
     : public WebContentsObserver,
       public media::MediaPlayerManager {
@@ skipping 57 matching lines @@
   virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE;
   virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE;
   virtual void OnSessionError(int cdm_id,
                               uint32 session_id,
                               media::MediaKeys::KeyError error_code,
                               uint32 system_code) OVERRIDE;
 
 #if defined(VIDEO_HOLE)
   void AttachExternalVideoSurface(int player_id, jobject surface);
   void DetachExternalVideoSurface(int player_id);
+  void OnFrameInfoUpdated();
 #endif  // defined(VIDEO_HOLE)
 
   // Called to disble the current fullscreen playback if the video is encrypted.
   // TODO(qinmin): remove this once we have the new fullscreen mode.
   void DisableFullscreenEncryptedMediaPlayback();
 
  protected:
   // Clients must use Create() or subclass constructor.
   explicit BrowserMediaPlayerManager(RenderViewHost* render_view_host);
 
@@ skipping 102 matching lines @@
   // device DRM credentials.
   // These 2 sets does not cover all the EME videos. If a video only streams
   // clear data, it will not be included in either set.
   std::set<int> cdm_ids_pending_approval_;
   std::set<int> cdm_ids_approved_;
 
   // The fullscreen video view object or NULL if video is not played in
   // fullscreen.
   scoped_ptr<ContentVideoView> video_view_;
 
+#if defined(VIDEO_HOLE)
+  scoped_ptr<ExternalVideoSurfaceContainer> external_video_surface_container_;
+#endif
+
   // Player ID of the fullscreen media player.
   int fullscreen_player_id_;
 
   // The player ID pending to enter fullscreen.
   int pending_fullscreen_player_id_;
 
   // Whether the fullscreen player has been Release()-d.
   bool fullscreen_player_is_released_;
 
   WebContents* web_contents_;
 
   // Object for retrieving resources media players.
   scoped_ptr<media::MediaResourceGetter> media_resource_getter_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_