Handle uncaught exceptions from methods called through the Java Bridge

This is a cherry-pick from master. See
https://android-git.corp.google.com/g/184252

If a method called on a Java object through the Java Bridge throws an uncaught
exception, handle it native-side by clearing the exception to prevent a crash,
and throwing a JavaScript exception.

See tests in https://android-git.corp.google.com/g/184260

Bug: 6386557
Change-Id: I2d123672892887340798d2c0494941fc269ce99c

1 files changed, 7 insertions, 1 deletions

diff --git a/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp b/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
index b22d57f..784ea01 100644
--- a/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
+++ b/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
@@ -146,10 +146,16 @@ bool JavaNPObjectInvoke(NPObject* obj, NPIdentifier identifier, const NPVariant*
     for (unsigned int i = 0; i < argCount; i++)
         jArgs[i] = convertNPVariantToJavaValue(args[i], jMethod->parameterAt(i));
 
-    JavaValue jResult = instance->invokeMethod(jMethod, jArgs);
+// ANDROID
+    bool exceptionOccurred;
+    JavaValue jResult = instance->invokeMethod(jMethod, jArgs, exceptionOccurred);
     instance->end();
     delete[] jArgs;
 
+    if (exceptionOccurred)
+        return false;
+// END ANDROID
+
     VOID_TO_NPVARIANT(*result);
     convertJavaValueToNPVariant(jResult, result);
     return true;