external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge "Prepare ScriptController class for upstreaming."	Andrei Popescu	2010-01-25	5	-23/+18
\|\
\| *	Prepare ScriptController class for upstreaming.	Andrei Popescu	2010-01-22	5	-23/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move the code to obtain the NPObject ptr associated with a PluginView to the PlatformBridge. This change will be submitted as soon as the patch in https://bugs.webkit.org/show_bug.cgi?id=33673 lands upstream.
* \|	Merge "Remove Android-specific TODOs as the changes have been upstreamed in"	Andrei Popescu	2010-01-25	2	-12/+0
\|\ \
\| * \|	Remove Android-specific TODOs as the changes have been upstreamed in	Andrei Popescu	2010-01-22	2	-12/+0
\| \| \| \| \| \| \| \| \| \| \| \|	https://bugs.webkit.org/show_bug.cgi?id=33944
* \| \|	Call nextTextfield on the CachedFrame that contains the cursor/focus.	Leon Scroggins	2010-01-22	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes http://b/issue?id=2359748
* \| \|	am de7e9124: am ec4b5ee4: As we are sharing the view between embedded and ↵	Grace Kloba	2010-01-21	1	-11/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	full screen, we should make sure to call the correct update when bounds changed. Merge commit 'de7e9124bea659d873d5488809d92a334104cb53' * commit 'de7e9124bea659d873d5488809d92a334104cb53': As we are sharing the view between embedded and full
\| * \ \	am ec4b5ee4: As we are sharing the view between embedded and full screen, we ↵	Grace Kloba	2010-01-21	1	-11/+10
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	should make sure to call the correct update when bounds changed. Merge commit 'ec4b5ee43c88d914221e8c9f668421ace6bdd72d' into eclair-mr2-plus-aosp * commit 'ec4b5ee43c88d914221e8c9f668421ace6bdd72d': As we are sharing the view between embedded and full
\| \| * \| \|	As we are sharing the view between embedded and full	Grace Kloba	2010-01-21	1	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	screen, we should make sure to call the correct update when bounds changed. This should fix the crash when changing orientation.
* \| \| \| \|	am 6d849f2b: (-s ours) am b99dd716: DO NOT MERGE	Grace Kloba	2010-01-21	0	-0/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '6d849f2b09b0aa503957a037f2e8a276bd6f8041' * commit '6d849f2b09b0aa503957a037f2e8a276bd6f8041': DO NOT MERGE
\| * \ \ \ \	am b99dd716: DO NOT MERGE	Grace Kloba	2010-01-18	1	-0/+8
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'b99dd716b4af0afde074e28b50b7b28ae3c03da7' into eclair-plus-aosp * commit 'b99dd716b4af0afde074e28b50b7b28ae3c03da7': DO NOT MERGE
\| \| * \| \| \| \|	DO NOT MERGE	Grace Kloba	2010-01-18	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the hit result node has zero width, we can't use it. Try its parents. This happens in the story inside nytimes.com. They use a special <nyt_text> tag. If it is the hit point, it has 0 width and height. Fix http://b/issue?id=2363260
* \| \| \| \| \| \|	Merge commit 'db0b7b50' into merge	Grace Kloba	2010-01-21	0	-0/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am e32bb876: Revert https://android-git.corp.google.com/g/37444 as ↵	Grace Kloba	2010-01-14	1	-5/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://android-git.corp.google.com/g/37486 is a better fix for http://b/issue?id=2375232 Merge commit 'e32bb87640c16f2414a3f35cefd3c4146a174091' into eclair-plus-aosp * commit 'e32bb87640c16f2414a3f35cefd3c4146a174091': Revert https://android-git.corp.google.com/g/37444
\| \| * \| \| \| \|	Revert https://android-git.corp.google.com/g/37444	Grace Kloba	2010-01-14	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as https://android-git.corp.google.com/g/37486 is a better fix for http://b/issue?id=2375232
* \| \| \| \| \| \|	Merge commit '91d051d3' into tmp	Grace Kloba	2010-01-21	0	-0/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 9f20cbf5: For mobile site, allow text wrap to screen if scale is not same ↵	Grace Kloba	2010-01-14	1	-2/+5
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as screen width scale. Merge commit '9f20cbf56188e83d4a3a631aba9607697ebac6c0' into eclair-plus-aosp * commit '9f20cbf56188e83d4a3a631aba9607697ebac6c0': For mobile site, allow text wrap to screen if scale
\| \| * \| \| \| \|	For mobile site, allow text wrap to screen if scale	Grace Kloba	2010-01-14	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is not same as screen width scale. Fix http://b/issue?id=2375232
* \| \| \| \| \| \|	Removing reference to a java object that is no longer used.	Derek Sollenberger	2010-01-21	3	-66/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The native plugin code was creating a java object that was intended to by used by the old Gears code. The java object has been deprecated and is not being used within the native code.
* \| \| \| \| \| \|	Merge changes I1b4ba984,I6cadc4f4,Icf99c709,Id22d59b7,I63f3c4ed	Steve Block	2010-01-21	20	-440/+550
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* changes: Fixes style in V8 jni_runtime.[cpp\|h] Updates V8 version of JavaString to use a private implementation class. Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix style Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix style Cherry-pick WebKit change 53620 to move bridge interfaces Field, Class, Instance and Array from Bridge to BridgeJSC
\| * \| \| \| \| \| \|	Fixes style in V8 jni_runtime.[cpp\|h]	Steve Block	2010-01-21	2	-142/+130
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change makes it far easier to compare these files with WebCore/bridge/jni/Bridge.[cpp\|h], with which these files will eventually be merged. Change-Id: I1b4ba9843f61c909568f85c65a0872a36d727fb3
\| * \| \| \| \| \| \|	Updates V8 version of JavaString to use a private implementation class.	Steve Block	2010-01-21	4	-32/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WebKit change http://trac.webkit.org/changeset/53449 moved the JSC-specific implementation of JavaString to JavaStringJSC.h. This is the V8 equivalent of that change. This is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33953 Change-Id: I6cadc4f4f941aab900aeaf3251a5cad77d050b9b
\| * \| \| \| \| \| \|	Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix style	Steve Block	2010-01-21	6	-45/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Icf99c709929ef14551de61e55780b97767575f01
\| * \| \| \| \| \| \|	Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix style	Steve Block	2010-01-21	7	-110/+100
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the V8 equivalent of http://trac.webkit.org/changeset/53412 It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33951 Change-Id: Id22d59b7a5e0be72d594d454bb41c58760d824ff
\| * \| \| \| \| \| \|	Cherry-pick WebKit change 53620 to move bridge interfaces Field, Class, ↵	Steve Block	2010-01-21	8	-113/+185
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instance and Array from Bridge to BridgeJSC See http://trac.webkit.org/changeset/53620 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that changes to WebCore.xcodeproj were not pulled, as they introduced merge conflicts. Change-Id: I63f3c4ed101badaea3207d53784de04aee49c2ab
* \| \| \| \| \| \| \|	Merge "Refactor style of Android specific touch events code in preparation ↵	Ben Murdoch	2010-01-21	5	-6/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for upstreaming to webkit.org."
\| * \| \| \| \| \| \| \|	Refactor style of Android specific touch events code in preparation for ↵	Ben Murdoch	2010-01-21	5	-6/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	upstreaming to webkit.org. Change-Id: Id34e727145fe94e98e62a36b7fc8256468b4157c
* \| \| \| \| \| \| \| \|	Merge "Cherry-pick WebKit change 53619 to fix style in JNIBridge"	Steve Block	2010-01-21	3	-292/+321
\|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Cherry-pick WebKit change 53619 to fix style in JNIBridge	Steve Block	2010-01-21	3	-292/+321
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See http://trac.webkit.org/changeset/53619 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: Ic34c760d412b022935a8770cc4b842619c008f15
* \| \| \| \| \| \| \| \|	Merge "Cherry-pick WebKit change 53557 to rename jni_runtime to JNIBridge"	Steve Block	2010-01-21	11	-19/+40
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| / / / / / / / \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Cherry-pick WebKit change 53557 to rename jni_runtime to JNIBridge	Steve Block	2010-01-21	11	-19/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See http://trac.webkit.org/changeset/53557 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: I9a74b4dbdb0a9580372d69cec9e8f9fcab750e49
* \| \| \| \| \| \| \|	am bfcc13fc: (-s ours) am 0a3f01ac: Merge "DO NOT MERGE" into eclair-mr2	Grace Kloba	2010-01-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'bfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9' * commit 'bfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9': DO NOT MERGE
\| * \| \| \| \| \| \|	am 0a3f01ac: Merge "DO NOT MERGE" into eclair-mr2	Grace Kloba	2010-01-20	1	-1/+2
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '0a3f01ac5e5855c3563694671091d4c1ce89cac5' into eclair-mr2-plus-aosp * commit '0a3f01ac5e5855c3563694671091d4c1ce89cac5': DO NOT MERGE
\| \| * \| \| \| \| \|	Merge "DO NOT MERGE" into eclair-mr2	Grace Kloba	2010-01-20	1	-1/+2
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	DO NOT MERGE	Grace Kloba	2010-01-20	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apparently ownerElement is not a good way to check when it is the top document in detach(). This should fix the touch problem in the plugin in www.excite.com. This doesn't need to be merged as touch as been updated to match the webkit.
* \| \| \| \| \| \| \| \|	am 67c90537: am 72acb46d: Fix the crash of exiting full screen by checking null.	Grace Kloba	2010-01-20	2	-2/+4
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '67c90537fc70147ad8943f0a2cd02def405bcf8f' * commit '67c90537fc70147ad8943f0a2cd02def405bcf8f': Fix the crash of exiting full screen by checking null.
\| * \| \| \| \| \| \| \|	am 72acb46d: Fix the crash of exiting full screen by checking null.	Grace Kloba	2010-01-20	2	-2/+4
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '72acb46d81f6f3c7015109c925762dcc7fa12802' into eclair-mr2-plus-aosp * commit '72acb46d81f6f3c7015109c925762dcc7fa12802': Fix the crash of exiting full screen by checking null.
\| \| * \| \| \| \| \| \|	Fix the crash of exiting full screen by checking null.	Grace Kloba	2010-01-20	2	-2/+4
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we exit full screen, we place the embedded view on the screen, so we need to destroy it again in the destructor
* \| \| \| \| \| \| \|	resolved conflicts for merge of 9dabd572 to master	Grace Kloba	2010-01-20	6	-99/+65
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| / / / / / \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	am 1f15f3a9: Changing plugin setwindow() to use page coordinate instead of ↵	Grace Kloba	2010-01-20	6	-109/+75
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	frame as it is what Flash expects. For other port like Mac, it passes the window coordinate to the plugin. In Android, plugin always sees the full page and we use the visible screen rect to ind Merge commit '1f15f3a9f6dc2a169bbd160e2e1abb161f9927d9' into eclair-mr2-plus-aosp * commit '1f15f3a9f6dc2a169bbd160e2e1abb161f9927d9': Changing plugin setwindow() to use page coordinate
\| \| * \| \| \| \|	Changing plugin setwindow() to use page coordinate	Grace Kloba	2010-01-20	6	-109/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	instead of frame as it is what Flash expects. For other port like Mac, it passes the window coordinate to the plugin. In Android, plugin always sees the full page and we use the visible screen rect to indicate whether it is visible. Change to use page coordinate across PluginView and PluginWidget for consistency. This should fix the problem Ben saw with plugin inside iframe (which is caused by a race condition) and the cnnn ad problem Adobe has.
* \| \| \| \| \| \|	Rename V8 jni_utility_private to JNIUtilityPrivate and fixes style	Steve Block	2010-01-20	4	-34/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the V8 equivalent of http://trac.webkit.org/changeset/51756 It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33901 Change-Id: I336687e546748a7823f5e2d18f1ac1112a30a60c
* \| \| \| \| \| \|	Fixes a bug in V8 version of jni_utility_private.cpp	Steve Block	2010-01-20	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When CONVERT_NULL_TO_EMPTY_STRING is defined, an 'else' is missing an opening brace. This causes compiler errors. This bug has been present since the code was first committed. See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=7fa30a60f66c19c8e6fb91ef799bca4d8d6f57f2#patch9 Change-Id: I7e95217d166733e6cab1f2e74725e368df4c6f4b
* \| \| \| \| \| \|	Move V8 jni_class to bridge/jni/v8/JavaClassV8 and fix style	Steve Block	2010-01-20	6	-52/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the V8 equivalent of http://trac.webkit.org/changeset/53443 It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33898 Change-Id: I27dcf73cc7d8c0303243ea632361f2210819cbc4
* \| \| \| \| \| \|	Cherry-pick WebKit change 53533 to fix style in WebCore/bridge/JNIUtility	Steve Block	2010-01-20	3	-196/+195
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See http://trac.webkit.org/changeset/53533 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: I07f44aef5e30c862aa7d6a84dcf9bc4d36059a6c
* \| \| \| \| \| \|	Cherry-pick WebKit change 53497 to rename jni_utility and ↵	Steve Block	2010-01-20	45	-138/+159
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jni_utility_private to JNIUtility and JNIUtilityPrivate See http://trac.webkit.org/changeset/53497 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. This change required updating headers in Android-specific files in WebCore and WebKit. Change-Id: I4b80eb3eadcff66cbd261aa6ccef0f37927250b1
* \| \| \| \| \| \|	am d9b562d6: am 032a9065: Merge "Cherry-pick WebKit change 53541 to fix ↵	Steve Block	2010-01-20	8	-42/+73
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	style in WebCore/bridge/Bridge" into eclair-mr2 Merge commit 'd9b562d65e56e563079a5a7778a41c98aa6cf1b5' * commit 'd9b562d65e56e563079a5a7778a41c98aa6cf1b5': Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge
\| * \| \| \| \| \|	am 032a9065: Merge "Cherry-pick WebKit change 53541 to fix style in ↵	Steve Block	2010-01-20	8	-42/+73
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WebCore/bridge/Bridge" into eclair-mr2 Merge commit '032a9065415ac4791c8d73bceba10cfa9fc77bf7' into eclair-mr2-plus-aosp * commit '032a9065415ac4791c8d73bceba10cfa9fc77bf7': Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge
\| \| * \| \| \| \|	Merge "Cherry-pick WebKit change 53541 to fix style in ↵	Steve Block	2010-01-20	8	-42/+73
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WebCore/bridge/Bridge" into eclair-mr2
\| \| \| * \| \| \| \|	Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge	Steve Block	2010-01-20	8	-42/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See http://trac.webkit.org/changeset/53541 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: Ifa112a8700149b21a1a1bbdf8366844adb3a9ae6
* \| \| \| \| \| \| \|	am 0cfc2e19: am 315ee382: Merge "Cherry-pick WebKit change 53489 to fix ↵	Steve Block	2010-01-20	3	-47/+60
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	style in JavaClassJSC." into eclair-mr2 Merge commit '0cfc2e19eeb90d6897b190b056e192bc1afd5c44' * commit '0cfc2e19eeb90d6897b190b056e192bc1afd5c44': Cherry-pick WebKit change 53489 to fix style in JavaClassJSC.