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

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

Issue 10979047: Upstream fullscreen video implementation for android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merging latest changes Created 8 years, 2 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 f93854d51e37551dbfbf5e5a4c01adce6b7f41db..b0a863441d144b3a0849805b8765a8df320d269b 100644
--- a/webkit/media/android/webmediaplayer_manager_android.cc
+++ b/webkit/media/android/webmediaplayer_manager_android.cc
@@ -9,11 +9,11 @@
namespace webkit_media {
WebMediaPlayerManagerAndroid::WebMediaPlayerManagerAndroid()
- : next_media_player_id_(0) {
+ : next_media_player_id_(0),
+ fullscreen_frame_(NULL) {
}
WebMediaPlayerManagerAndroid::~WebMediaPlayerManagerAndroid() {
- ReleaseMediaResources();
}
int WebMediaPlayerManagerAndroid::RegisterMediaPlayer(
@@ -43,4 +43,20 @@ WebMediaPlayerAndroid* WebMediaPlayerManagerAndroid::GetMediaPlayer(
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;
+}
+
} // 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