Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: content/browser/android/media_player_manager_android.cc

Issue 13688004: Location/size change notification when external rendering is enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Andrew's comments. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/android/media_player_manager_android.h" 5 #include "content/browser/android/media_player_manager_android.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/browser/android/media_resource_getter_impl.h" 8 #include "content/browser/android/media_resource_getter_impl.h"
9 #include "content/browser/web_contents/web_contents_view_android.h" 9 #include "content/browser/web_contents/web_contents_view_android.h"
10 #include "content/common/media/media_player_messages.h" 10 #include "content/common/media/media_player_messages.h"
(...skipping 29 matching lines...) Expand all
40 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerStart, OnStart) 40 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerStart, OnStart)
41 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerSeek, OnSeek) 41 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerSeek, OnSeek)
42 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerPause, OnPause) 42 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerPause, OnPause)
43 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerRelease, 43 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerRelease,
44 OnReleaseResources) 44 OnReleaseResources)
45 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer) 45 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer)
46 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers, 46 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers,
47 DestroyAllMediaPlayers) 47 DestroyAllMediaPlayers)
48 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_RequestExternalSurface, 48 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_RequestExternalSurface,
49 OnRequestExternalSurface) 49 OnRequestExternalSurface)
50 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_NotifyGeometryChange,
51 OnNotifyGeometryChange)
50 IPC_MESSAGE_UNHANDLED(handled = false) 52 IPC_MESSAGE_UNHANDLED(handled = false)
51 IPC_END_MESSAGE_MAP() 53 IPC_END_MESSAGE_MAP()
52 return handled; 54 return handled;
53 } 55 }
54 56
55 void MediaPlayerManagerAndroid::FullscreenPlayerPlay() { 57 void MediaPlayerManagerAndroid::FullscreenPlayerPlay() {
56 MediaPlayerBridge* player = GetFullscreenPlayer(); 58 MediaPlayerBridge* player = GetFullscreenPlayer();
57 if (player) { 59 if (player) {
58 player->Start(); 60 player->Start();
59 Send(new MediaPlayerMsg_DidMediaPlayerPlay( 61 Send(new MediaPlayerMsg_DidMediaPlayerPlay(
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 216
215 void MediaPlayerManagerAndroid::OnRequestExternalSurface(int player_id) { 217 void MediaPlayerManagerAndroid::OnRequestExternalSurface(int player_id) {
216 if (web_contents_) { 218 if (web_contents_) {
217 WebContentsViewAndroid* view = 219 WebContentsViewAndroid* view =
218 static_cast<WebContentsViewAndroid*>(web_contents_->GetView()); 220 static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
219 if (view) 221 if (view)
220 view->RequestExternalVideoSurface(player_id); 222 view->RequestExternalVideoSurface(player_id);
221 } 223 }
222 } 224 }
223 225
226 void MediaPlayerManagerAndroid::OnNotifyGeometryChange(int player_id,
227 const gfx::RectF& rect) {
228 if (web_contents_) {
palmer 2013/04/09 19:02:41 NIT: You could save a level of indentation by: if
wonsik 2013/04/10 06:29:22 Done.
229 WebContentsViewAndroid* view =
230 static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
231 if (view)
232 view->NotifyGeometryChange(player_id, rect);
233 }
234 }
235
224 MediaPlayerBridge* MediaPlayerManagerAndroid::GetPlayer(int player_id) { 236 MediaPlayerBridge* MediaPlayerManagerAndroid::GetPlayer(int player_id) {
225 for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin(); 237 for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin();
226 it != players_.end(); ++it) { 238 it != players_.end(); ++it) {
227 if ((*it)->player_id() == player_id) 239 if ((*it)->player_id() == player_id)
228 return *it; 240 return *it;
229 } 241 }
230 return NULL; 242 return NULL;
231 } 243 }
232 244
233 MediaPlayerBridge* MediaPlayerManagerAndroid::GetFullscreenPlayer() { 245 MediaPlayerBridge* MediaPlayerManagerAndroid::GetFullscreenPlayer() {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 } 332 }
321 } 333 }
322 } 334 }
323 335
324 void MediaPlayerManagerAndroid::ReleaseMediaResources( 336 void MediaPlayerManagerAndroid::ReleaseMediaResources(
325 MediaPlayerBridge* player) { 337 MediaPlayerBridge* player) {
326 // Nothing needs to be done. 338 // Nothing needs to be done.
327 } 339 }
328 340
329 } // namespace content 341 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698