2 files changed, 59 insertions, 90 deletions

diff --git a/WebCore/plugins/android/PluginPackageAndroid.cpp b/WebCore/plugins/android/PluginPackageAndroid.cpp
index 664f31c..d55da87 100644
--- a/WebCore/plugins/android/PluginPackageAndroid.cpp
+++ b/WebCore/plugins/android/PluginPackageAndroid.cpp
@@ -25,24 +25,23 @@
  */
 
 #include "config.h"
-#include "PluginDatabase.h"
 #include "PluginPackage.h"
 
 #ifdef ANDROID_PLUGINS
 
-#include "Timer.h"
+#include "CString.h"
+#include "JNIUtility.h"
 #include "PlatformString.h"
+#include "PluginDatabase.h"
+#include "PluginDebug.h"
+#include "PluginDebugAndroid.h"
 #include "PluginMainThreadScheduler.h"
-#include "CString.h"
-#include "jni_utility.h"
-#include "npruntime_impl.h"
+#include "Timer.h"
 #include "npfunctions.h"
+#include "npruntime_impl.h"
 #include <dlfcn.h>
 #include <errno.h>
 
-#include "PluginDebug.h"
-#include "PluginDebugAndroid.h"
-
 #define LOG_TAG "WebKit"
 
 namespace WebCore {
@@ -188,45 +187,6 @@ static void initializeExtraBrowserFuncs(NPNetscapeFuncs *funcs)
     funcs->enumerate = _NPN_Enumerate;
 }
 
-static jobject createPluginObject(const char *name,
-                                  const char *path,
-                                  const char *fileName,
-                                  const char *description)
-{
-    JNIEnv *env = JSC::Bindings::getJNIEnv();
-    // Create a Java "class Plugin" object instance
-    jclass pluginClass = env->FindClass("android/webkit/Plugin");
-    if(!pluginClass) {
-        PLUGIN_LOG("Couldn't find class android.webkit.Plugin\n");
-        return 0;
-    }
-    // Get Plugin(String, String, String, String, Context)
-    jmethodID pluginConstructor = env->GetMethodID(
-            pluginClass,
-            "<init>",
-            "(Ljava/lang/String;"
-            "Ljava/lang/String;"
-            "Ljava/lang/String;"
-            "Ljava/lang/String;)V");
-    if(!pluginConstructor) {
-        PLUGIN_LOG("Couldn't get android.webkit.Plugin constructor\n");
-        return 0;
-    }
-    // Make Java strings of name, path, fileName, description
-    jstring javaName = env->NewStringUTF(name);
-    jstring javaPath = env->NewStringUTF(path);
-    jstring javaFileName = env->NewStringUTF(fileName);
-    jstring javaDescription = env->NewStringUTF(description);
-    // Make a plugin instance
-    jobject pluginObject = env->NewObject(pluginClass,
-                                          pluginConstructor,
-                                          javaName,
-                                          javaPath,
-                                          javaFileName,
-                                          javaDescription);
-    return pluginObject;
-}
-
 bool PluginPackage::load()
 {
     PLUGIN_LOG("tid:%d isActive:%d isLoaded:%d loadCount:%d\n",
@@ -284,8 +244,7 @@ bool PluginPackage::load()
     m_pluginFuncs.size = sizeof(m_pluginFuncs);
     if(NP_Initialize(&m_browserFuncs,
                      &m_pluginFuncs,
-                     JSC::Bindings::getJNIEnv(),
-                     m_pluginObject) != NPERR_NO_ERROR) {
+                     JSC::Bindings::getJNIEnv()) != NPERR_NO_ERROR) {
         PLUGIN_LOG("Couldn't initialize plugin\n");
         return false;
     }
@@ -393,22 +352,6 @@ bool PluginPackage::fetchInfo()
             m_mimeToDescriptions.set(mimeType, description);
     }
 
-    // Create a new Java Plugin object, this object is an instance of
-    // android.os.WebView.Plugin
-    CString path = m_path.utf8();
-    CString filename = m_fileName.utf8();
-    jobject pluginObject = createPluginObject(name,
-                                              path.data(),
-                                              filename.data(),
-                                              description);
-    if(!pluginObject) {
-        PLUGIN_LOG("Couldn't create Java Plugin\n");
-        return false;
-    }
-
-    // Retain the Java Plugin object
-    m_pluginObject = JSC::Bindings::getJNIEnv()->NewGlobalRef(pluginObject);
-
     PLUGIN_LOG("Fetch Info Loaded plugin details ok \"%s\"\n",
             m_path.utf8().data());
 
diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp
index e10641d..72fdf3f 100644
--- a/WebCore/plugins/android/PluginViewAndroid.cpp
+++ b/WebCore/plugins/android/PluginViewAndroid.cpp
@@ -52,7 +52,9 @@
 #include "PlatformKeyboardEvent.h"
 #include "PluginMainThreadScheduler.h"
 #include "PluginPackage.h"
+#include "Touch.h"
 #include "TouchEvent.h"
+#include "TouchList.h"
 #include "android_graphics.h"
 #include "SkCanvas.h"
 #include "npruntime_impl.h"
