Merge "Clean up full-screen mode plugins now that they handle touch in their java view."

3 files changed, 5 insertions, 23 deletions

diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 3a2a427..6e0ef43 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -223,7 +223,6 @@ struct WebViewCore::JavaGlue {
     jmethodID   m_getPluginClass;
     jmethodID   m_showFullScreenPlugin;
     jmethodID   m_hideFullScreenPlugin;
-    jmethodID   m_updateFullScreenPlugin;
     jmethodID   m_addSurface;
     jmethodID   m_updateSurface;
     jmethodID   m_destroySurface;
@@ -311,9 +310,8 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
     m_javaGlue->m_geolocationPermissionsHidePrompt = GetJMethod(env, clazz, "geolocationPermissionsHidePrompt", "()V");
     m_javaGlue->m_addMessageToConsole = GetJMethod(env, clazz, "addMessageToConsole", "(Ljava/lang/String;ILjava/lang/String;I)V");
     m_javaGlue->m_getPluginClass = GetJMethod(env, clazz, "getPluginClass", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Class;");
-    m_javaGlue->m_showFullScreenPlugin = GetJMethod(env, clazz, "showFullScreenPlugin", "(Landroid/webkit/ViewManager$ChildView;IIIII)V");
+    m_javaGlue->m_showFullScreenPlugin = GetJMethod(env, clazz, "showFullScreenPlugin", "(Landroid/webkit/ViewManager$ChildView;I)V");
     m_javaGlue->m_hideFullScreenPlugin = GetJMethod(env, clazz, "hideFullScreenPlugin", "()V");
-    m_javaGlue->m_updateFullScreenPlugin = GetJMethod(env, clazz, "updateFullScreenPlugin", "(IIII)V");
     m_javaGlue->m_addSurface = GetJMethod(env, clazz, "addSurface", "(Landroid/view/View;IIII)Landroid/webkit/ViewManager$ChildView;");
     m_javaGlue->m_updateSurface = GetJMethod(env, clazz, "updateSurface", "(Landroid/webkit/ViewManager$ChildView;IIII)V");
     m_javaGlue->m_destroySurface = GetJMethod(env, clazz, "destroySurface", "(Landroid/webkit/ViewManager$ChildView;)V");
@@ -2391,15 +2389,13 @@ jclass WebViewCore::getPluginClass(const WebCore::String& libName, const char* c
     }
 }
 
-void WebViewCore::showFullScreenPlugin(jobject childView, NPP npp, int x,
-        int y, int width, int height)
+void WebViewCore::showFullScreenPlugin(jobject childView, NPP npp)
 {
     JNIEnv* env = JSC::Bindings::getJNIEnv();
     AutoJObject obj = m_javaGlue->object(env);
 
     env->CallVoidMethod(obj.get(),
-                        m_javaGlue->m_showFullScreenPlugin,
-                        childView, (int)npp, x, y, width, height);
+                        m_javaGlue->m_showFullScreenPlugin, childView, (int)npp);
     checkException(env);
 }
 
@@ -2411,15 +2407,6 @@ void WebViewCore::hideFullScreenPlugin()
     checkException(env);
 }
 
-void WebViewCore::updateFullScreenPlugin(int x, int y, int width, int height)
-{
-    JNIEnv* env = JSC::Bindings::getJNIEnv();
-    env->CallVoidMethod(m_javaGlue->object(env).get(),
-            m_javaGlue->m_updateFullScreenPlugin, x, y,
-            width, height);
-    checkException(env);
-}
-
 jobject WebViewCore::addSurface(jobject view, int x, int y, int width, int height)
 {
     JNIEnv* env = JSC::Bindings::getJNIEnv();
diff --git a/WebKit/android/jni/WebViewCore.h b/WebKit/android/jni/WebViewCore.h
index 608643e..01033f2 100644
--- a/WebKit/android/jni/WebViewCore.h
+++ b/WebKit/android/jni/WebViewCore.h
@@ -395,14 +395,11 @@ namespace android {
         jclass getPluginClass(const WebCore::String& libName, const char* className);
 
         // Creates a full screen surface for a plugin
-        void showFullScreenPlugin(jobject webkitPlugin, NPP npp, int x, int y, int width, int height);
+        void showFullScreenPlugin(jobject webkitPlugin, NPP npp);
 
         // Instructs the UI thread to discard the plugin's full-screen surface
         void hideFullScreenPlugin();
 
-        // Update coordinates and dimensions for a full screen plugin
-        void updateFullScreenPlugin(int x, int y, int width, int height);
-
         // Adds the plugin's view (aka surface) to the view hierarchy
         jobject addSurface(jobject view, int x, int y, int width, int height);
 
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp
index e1d6bb4..fd46309 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -502,9 +502,7 @@ void PluginWidgetAndroid::requestFullScreen() {
     m_core->destroySurface(m_embeddedView);
 
     // add the full screen view
-    m_core->showFullScreenPlugin(m_embeddedView, m_pluginView->instance(),
-            m_pluginWindow->x, m_pluginWindow->y, m_pluginWindow->width,
-            m_pluginWindow->height);
+    m_core->showFullScreenPlugin(m_embeddedView, m_pluginView->instance());
     m_isFullScreen = true;
 }