Ties RenderFrameImpl VIDEO_HOLE observer to lifetime of RenderWidget.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 6ccb9f5995949069dbeadc97faa76fd507a3ac9b..04b3cc52398b26182532a71dcdd5dfc07d7147bb 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -417,6 +417,9 @@ RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id)
   RenderThread::Get()->AddRoute(routing_id_, this);
 
   render_view_->RegisterRenderFrame(this);
+#if defined(VIDEO_HOLE)
+  render_view_->RegisterVideoHoleFrame(this);

[ycheo (away), 2014/07/09 21:04:39]

Do you have any specific reason to register the observer always? 

[gunsch-google, 2014/07/09 21:12:43]

No technical reason, but it seemed reasonable to tie it to the lifetime of
RenderFrameImpl.

Would you prefer to register the observer in the first call to
createMediaPlayer, then presumably have a flag to track?

[xhwang, 2014/07/09 23:52:08]

Register in createMediaPlayer() sgtm. Actually create a RenderFrameObserver for
registering VideoHoleFrame so that in ~RenderFrameImpl, the unregistering will
happen automatically?

[gunsch, 2014/07/10 00:42:58]

Discussed offline, that seems to be excessive complexity.

Moved to registering only once, in createMediaPlayer, tracked with a flag.

+#endif  // defined(VIDEO_HOLE)
 
 #if defined(OS_ANDROID)
   new JavaBridgeDispatcher(this);
@@ -431,9 +434,8 @@ RenderFrameImpl::~RenderFrameImpl() {
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone());
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct());
 
-#if defined(OS_ANDROID) && defined(VIDEO_HOLE)
-  if (media_player_manager_)
-    render_view_->UnregisterVideoHoleFrame(this);
+#if defined(VIDEO_HOLE)
+  render_view_->UnregisterVideoHoleFrame(this);
 #endif
 
   render_view_->UnregisterRenderFrame(this);
@@ -3558,12 +3560,8 @@ WebMediaPlayer* RenderFrameImpl::CreateAndroidWebMediaPlayer(
 }
 
 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() {
-  if (!media_player_manager_) {
+  if (!media_player_manager_)
     media_player_manager_ = new RendererMediaPlayerManager(this);
-#if defined(VIDEO_HOLE)
-    render_view_->RegisterVideoHoleFrame(this);
-#endif  // defined(VIDEO_HOLE)
-  }
   return media_player_manager_;
 }