| cb3fc20cd59c3956ace2b6b9966da170b92b9162 |
|
25-Apr-2012 |
Steve Block <steveblock@google.com> |
Handle uncaught exceptions from methods called through the Java Bridge
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: Ida96e9be7dba714cc8332682615c896120c50ab1
/external/webkit/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
|
| 1b90d74d66fbb55d40e5e87a84423acd81ab062a |
|
08-Aug-2011 |
Steve Block <steveblock@google.com> |
Add missing calls to JavaInstance::end() in JavaNPObjectInvoke() and JavaNPObjectGetProperty()
Bug: 5006441
Change-Id: I2da7a6f626560416cf5cac0cde3193a9074fab0f
/external/webkit/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
|
| 9c8e65377a8462e90abc85e3d888365f7fecf9e3 |
|
07-Jun-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Fix conflicts due to JNI refactoring
- JavaNPObjectV8.cpp
Due to new JavaInstance::getField()
http://trac.webkit.org/changeset/80653
- JNIUtilityPrivate.cpp
- Android has a number of local modifications to convert numeric
NPVariant values to a JNI jstring, using toString() via JNI.
However, after the upstream refactoring, we no longer convert
NPVariant directly to jvalue. Instead, we go via a new JavaValue
type, which represents strings as JavaTypeString using
WTF::String.
This patch updates the Android modifications to set the JavaValue
using WTF::String methods, without using JNI. Note that the spec
for these conversions - http://jdk6.java.net/plugin2/liveconnect -
does not require the use of toString(), so this is OK.
- Android also adds handling for converting arrays from NPVariant to
jvalue. However, the intermediate JavaValue type does not yet have
support for arrays. We get around this with an ugly hack, where we
continue to create a jarray and set this as the object field of
the JavaValue. When converting from a JavaValue to a jvalue, we
add handling for arrays.
http://trac.webkit.org/changeset/82194
/external/webkit/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
|
| 2bde8e466a4451c7319e3a072d118917957d6554 |
|
25-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
/external/webkit/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
|
| 6939c99b71d9372d14a0c74a772108052e8c48c8 |
|
08-Jun-2011 |
Steve Block <steveblock@google.com> |
Remove a FIXME from JavaNPObjectV8 that was forking us from upstream
Filed https://bugs.webkit.org/show_bug.cgi?id=62275 to track this
issue upstream.
This will reduce future merge conflicts.
Change-Id: I22c0826c218bb81f58fb60609849b41b456e6e4c
/external/webkit/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
|
| 2d44f555f1b58dea94258c21592a95e78fe5bc21 |
|
02-Jun-2011 |
Steve Block <steveblock@google.com> |
Remove Android guard EMULATE_JSC_BINDINGS
This flag is always set to true and will not be upstreamed, so should
be removed, along with code for the 'else' case.
Also clean up Android modifications to minimise diff and add guards.
Change-Id: I7d3b7bab2fef772bffdf3a402cc318dbea5f5865
/external/webkit/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
|
| 81bc750723a18f21cd17d1b173cd2a4dda9cea6e |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
/external/webkit/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
|
| cad810f21b803229eb11403f9209855525a25d57 |
|
06-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
/external/webkit/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
|