Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "webkit/media/android/webmediaplayer_manager_android.h" | 5 #include "webkit/media/android/webmediaplayer_manager_android.h" |
| 6 | 6 |
| 7 #include "ui/gfx/rect_f.h" | |
| 7 #include "webkit/media/android/webmediaplayer_android.h" | 8 #include "webkit/media/android/webmediaplayer_android.h" |
| 8 | 9 |
| 9 namespace webkit_media { | 10 namespace webkit_media { |
| 10 | 11 |
| 11 WebMediaPlayerManagerAndroid::WebMediaPlayerManagerAndroid() | 12 WebMediaPlayerManagerAndroid::WebMediaPlayerManagerAndroid() |
| 12 : next_media_player_id_(0), | 13 : next_media_player_id_(0), |
| 13 fullscreen_frame_(NULL) { | 14 fullscreen_frame_(NULL) { |
| 14 } | 15 } |
| 15 | 16 |
| 16 WebMediaPlayerManagerAndroid::~WebMediaPlayerManagerAndroid() { | 17 WebMediaPlayerManagerAndroid::~WebMediaPlayerManagerAndroid() { |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 62 } | 63 } |
| 63 | 64 |
| 64 void WebMediaPlayerManagerAndroid::DidExitFullscreen() { | 65 void WebMediaPlayerManagerAndroid::DidExitFullscreen() { |
| 65 fullscreen_frame_ = NULL; | 66 fullscreen_frame_ = NULL; |
| 66 } | 67 } |
| 67 | 68 |
| 68 bool WebMediaPlayerManagerAndroid::IsInFullscreen(WebKit::WebFrame* frame) { | 69 bool WebMediaPlayerManagerAndroid::IsInFullscreen(WebKit::WebFrame* frame) { |
| 69 return fullscreen_frame_ == frame; | 70 return fullscreen_frame_ == frame; |
| 70 } | 71 } |
| 71 | 72 |
| 73 void WebMediaPlayerManagerAndroid::GetGeometryChanges( | |
| 74 std::map<int, gfx::RectF>* changes) { | |
| 75 DCHECK(changes->empty()); | |
| 76 std::map<int32, WebMediaPlayerAndroid*>::iterator player_it; | |
|
palmer
2013/04/05 18:05:15
This should really be scoped to the for loop. If t
wonsik
2013/04/08 04:39:22
Done.
| |
| 77 for (player_it = media_players_.begin(); player_it != media_players_.end(); | |
| 78 ++player_it) { | |
| 79 WebMediaPlayerAndroid* player = player_it->second; | |
| 80 | |
| 81 if (player && player->hasVideo()) { | |
| 82 gfx::RectF rect; | |
| 83 if (player->GetGeometryChange(&rect)) { | |
| 84 (*changes)[player_it->first] = rect; | |
| 85 } | |
| 86 } | |
| 87 } | |
| 88 } | |
| 89 | |
| 72 } // namespace webkit_media | 90 } // namespace webkit_media |
| OLD | NEW |