| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
Also removes such code from downstream edits to non-Android-specific code.
Bug: 5495373
Change-Id: I478824af2e6ff0eff9a43a9534c2a5ee0e99e9f8
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
When converting from NPVariant to JavaValue, there are cases where we don't do
an explicit conversion, but instead rely on the default value of the JavaValue
for the corresponding type. We need to make sure that the default values are
correctly set.
This bug was introduced in http://trac.webkit.org/changeset/82194.
Change-Id: I681a305e57a706d54e26c1e0d00ccc2d657bedd9
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
|
|
|
| |
This includes a cherry-pick of http://trac.webkit.org/changeset/92689
Bug: 5244518
Change-Id: I38704f2307ab667ee6019fb096265609e27618cc
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This patch fixes JavaInstanceJobject::getField() to use getJNIField()
correctly.
Bug: 5140493
Change-Id: Ib29fe0a010535f3a8dc2b9084c4e4440169971b2
|
|/
|
|
|
|
|
| |
JavaNPObjectGetProperty()
Bug: 5006441
Change-Id: I2da7a6f626560416cf5cac0cde3193a9074fab0f
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
See https://bugs.webkit.org/show_bug.cgi?id=62389
Bug: 4585284
Change-Id: Ib99f9ff5d3b552fb7a40b00324f3e96ffc7e3e23
|
|/
|
|
|
|
|
| |
See http://trac.webkit.org/changeset/91260
Bug: 4727789
Change-Id: I2f01bde12463a3c19659340cdb85b69eaecbd0f7
|
|
|
|
|
|
|
|
|
| |
The JavaInstance class is now an interface, so use the
provided JavaInstanceJobject implementation instead.
See http://trac.webkit.org/changeset/82950
Change-Id: I782e3887e4f059733fbc054ca1d9d97d94e817ef
|
|
|
|
| |
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
|
|
|
|
|
|
| |
JavaTypeString is only available for V8.
Change-Id: I53a1d36b61268496486264cbc6c96fe1e0a5fbd3
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was introduced by the latest merge to WebKit r82507. WebKit now
uses a new JavaTypeString, distinct from JavaTypeObject, for
representing strings in the JNI bridge. We need to account for this
when building the JNI method signature.
See https://bugs.webkit.org/show_bug.cgi?id=62389 for details.
Bug: 4585284
Change-Id: I6a54679b954c32bf03d715da3c958c61baa5fecc
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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
|
|
|
|
| |
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
|
|
|
|
|
|
|
|
|
| |
Filed https://bugs.webkit.org/show_bug.cgi?id=62275 to track this
issue upstream.
This will reduce future merge conflicts.
Change-Id: I22c0826c218bb81f58fb60609849b41b456e6e4c
|
|
|
|
| |
Change-Id: Ia6d9bd8b0a8cd99a569599034b6138e29d89b24d
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
Partial cherry pick of http://trac.webkit.org/changeset/81040
Need to add the JSC guard (it was added unguraded
in http://trac.webkit.org/changeset/79904)
Change-Id: I880e241e2369ee4ffc616286d195989655e18cc2
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Android.jscbindings.mk 79223
Conflict due to http://trac.webkit.org/changeset/79223
Android.mk
Conflicts due to http://trac.webkit.org/changeset/79825 and
http://trac.webkit.org/changeset/79978
Android.v8bindings.mk 80367
Conflicts due to http://trac.webkit.org/changeset/80103 and
http://trac.webkit.org/changeset/80367
HTMLMediaElement.cpp
Conflicts due to http://trac.webkit.org/changeset/80030 and
local TOUCH_EVENTS modifications.
HTMLDocumentParser.cpp
Conflict due to http://trac.webkit.org/changeset/79772 and
local ANDROID_INSTRUMENT modifications.
CachedResourceLoader.cpp|h
Conflicts due to http://trac.webkit.org/changeset/78602 and
ANDROID_BLOCK_NETWORK_IMAGE.
MemoryCache.h
Conflicts due to http://trac.webkit.org/changeset/78848 and
ANDROID_INSTRUMENT.
FrameView.cpp
Conflict due to http://trac.webkit.org/changeset/78928 and
locally added updatePositionedObjects function.
NetworkStateNotifier
JobjectWrapper.cpp
Git seems to have got confused with a rename here in
JobjectWrapper.cpp, keep ours.
Conflicts due to http://trac.webkit.org/changeset/79563 and
local Android additions.
PluginViewNone.cpp 79904
Conflicts due to http://trac.webkit.org/changeset/79904 and
local cherry pick of http://trac.webkit.org/changeset/79988
RenderBox.cpp
Conflicts due to http://trac.webkit.org/changeset/79467 and
local android modifications.
Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931
|
|
|
|
| |
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
|
|
|
|
|
|
|
|
| |
Cherry pick of upstream http://trac.webkit.org/changeset/79988
Needed now due to FastAllocBase and Noncopyable changes in this
merge.
Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
|
|
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
|