Location/size change notification when external rendering is enabled

content/browser/android/media_player_manager_android.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/android/media_player_manager_android.h"
 
 #include "base/bind.h"
 #include "content/browser/android/media_resource_getter_impl.h"
 #include "content/browser/web_contents/web_contents_view_android.h"
 #include "content/common/media/media_player_messages.h"
@@ skipping 27 matching lines @@
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ExitFullscreen, OnExitFullscreen)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerInitialize, OnInitialize)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerStart, OnStart)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerSeek, OnSeek)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerPause, OnPause)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerRelease,
                         OnReleaseResources)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers,
                         DestroyAllMediaPlayers)
+#if defined(GOOGLE_TV)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_RequestExternalSurface,
                         OnRequestExternalSurface)
+    IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_NotifyGeometryChange,
+                        OnNotifyGeometryChange)
+#endif
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void MediaPlayerManagerAndroid::FullscreenPlayerPlay() {
   MediaPlayerBridge* player = GetFullscreenPlayer();
   if (player) {
     player->Start();
     Send(new MediaPlayerMsg_DidMediaPlayerPlay(
@@ skipping 132 matching lines @@
 }
 
 void MediaPlayerManagerAndroid::DestroyAllMediaPlayers() {
   players_.clear();
   if (fullscreen_player_id_ != -1) {
     video_view_.DestroyContentVideoView();
     fullscreen_player_id_ = -1;
   }
 }
 
+#if defined(GOOGLE_TV)
 void MediaPlayerManagerAndroid::AttachExternalVideoSurface(int player_id,
                                                            jobject surface) {
   MediaPlayerBridge* player = GetPlayer(player_id);
   if (player)
     player->SetVideoSurface(surface);
 }
 
 void MediaPlayerManagerAndroid::DetachExternalVideoSurface(int player_id) {
   MediaPlayerBridge* player = GetPlayer(player_id);
   if (player)
     player->SetVideoSurface(NULL);
 }
 
 void MediaPlayerManagerAndroid::OnRequestExternalSurface(int player_id) {
-  if (web_contents_) {
-    WebContentsViewAndroid* view =
-        static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
-    if (view)
-      view->RequestExternalVideoSurface(player_id);
-  }
+  if (!web_contents_)
+    return;
+
+  WebContentsViewAndroid* view =
+      static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
+  if (view)
+    view->RequestExternalVideoSurface(player_id);
 }
 
+void MediaPlayerManagerAndroid::OnNotifyGeometryChange(int player_id,
+                                                       const gfx::RectF& rect) {
+  if (!web_contents_)
+    return;
+
+  WebContentsViewAndroid* view =
+      static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
+  if (view)
+    view->NotifyGeometryChange(player_id, rect);
+}
+#endif
+
 MediaPlayerBridge* MediaPlayerManagerAndroid::GetPlayer(int player_id) {
   for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin();
       it != players_.end(); ++it) {
     if ((*it)->player_id() == player_id)
       return *it;
   }
   return NULL;
 }
 
 MediaPlayerBridge* MediaPlayerManagerAndroid::GetFullscreenPlayer() {
@@ skipping 86 matching lines @@
     }
   }
 }
 
 void MediaPlayerManagerAndroid::ReleaseMediaResources(
     MediaPlayerBridge* player) {
   // Nothing needs to be done.
 }
 
 }  // namespace content