Chromium Code Reviews| 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..3e7eb94a13c5c4d20d6b401d5e5477bc89eb4c1b 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,22 @@ bool WebMediaPlayerManagerAndroid::IsInFullscreen(WebKit::WebFrame* frame) { |
| return fullscreen_frame_ == frame; |
| } |
| +void WebMediaPlayerManagerAndroid::GetGeometryChanges( |
| + std::map<int, gfx::RectF>* changes) { |
|
palmer
2013/04/09 19:02:41
I always wish we could use a vector<Foo> rather th
wonsik
2013/04/10 06:29:22
Filed http://crbug.com/229769
|
| + 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->GetGeometryChange(&rect)) { |
| + (*changes)[player_it->first] = rect; |
| + } |
| + } |
| + } |
| +} |
| + |
| } // namespace webkit_media |