Merge changes I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72f818d5,I2e3b588b,I9a4e6289,Ia724c78b,Icd8612c8,Ie31b15d7,Ie125edae,I77941a88,I89dae78b,I3516e5ca,I1a4c17b5,I2c4ecc1a,I9c8e6537,Ifac13115,Ie1f80e09,Ia541ed77,I60ce9d78

* changes:
  Merge WebKit at r82507: Update ThirdPartyProject.prop
  Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
  Merge WebKit at r82507: Work around a V8 bug
  Merge WebKit at r82507: JNIType renamed to JavaType
  Merge WebKit at r82507: IconDatabaseClient interface expanded
  Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
  Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
  Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
  Merge WebKit at r82507: Node::isContentEditable() renamed
  Merge WebKit at r82507: Use icon database through IconDatabaseBase
  Merge WebKit at r82507: toInputElement() is now a member of Node
  Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed
  Merge WebKit at r82507: StringImpl::computeHash() removed
  Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
  Merge WebKit at r82507: Path::strokeBoundingRect() is now const
  Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp
  Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
  Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
  Merge WebKit at r82507: Fix conflicts due to JNI refactoring
  Merge WebKit at r82507: Fix conflicts due to new StorageTracker
  Merge WebKit at r82507: Fix conflicts
  Merge WebKit at r82507: Fix makefiles
  Merge WebKit at r82507: Initial merge by git

1 files changed, 38 insertions, 11 deletions

diff --git a/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp b/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
index 7a7adc5..b86a090 100644
--- a/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
+++ b/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
@@ -33,6 +33,8 @@
 #include "JavaClassV8.h"
 #include "JavaFieldV8.h"
 #include "JavaInstanceV8.h"
+#include "JavaMethod.h"
+#include "JavaValueV8.h"
 #include "npruntime_impl.h"
 
 namespace JSC {
@@ -115,12 +117,40 @@ bool JavaNPObjectInvoke(NPObject* obj, NPIdentifier identifier, const NPVariant*
         return false;
 
     instance->begin();
-    bool r = instance->invokeMethod(name, args, argCount, result);
-    instance->end();
 
+    MethodList methodList = instance->getClass()->methodsNamed(name);
     // TODO: use NPN_MemFree
     free(name);
-    return r;
+
+    // Try to find a good match for the overloaded method. The
+    // fundamental problem is that JavaScript doesn't have the
+    // notion of method overloading and Java does. We could
+    // get a bit more sophisticated and attempt to do some
+    // type checking as well as checking the number of parameters.
+    size_t numMethods = methodList.size();
+    JavaMethod* aMethod;
+    JavaMethod* jMethod = 0;
+    for (size_t methodIndex = 0; methodIndex < numMethods; methodIndex++) {
+        aMethod = methodList[methodIndex];
+        if (aMethod->numParameters() == static_cast<int>(argCount)) {
+            jMethod = aMethod;
+            break;
+        }
+    }
+    if (!jMethod)
+        return false;
+
+    JavaValue* jArgs = new JavaValue[argCount];
+    for (unsigned int i = 0; i < argCount; i++)
+        jArgs[i] = convertNPVariantToJavaValue(args[i], jMethod->parameterAt(i));
+
+    JavaValue jResult = instance->invokeMethod(jMethod, jArgs);
+    instance->end();
+    delete[] jArgs;
+
+    VOID_TO_NPVARIANT(*result);
+    convertJavaValueToNPVariant(jResult, result);
+    return true;
 }
 
 bool JavaNPObjectHasProperty(NPObject* obj, NPIdentifier identifier)
@@ -150,23 +180,20 @@ bool JavaNPObjectGetProperty(NPObject* obj, NPIdentifier identifier, NPVariant*
 
     instance->begin();
     JavaField* field = instance->getClass()->fieldNamed(name);
-    instance->end();
     free(name); // TODO: use NPN_MemFree
-
     if (!field)
         return false;
 
 #if PLATFORM(ANDROID)
     // JSC does not seem to support returning object properties so we emulate that
     // behaviour here.
-    jvalue value;
+    JavaValue value;
 #else
-    jvalue value = getJNIField(instance->javaInstance(),
-                               field->getJNIType(),
-                               field->name().utf8(),
-                               field->type());
+    JavaValue value = instance->getField(field);
 #endif // PLATFORM(ANDROID)
-    convertJValueToNPVariant(value, field->getJNIType(), field->type(), result);
+    instance->end();
+
+    convertJavaValueToNPVariant(value, result);
 
     return true;
 }