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

Unified Diff: webkit/media/android/webmediaplayer_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: rebase & added a missing ifdef guard 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 side-by-side diff with in-line comments
Download patch
Index: webkit/media/android/webmediaplayer_manager_android.cc
diff --git a/webkit/media/android/webmediaplayer_manager_android.cc b/webkit/media/android/webmediaplayer_manager_android.cc
index c64de252ba3abdde42d81f21eb8cc967e6a81a0a..80296d975080323d25c71842a4e221f7db226daf 100644
--- a/webkit/media/android/webmediaplayer_manager_android.cc
+++ b/webkit/media/android/webmediaplayer_manager_android.cc
@@ -4,6 +4,7 @@
#include "webkit/media/android/webmediaplayer_manager_android.h"
+#include "ui/gfx/rect_f.h"
#include "webkit/media/android/webmediaplayer_android.h"
namespace webkit_media {
@@ -14,7 +15,7 @@ WebMediaPlayerManagerAndroid::WebMediaPlayerManagerAndroid()
}
WebMediaPlayerManagerAndroid::~WebMediaPlayerManagerAndroid() {
- std::map<int32, WebMediaPlayerAndroid*>::iterator player_it;
+ std::map<int, WebMediaPlayerAndroid*>::iterator player_it;
for (player_it = media_players_.begin();
player_it != media_players_.end(); ++player_it) {
WebMediaPlayerAndroid* player = player_it->second;
@@ -33,7 +34,7 @@ void WebMediaPlayerManagerAndroid::UnregisterMediaPlayer(int player_id) {
}
void WebMediaPlayerManagerAndroid::ReleaseMediaResources() {
- std::map<int32, WebMediaPlayerAndroid*>::iterator player_it;
+ std::map<int, WebMediaPlayerAndroid*>::iterator player_it;
for (player_it = media_players_.begin();
player_it != media_players_.end(); ++player_it) {
WebMediaPlayerAndroid* player = player_it->second;
@@ -46,7 +47,7 @@ void WebMediaPlayerManagerAndroid::ReleaseMediaResources() {
WebMediaPlayerAndroid* WebMediaPlayerManagerAndroid::GetMediaPlayer(
int player_id) {
- std::map<int32, WebMediaPlayerAndroid*>::iterator iter =
+ std::map<int, WebMediaPlayerAndroid*>::iterator iter =
media_players_.find(player_id);
if (iter != media_players_.end())
return iter->second;
@@ -69,4 +70,24 @@ bool WebMediaPlayerManagerAndroid::IsInFullscreen(WebKit::WebFrame* frame) {
return fullscreen_frame_ == frame;
}
+#if defined(GOOGLE_TV)
+void WebMediaPlayerManagerAndroid::RetrieveGeometryChanges(
+ std::map<int, gfx::RectF>* changes) {
+ DCHECK(changes->empty());
+ for (std::map<int, WebMediaPlayerAndroid*>::iterator player_it =
+ media_players_.begin();
+ player_it != media_players_.end();
+ ++player_it) {
+ WebMediaPlayerAndroid* player = player_it->second;
+
+ if (player && player->hasVideo()) {
+ gfx::RectF rect;
+ if (player->RetrieveGeometryChange(&rect)) {
+ (*changes)[player_it->first] = rect;
+ }
+ }
+ }
+}
+#endif
+
} // namespace webkit_media
« no previous file with comments | « webkit/media/android/webmediaplayer_manager_android.h ('k') | webkit/media/android/webmediaplayer_proxy_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698