@@ -206,11 +208,16 @@ void PluginView::handleTouchEvent(TouchEvent* event)
 
     evt.data.touch.modifiers = 0;   // todo
 
-    // convert to coordinates that are relative to the plugin. The pageX / pageY
-    // values are the only values in the event that are consistently in frame
-    // coordinates despite their misleading name.
-    evt.data.touch.x = event->pageX() - m_npWindow.x;
-    evt.data.touch.y = event->pageY() - m_npWindow.y;
+    // In the event of a touchend (up) event, we must ask the changedTouch for the
+    // co-ordinates as there is no touch in touches anymore.
+    TouchList* touches = (evt.data.touch.action == kUp_ANPTouchAction) ?
+                              event->changedTouches() : event->touches();
+
+    // Convert to coordinates that are relative to the plugin.
+    // We only support single touch points at the moment, so we want to look at index 0 only.
+    IntPoint localPos = roundedIntPoint(m_element->renderer()->absoluteToLocal(IntPoint(touches->item(0)->pageX(), touches->item(0)->pageY())));
+    evt.data.touch.x = localPos.x();
+    evt.data.touch.y = localPos.y();
 
     int16 ret = m_plugin->pluginFuncs()->event(m_instance, &evt);
     if (ignoreRet)
@@ -243,11 +250,11 @@ void PluginView::handleMouseEvent(MouseEvent* event)
         SkANP::InitEvent(&evt, kMouse_ANPEventType);
         evt.data.mouse.action = isUp ? kUp_ANPMouseAction : kDown_ANPMouseAction;
 
-        // convert to coordinates that are relative to the plugin. The pageX / pageY
-        // values are the only values in the event that are consistently in frame
-        // coordinates despite their misleading name.
-        evt.data.mouse.x = event->pageX() - m_npWindow.x;
-        evt.data.mouse.y = event->pageY() - m_npWindow.y;
+        // Convert to coordinates that are relative to the plugin.
+        IntPoint localPos = roundedIntPoint(m_element->renderer()->absoluteToLocal(event->absoluteLocation()));
+        evt.data.mouse.x = localPos.x();
+        evt.data.mouse.y = localPos.y();
+
         if (isDown) {
             // The plugin needs focus to receive keyboard events
             if (Page* page = m_parentFrame->page())
@@ -394,21 +401,34 @@ void PluginView::setParent(ScrollView* parent)
     }
 }
 
-void PluginView::setNPWindowRect(const IntRect& rect)
+void PluginView::setNPWindowRect(const IntRect&)
 {
-    if (!m_isStarted)
-        return;
+    setNPWindowIfNeeded();
+}
 
-    // the rect is relative to the frameview's (0,0)
-    m_npWindow.x = rect.x();
-    m_npWindow.y = rect.y();
-    m_npWindow.width = rect.width();
-    m_npWindow.height = rect.height();
+void PluginView::setNPWindowIfNeeded()
+{
+    if (!m_isStarted || !parent())
+        return;
 
-    m_npWindow.clipRect.left = 0;
-    m_npWindow.clipRect.top = 0;
-    m_npWindow.clipRect.right = rect.width();
-    m_npWindow.clipRect.bottom = rect.height();
+    // in Android, plugin always get the setwindow() in the page coordinate.
+    IntRect pageRect = m_windowRect;
+    ScrollView* top = parent();
+    while (top->parent())
+        top = top->parent();
+    // only the top ScrollView can have the offset
+    pageRect.move(top->scrollOffset());
+
+    // the m_npWindow is relative to the page
+    m_npWindow.x = pageRect.x();
+    m_npWindow.y = pageRect.y();
+    m_npWindow.width = pageRect.width();
+    m_npWindow.height = pageRect.height();
+
+    m_npWindow.clipRect.left = pageRect.x();
+    m_npWindow.clipRect.top = pageRect.y();
+    m_npWindow.clipRect.right = pageRect.x() + pageRect.width();
+    m_npWindow.clipRect.bottom = pageRect.y() + pageRect.height();
 
     if (m_plugin->pluginFuncs()->setwindow) {
 #if USE(JSC)
@@ -587,16 +607,22 @@ void PluginView::paint(GraphicsContext* context, const IntRect& rect)
     }
 
     m_window->inval(rect, false);
+    context->save();
+    context->translate(frame.x(), frame.y());
     m_window->draw(android_gc2canvas(context));
+    context->restore();
 }
 
-// new as of SVN 38068, Nov 5 2008
 void PluginView::updatePluginWidget()
 {
-    // I bet/hope we can move all of setNPWindowRect() into here
     FrameView* frameView = static_cast<FrameView*>(parent());
     if (frameView) {
-        m_windowRect = IntRect(frameView->contentsToWindow(frameRect().location()), frameRect().size());
+        IntRect oldWindowRect = m_windowRect;
+
+        m_windowRect = frameView->contentsToWindow(frameRect());
+
+        if (m_windowRect != oldWindowRect)
+            setNPWindowIfNeeded();
     }
 }