| f2d8c5bed31609d7d6e3ae77f33e90ea7f888eb3 |
|
05-Sep-2012 |
Selim Gurun <sgurun@google.com> |
Control access to inherited methods of jsinterface objects
Bug: 7073422
Use a flag and annotation for allowing access to inherited methods of
jsinterface objects. When flag is false, no annotation is needed. When
flag is true, annotation is needed for allowing access to inherited methods.
Change-Id: I610119dc5410d8df1962fa9dbea09866f81d374c
/external/webkit/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
|
| 96309385b22eca3b1ff3eb9d30bea0958ce47875 |
|
16-Nov-2011 |
Steve Block <steveblock@google.com> |
Fix JavaBridge to handle overflow of array length
When converting to a Java array type, if the length property of a Java Object
is outside the bounds for a Java array, convert to null.
Also convert to null if the length property is not a number.
Bug: 5626284
Change-Id: Ic4029d58cebe2cab9a37d52af09456c3cab6e5cd
/external/webkit/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
|
| 741b1c63ee296db8d359fc9f8a44eddfc8b94027 |
|
15-Nov-2011 |
Steve Block <steveblock@google.com> |
Fix Java Bridge when coercing JavaScript string to Java char in arrays
Currently, when converting coercing a JavaScript string to a method parameter
of type Java char, we always use a value of 0.
However, when coercing a JavaScript object to method parameter of type Java
char array, we behave differently. In this case, if the element is a JavaScript
string, we use the first character of the string for the char value.
This change modifies the behaviour in the array case to match that in the
non-array case.
Bug: 5619677
Change-Id: Ifeee8940af0bb01df58eeff6c9dd7e1b40688790
/external/webkit/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
|
| e3edcfcfc731bd5051947d8c0a4b2685e7cae84d |
|
02-Sep-2011 |
Steve Block <steveblock@google.com> |
Merge "Fix the Java bridge to correctly handle null strings"
|
| 70a54261052a5a78a33b5b91d4f3ab699b55e2ef |
|
01-Sep-2011 |
Steve Block <steveblock@google.com> |
Fix the Java bridge to correctly handle null strings
Passing null to methods expecting java/lang/String ...
- Previously null was converted to the empty string but should be
converted to Java null.
- convertNPVariantToJavaValue() already converts a null NPVariant to a
null WTF::String.
- Fixed javaValueToJvalue() to convert a null WTF::String to a null
jvalue.
Returning null from a method with return type java/lang/String ...
- Previously this would crash when trying to get the characters from
the null jstring, but should return JavaScript undefined.
- Fixed jvalueToJavaValue() to convert a null jvalue to a null
WTF::String.
- Fixed convertJavaValueToNPVariant() to convert a null WTF::String to
a void NPVariant.
Both of these are regressions from HC due to
http://trac.webkit.org/changeset/82194.
Added tests in https://android-git.corp.google.com/g/#/c/132580
Bug: 5222742
Change-Id: Id08bc7b40a51426fa7638ad0ed5260d09f3e28bb
/external/webkit/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
|
| 698a253f5568db010beb93b2255697997d180406 |
|
06-Jul-2011 |
Steve Block <steveblock@google.com> |
Fix some leaked JNI local references in the Java Bridge
This includes a cherry-pick of http://trac.webkit.org/changeset/92689
Bug: 5244518
Change-Id: I38704f2307ab667ee6019fb096265609e27618cc
/external/webkit/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
|
| 4f25266c21bdd7dcd9996807fae04f7dfb0373de |
|
19-Jul-2011 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change 91260 to fix JNI string null-termination
See http://trac.webkit.org/changeset/91260
Bug: 4727789
Change-Id: I2f01bde12463a3c19659340cdb85b69eaecbd0f7
/external/webkit/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
|
| 7d914f10c042bcd243dce3f7b5c26cc470c0f38f |
|
07-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Fix uses of JavaInstance.
The JavaInstance class is now an interface, so use the
provided JavaInstanceJobject implementation instead.
See http://trac.webkit.org/changeset/82950
Change-Id: I782e3887e4f059733fbc054ca1d9d97d94e817ef
/external/webkit/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
|
| 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 |
|
02-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
/external/webkit/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.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/JNIUtilityPrivate.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/JNIUtilityPrivate.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/JNIUtilityPrivate.cpp
|
| 3ddac44fe7d289e2d30214ccda5120c9f789be0a |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Fix Java Bridge.
Fix conflicts and reflect the upstream changes made in
http://trac.webkit.org/changeset/80467.
Note that our JNIUtilityPrivate.cpp is significantly forked from
upstream.
Change-Id: I390f1089d861fa29b6c15118638d029dea4356d8
/external/webkit/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.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/JNIUtilityPrivate.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/JNIUtilityPrivate.cpp
|