Make RendererMediaPlayerManager a RenderFrameObserver.

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>
 
 #include "base/basictypes.h"
 #include "base/time/time.h"
 #include "content/common/media/cdm_messages_enums.h"
 #include "content/common/media/media_player_messages_enums_android.h"
-#include "content/public/renderer/render_view_observer.h"
+#include "content/public/renderer/render_frame_observer.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/media_keys.h"
 #include "url/gurl.h"
 
 namespace blink {
 class WebFrame;
 }
 
 namespace gfx {
 class RectF;
 }
 
 namespace content {
 
 class ProxyMediaKeys;
 class WebMediaPlayerAndroid;
 
 // Class for managing all the WebMediaPlayerAndroid objects in the same
-// RenderView.
-class RendererMediaPlayerManager : public RenderViewObserver {
+// RenderFrame.
+class RendererMediaPlayerManager : public RenderFrameObserver {
  public:
   static const int kInvalidCdmId = 0;
 
-  // Constructs a RendererMediaPlayerManager object for the |render_view|.
-  RendererMediaPlayerManager(RenderView* render_view);
+  // Constructs a RendererMediaPlayerManager object for the |render_frame|.
+  RendererMediaPlayerManager(RenderFrame* render_frame);
   virtual ~RendererMediaPlayerManager();
 
-  // RenderViewObserver overrides.
+  // RenderFrameObserver overrides.
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // Initializes a MediaPlayerAndroid object in browser process.
   void Initialize(MediaPlayerHostMsg_Initialize_Type type,
                   int player_id,
                   const GURL& url,
                   const GURL& first_party_for_cookies,
                   int demuxer_client_id);
 
   // Starts the player.
@@ skipping 29 matching lines @@
 
   // Requests the player with |player_id| to use the CDM with |cdm_id|.
   // Does nothing if |cdm_id| is kInvalidCdmId.
   // TODO(xhwang): Update this when we implement setCdm(0).
   void SetCdm(int player_id, int cdm_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.
+  // RenderFrameObserver overrides.
   virtual void DidCommitCompositorFrame() OVERRIDE;
 
   // Returns true if a media player should use video-overlay for the embedded
   // encrypted video.
   bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo();
 #endif  // defined(VIDEO_HOLE)
 
   // Encrypted media related methods.
   void InitializeCdm(int cdm_id,
                      ProxyMediaKeys* media_keys,
@@ skipping 12 matching lines @@
   // Registers and unregisters a WebMediaPlayerAndroid object.
   int RegisterMediaPlayer(WebMediaPlayerAndroid* player);
   void UnregisterMediaPlayer(int player_id);
 
   // Registers a ProxyMediaKeys object. There must be a WebMediaPlayerAndroid
   // object already registered for this id, and it is unregistered when the
   // player is unregistered. For now |cdm_id| is the same as player_id
   // used in other methods.
   void RegisterMediaKeys(int cdm_id, ProxyMediaKeys* media_keys);
 
-  // Releases the media resources managed by this object when a video
-  // is playing.
-  void ReleaseVideoResources();
-
   // 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);
 
@@ skipping 27 matching lines @@
   void OnTimeUpdate(int player_id, base::TimeDelta current_time);
   void OnMediaPlayerReleased(int player_id);
   void OnConnectedToRemoteDevice(int player_id,
       const std::string& remote_playback_message);
   void OnDisconnectedFromRemoteDevice(int player_id);
   void OnDidExitFullscreen(int player_id);
   void OnDidEnterFullscreen(int player_id);
   void OnPlayerPlay(int player_id);
   void OnPlayerPause(int player_id);
   void OnRequestFullscreen(int player_id);
+  void OnPauseVideo();
   void OnSessionCreated(int cdm_id,
                         uint32 session_id,
                         const std::string& web_session_id);
   void OnSessionMessage(int cdm_id,
                         uint32 session_id,
                         const std::vector<uint8>& message,
                         const GURL& destination_url);
   void OnSessionReady(int cdm_id, uint32 session_id);
   void OnSessionClosed(int cdm_id, uint32 session_id);
   void OnSessionError(int cdm_id,
                       uint32 session_id,
                       media::MediaKeys::KeyError error_code,
                       uint32 system_code);
 
+  // Release all video player resources.
+  // If something is in progress the resource will not be freed. It will
+  // only be freed once the tab is destroyed or if the user navigates away
+  // via WebMediaPlayerAndroid::Destroy.
+  void ReleaseVideoResources();
+
   // Info for all available WebMediaPlayerAndroid on a page; kept so that
   // we can enumerate them to send updates about tab focus and visibility.
   std::map<int, WebMediaPlayerAndroid*> media_players_;
 
   // 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_