Upstream fullscreen video implementation for android

webkit/media/android/webmediaplayer_manager_android.cc

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..0c635700f25d9e87e427eb2c999563a7f62d3440 100644
--- a/webkit/media/android/webmediaplayer_manager_android.cc
+++ b/webkit/media/android/webmediaplayer_manager_android.cc
@@ -4,16 +4,17 @@
 
 #include "webkit/media/android/webmediaplayer_manager_android.h"
 
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"

[scherkus (not reviewing), 2012/10/04 21:13:41]

nit: do you actually need this?

it appears you're only doing pointer comparisons

[qinmin, 2012/10/04 23:49:32]

Done.

 #include "webkit/media/android/webmediaplayer_android.h"
 
 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 +44,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