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

Unified Diff: webkit/renderer/media/android/webmediaplayer_manager_android.cc

Issue 17502007: Move webkit/renderer/media/android/ to content/renderer/media/android/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shared lib Created 7 years, 6 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/renderer/media/android/webmediaplayer_manager_android.cc
diff --git a/webkit/renderer/media/android/webmediaplayer_manager_android.cc b/webkit/renderer/media/android/webmediaplayer_manager_android.cc
deleted file mode 100644
index 420b18d52e394b5d6791127ef41b42354f38a609..0000000000000000000000000000000000000000
--- a/webkit/renderer/media/android/webmediaplayer_manager_android.cc
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2013 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 "webkit/renderer/media/android/webmediaplayer_manager_android.h"
-
-#include "ui/gfx/rect_f.h"
-#include "webkit/renderer/media/android/webmediaplayer_android.h"
-
-namespace webkit_media {
-
-WebMediaPlayerManagerAndroid::WebMediaPlayerManagerAndroid()
- : next_media_player_id_(0),
- fullscreen_frame_(NULL) {
-}
-
-WebMediaPlayerManagerAndroid::~WebMediaPlayerManagerAndroid() {
- 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;
- player->Detach();
- }
-}
-
-int WebMediaPlayerManagerAndroid::RegisterMediaPlayer(
- WebMediaPlayerAndroid* player) {
- media_players_[next_media_player_id_] = player;
- return next_media_player_id_++;
-}
-
-void WebMediaPlayerManagerAndroid::UnregisterMediaPlayer(int player_id) {
- media_players_.erase(player_id);
-}
-
-void WebMediaPlayerManagerAndroid::ReleaseMediaResources(
- bool retain_video_playback) {
- 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;
-
- // Do not release if an audio track is still playing or the app wants to
- // retain video playback.
- if (player &&
- (player->paused() || (!retain_video_playback && player->hasVideo()))) {
- player->ReleaseMediaResources();
- }
- }
-}
-
-WebMediaPlayerAndroid* WebMediaPlayerManagerAndroid::GetMediaPlayer(
- int player_id) {
- std::map<int, WebMediaPlayerAndroid*>::iterator iter =
- media_players_.find(player_id);
- if (iter != media_players_.end())
- return iter->second;
- return NULL;
-}
-
-bool WebMediaPlayerManagerAndroid::CanEnterFullscreen(WebKit::WebFrame* frame) {
- return !fullscreen_frame_ || IsInFullscreen(frame);
-}
-
-void WebMediaPlayerManagerAndroid::DidEnterFullscreen(WebKit::WebFrame* frame) {
- fullscreen_frame_ = frame;
-}
-
-void WebMediaPlayerManagerAndroid::DidExitFullscreen() {
- fullscreen_frame_ = NULL;
-}
-
-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

Powered by Google App Engine
This is Rietveld 408576698