external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Handle uncaught exceptions from methods called through the Java Bridge	Steve Block	2012-04-26	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
*	Add missing calls to JavaInstance::end() in JavaNPObjectInvoke() and ↵	Steve Block	2011-08-08	1	-2/+6
\| \| \| \| \| \| \|	JavaNPObjectGetProperty() Bug: 5006441 Change-Id: I2da7a6f626560416cf5cac0cde3193a9074fab0f
*	Merge WebKit at r82507: Fix conflicts due to JNI refactoring	Steve Block	2011-06-08	1	-10/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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
*	Merge WebKit at r82507: Initial merge by git	Steve Block	2011-06-08	1	-5/+40
\| \| \| \|	Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
*	Remove a FIXME from JavaNPObjectV8 that was forking us from upstream	Steve Block	2011-06-08	1	-3/+0
\| \| \| \| \| \| \| \| \|	Filed https://bugs.webkit.org/show_bug.cgi?id=62275 to track this issue upstream. This will reduce future merge conflicts. Change-Id: I22c0826c218bb81f58fb60609849b41b456e6e4c
*	Remove Android guard EMULATE_JSC_BINDINGS	Steve Block	2011-06-02	1	-2/+2
\| \| \| \| \| \| \| \| \|	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
*	Merge WebKit at r80534: Intial merge by Git	Ben Murdoch	2011-06-02	1	-0/+5
\| \| \| \|	Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
*	Merge WebKit at r75315: Initial merge by git.	Steve Block	2011-05-12	1	-0/+176
	Change-Id: I570314b346ce101c935ed22a626b48c2af266b84