OSDN Git Service
Leon Scroggins [Wed, 25 Nov 2009 15:56:11 +0000 (07:56 -0800)]
am
c0d334f9: am
6e752dd8: Remove nativeTextInputMotionUp.
Merge commit '
c0d334f902af03c2717dcc2223007ec681772cfd'
* commit '
c0d334f902af03c2717dcc2223007ec681772cfd':
Remove nativeTextInputMotionUp.
Leon Scroggins [Wed, 25 Nov 2009 15:50:57 +0000 (07:50 -0800)]
am
6e752dd8: Remove nativeTextInputMotionUp.
Merge commit '
6e752dd8042aae87f4827210909b1bfdaa58fbb7' into eclair-mr2-plus-aosp
* commit '
6e752dd8042aae87f4827210909b1bfdaa58fbb7':
Remove nativeTextInputMotionUp.
Leon Scroggins [Tue, 24 Nov 2009 19:55:38 +0000 (14:55 -0500)]
Remove nativeTextInputMotionUp.
Function is not needed. Requires a change to frameworks/base
Steve Block [Wed, 25 Nov 2009 14:17:27 +0000 (06:17 -0800)]
am
878645d8: am
5b4f8170: Fixes use of statics of non-built-in types in Geolocation.
Merge commit '
878645d89fe80a784cbf44d199e0c931f07cbc3c'
* commit '
878645d89fe80a784cbf44d199e0c931f07cbc3c':
Fixes use of statics of non-built-in types in Geolocation.
Steve Block [Wed, 25 Nov 2009 14:12:54 +0000 (06:12 -0800)]
am
5b4f8170: Fixes use of statics of non-built-in types in Geolocation.
Merge commit '
5b4f81709e8df8d953e2ad8496996fb0112b6186' into eclair-mr2-plus-aosp
* commit '
5b4f81709e8df8d953e2ad8496996fb0112b6186':
Fixes use of statics of non-built-in types in Geolocation.
Steve Block [Wed, 25 Nov 2009 11:14:04 +0000 (11:14 +0000)]
Fixes use of statics of non-built-in types in Geolocation.
The Mac build requires that only built-in types are used as statics.
Change-Id: I69a3f063c5728d76a13f73b8b056187d5678e0ab
Steve Block [Wed, 25 Nov 2009 14:04:34 +0000 (06:04 -0800)]
am
6dc2b039: am
c3d01e35: Merge change I6d6312e9 into eclair-mr2
Merge commit '
6dc2b0394e2bc647cda1729c18a4e685f10cf612'
* commit '
6dc2b0394e2bc647cda1729c18a4e685f10cf612':
Fixes WTF include in WebCore/page/Geolocation.cpp to fix Mac build.
Steve Block [Wed, 25 Nov 2009 13:52:51 +0000 (05:52 -0800)]
am
c3d01e35: Merge change I6d6312e9 into eclair-mr2
Merge commit '
c3d01e3597b510384b488d7d222e80a3876286b9' into eclair-mr2-plus-aosp
* commit '
c3d01e3597b510384b488d7d222e80a3876286b9':
Fixes WTF include in WebCore/page/Geolocation.cpp to fix Mac build.
Android (Google) Code Review [Wed, 25 Nov 2009 13:49:08 +0000 (05:49 -0800)]
Merge change I6d6312e9 into eclair-mr2
* changes:
Fixes WTF include in WebCore/page/Geolocation.cpp to fix Mac build.
Ben Murdoch [Wed, 25 Nov 2009 12:49:39 +0000 (12:49 +0000)]
resolved conflicts for merge of
c3ebd21f to master
Change-Id: I7ca6ae7cb23e34765801782961bb052d6bb63fa4
Ben Murdoch [Wed, 25 Nov 2009 11:30:51 +0000 (03:30 -0800)]
am
8d4e6f47: Merge change I973e6b03 into eclair-mr2
Merge commit '
8d4e6f47fe31b9b3990faefd42269e85cab05fc9' into eclair-mr2-plus-aosp
* commit '
8d4e6f47fe31b9b3990faefd42269e85cab05fc9':
Unfork WebCore/bridge/jni.
Android (Google) Code Review [Wed, 25 Nov 2009 11:26:54 +0000 (03:26 -0800)]
Merge change I973e6b03 into eclair-mr2
* changes:
Unfork WebCore/bridge/jni.
Steve Block [Wed, 25 Nov 2009 10:50:29 +0000 (02:50 -0800)]
am
8d1e4004: am
42fa9723: Merge change I685fd143 into eclair-mr2
Merge commit '
8d1e4004f335652988be9fa3a4d5b70800a97d27'
* commit '
8d1e4004f335652988be9fa3a4d5b70800a97d27':
Removes superfluous use of LOCAL_SRC_FILES in derived Makefiles.
Steve Block [Wed, 25 Nov 2009 10:44:36 +0000 (02:44 -0800)]
am
42fa9723: Merge change I685fd143 into eclair-mr2
Merge commit '
42fa9723e35d0015387952766c19355098122551' into eclair-mr2-plus-aosp
* commit '
42fa9723e35d0015387952766c19355098122551':
Removes superfluous use of LOCAL_SRC_FILES in derived Makefiles.
Android (Google) Code Review [Wed, 25 Nov 2009 10:38:22 +0000 (02:38 -0800)]
Merge change I685fd143 into eclair-mr2
* changes:
Removes superfluous use of LOCAL_SRC_FILES in derived Makefiles.
Steve Block [Tue, 24 Nov 2009 23:25:53 +0000 (23:25 +0000)]
Fixes WTF include in WebCore/page/Geolocation.cpp to fix Mac build.
Also fixes include problems in files in WebKit/android.
Change-Id: I6d6312e9753eb2bbf0b61f20a6ef0eb56f990991
Steve Block [Tue, 24 Nov 2009 23:25:05 +0000 (23:25 +0000)]
Removes superfluous use of LOCAL_SRC_FILES in derived Makefiles.
Change-Id: I685fd143279f92570a1844c847478e0cbe038e1e
Cary Clark [Tue, 24 Nov 2009 20:43:00 +0000 (12:43 -0800)]
am
687f5779: am
2e8bf3a3: Merge change Ib6355d33 into eclair-mr2
Merge commit '
687f57798fd21fa799dff3b7297fd371f499632c'
* commit '
687f57798fd21fa799dff3b7297fd371f499632c':
remove obsolete code block
Cary Clark [Tue, 24 Nov 2009 19:36:33 +0000 (11:36 -0800)]
am
2e8bf3a3: Merge change Ib6355d33 into eclair-mr2
Merge commit '
2e8bf3a3cb4da54990fbd56e69eadd04436cb363' into eclair-mr2-plus-aosp
* commit '
2e8bf3a3cb4da54990fbd56e69eadd04436cb363':
remove obsolete code block
Android (Google) Code Review [Tue, 24 Nov 2009 19:33:26 +0000 (11:33 -0800)]
Merge change Ib6355d33 into eclair-mr2
* changes:
remove obsolete code block
Cary Clark [Tue, 24 Nov 2009 18:26:16 +0000 (13:26 -0500)]
remove obsolete code block
This block was commented out in Android to improve performance.
It has now been removed from webkit altogether.
It needs to be removed to allow webkit to build for Safari,
since the interfaces it references are now obsolete.
Patrick Scott [Tue, 24 Nov 2009 14:06:59 +0000 (06:06 -0800)]
am
df404c77: am
f913b011: Fix the occassional build break.
Merge commit '
df404c77493128493723f0f5c8a87ae151f96210'
* commit '
df404c77493128493723f0f5c8a87ae151f96210':
Fix the occassional build break.
Patrick Scott [Tue, 24 Nov 2009 14:02:51 +0000 (06:02 -0800)]
am
f913b011: Fix the occassional build break.
Merge commit '
f913b011fd26eea7e116d939432db3e2c23ebea7' into eclair-mr2-plus-aosp
* commit '
f913b011fd26eea7e116d939432db3e2c23ebea7':
Fix the occassional build break.
Patrick Scott [Tue, 24 Nov 2009 13:44:18 +0000 (08:44 -0500)]
Fix the occassional build break.
WebCoreJniOnLoad.cpp now depends on some generated headers so it can occassional
fail to build if make has many jobs. Add LOCAL_ADDITIONAL_DEPENDENCIES to
prevent build breakage.
This was pulled from the old perf/Android.mk file.
Ben Murdoch [Mon, 23 Nov 2009 14:25:39 +0000 (14:25 +0000)]
Unfork WebCore/bridge/jni.
Change-Id: I973e6b03286b1d8f6e6325a2b31d0cf9e99d19b3
Steve Block [Tue, 24 Nov 2009 11:09:24 +0000 (03:09 -0800)]
am
46610a6c: am
e0a9ca53: Merge change I46e116c9 into eclair-mr2
Merge commit '
46610a6c61c316b845370d67595ae0234bfd1f63'
* commit '
46610a6c61c316b845370d67595ae0234bfd1f63':
Updates MainThreadAndroid.cpp to reflect version upstreamed to webkit.org.
Steve Block [Tue, 24 Nov 2009 11:05:07 +0000 (03:05 -0800)]
am
e0a9ca53: Merge change I46e116c9 into eclair-mr2
Merge commit '
e0a9ca5395e902b13eff92b0f823056f10ce36bd' into eclair-mr2-plus-aosp
* commit '
e0a9ca5395e902b13eff92b0f823056f10ce36bd':
Updates MainThreadAndroid.cpp to reflect version upstreamed to webkit.org.
Android (Google) Code Review [Tue, 24 Nov 2009 10:59:58 +0000 (02:59 -0800)]
Merge change I46e116c9 into eclair-mr2
* changes:
Updates MainThreadAndroid.cpp to reflect version upstreamed to webkit.org.
Steve Block [Mon, 23 Nov 2009 21:24:23 +0000 (13:24 -0800)]
am
e9fa2337: am
ecf268d4: Merge change Ia6cf2f30 into eclair-mr2
Merge commit '
e9fa23377fb4795450d93608da63750503cd9d5c'
* commit '
e9fa23377fb4795450d93608da63750503cd9d5c':
Updates an Android-specific work-around in V8GCController.cpp now that std::sort is available on Android.
Steve Block [Mon, 23 Nov 2009 21:20:41 +0000 (13:20 -0800)]
am
ecf268d4: Merge change Ia6cf2f30 into eclair-mr2
Merge commit '
ecf268d482528c4778b1bca2eea6a2d49e477c3f' into eclair-mr2-plus-aosp
* commit '
ecf268d482528c4778b1bca2eea6a2d49e477c3f':
Updates an Android-specific work-around in V8GCController.cpp now that std::sort is available on Android.
Android (Google) Code Review [Mon, 23 Nov 2009 21:16:38 +0000 (13:16 -0800)]
Merge change Ia6cf2f30 into eclair-mr2
* changes:
Updates an Android-specific work-around in V8GCController.cpp now that std::sort is available on Android.
Steve Block [Mon, 23 Nov 2009 18:51:30 +0000 (10:51 -0800)]
am
2748ca9c: am
d0a23140: Merge change If7c73ee1 into eclair-mr2
Merge commit '
2748ca9c95fe6b701e0232dfedb999eb837f8cf1'
* commit '
2748ca9c95fe6b701e0232dfedb999eb837f8cf1':
Moves initializeMaximumHTTPConnectionCountPerHost to a new ResourceRequestAndroid.cpp file.
Steve Block [Mon, 23 Nov 2009 18:45:28 +0000 (10:45 -0800)]
am
d0a23140: Merge change If7c73ee1 into eclair-mr2
Merge commit '
d0a231404ec22bbd0cf70dff2446c58d88b067e7' into eclair-mr2-plus-aosp
* commit '
d0a231404ec22bbd0cf70dff2446c58d88b067e7':
Moves initializeMaximumHTTPConnectionCountPerHost to a new ResourceRequestAndroid.cpp file.
Android (Google) Code Review [Mon, 23 Nov 2009 18:40:30 +0000 (10:40 -0800)]
Merge change If7c73ee1 into eclair-mr2
* changes:
Moves initializeMaximumHTTPConnectionCountPerHost to a new ResourceRequestAndroid.cpp file.
Steve Block [Mon, 23 Nov 2009 17:44:27 +0000 (17:44 +0000)]
Updates an Android-specific work-around in V8GCController.cpp now that std::sort is available on Android.
Change-Id: Ia6cf2f309894c877e23ad8f07439d0892810cbb2
Steve Block [Mon, 23 Nov 2009 17:59:53 +0000 (17:59 +0000)]
Moves initializeMaximumHTTPConnectionCountPerHost to a new ResourceRequestAndroid.cpp file.
This is in line with other WebKit ports, ready for upstreaming to webkit.org.
Change-Id: If7c73ee1c65ee69bba54b7acbc462ff3444e781e
Steve Block [Mon, 23 Nov 2009 17:45:05 +0000 (09:45 -0800)]
am
030dcceb: am
85d8801c: Merge change I30add3d6 into eclair-mr2
Merge commit '
030dcceb42bbb579287d767e9c3364686f4255f4'
* commit '
030dcceb42bbb579287d767e9c3364686f4255f4':
Removes Android-specific wrapper for std::sort in Profile class.
Steve Block [Mon, 23 Nov 2009 17:41:43 +0000 (09:41 -0800)]
am
2290f291: am
9fa16a4e: Removes some Symbian platform files which are not not used by Android are no longer in webkit.org.
Merge commit '
2290f291d9b6aa1cbfa187ad809d23a266715418'
* commit '
2290f291d9b6aa1cbfa187ad809d23a266715418':
Removes some Symbian platform files which are not not used by Android are no longer in webkit.org.
Steve Block [Mon, 23 Nov 2009 17:41:21 +0000 (09:41 -0800)]
am
85d8801c: Merge change I30add3d6 into eclair-mr2
Merge commit '
85d8801c085c98f514f53c300351bda5d475c2fd' into eclair-mr2-plus-aosp
* commit '
85d8801c085c98f514f53c300351bda5d475c2fd':
Removes Android-specific wrapper for std::sort in Profile class.
Steve Block [Mon, 23 Nov 2009 17:38:35 +0000 (09:38 -0800)]
am
9fa16a4e: Removes some Symbian platform files which are not not used by Android are no longer in webkit.org.
Merge commit '
9fa16a4ebbbdd4ea92df6360067c96f06dd2d961' into eclair-mr2-plus-aosp
* commit '
9fa16a4ebbbdd4ea92df6360067c96f06dd2d961':
Removes some Symbian platform files which are not not used by Android are no longer in webkit.org.
Android (Google) Code Review [Mon, 23 Nov 2009 17:37:01 +0000 (09:37 -0800)]
Merge change I30add3d6 into eclair-mr2
* changes:
Removes Android-specific wrapper for std::sort in Profile class.
Steve Block [Mon, 23 Nov 2009 17:27:34 +0000 (17:27 +0000)]
Removes some Symbian platform files which are not not used by Android are no longer in webkit.org.
These files were removed from WebKit in http://trac.webkit.org/changeset/44603 and
should have been removed from Android in a previous WebKit merge.
Change-Id: Icb84e9fe3d433c752415875cc170ff6af9be3c31
Steve Block [Mon, 23 Nov 2009 16:44:44 +0000 (16:44 +0000)]
Updates MainThreadAndroid.cpp to reflect version upstreamed to webkit.org.
See https://bugs.webkit.org/show_bug.cgi?id=31807
Change-Id: I46e116c933475699cba499e3c27921e00ebab666
Steve Block [Fri, 20 Nov 2009 15:27:15 +0000 (15:27 +0000)]
Removes Android-specific wrapper for std::sort in Profile class.
It appears that previosuly, a wrapper function was required to perform
the required type casting when passing a custom comparison function to
Android's std::sort. This is no longer required, so the wrapper can be
removed.
Change-Id: I30add3d6b41eca2558867755a34dda21a180166f
Patrick Scott [Mon, 23 Nov 2009 15:12:00 +0000 (07:12 -0800)]
Patrick Scott [Mon, 23 Nov 2009 15:07:49 +0000 (07:07 -0800)]
am
fb5979ac: Fix the sim build.
Merge commit '
fb5979ac6e2238d5ae16f43cca16e6a0932a4279' into eclair-mr2-plus-aosp
* commit '
fb5979ac6e2238d5ae16f43cca16e6a0932a4279':
Fix the sim build.
Steve Block [Mon, 23 Nov 2009 15:06:18 +0000 (07:06 -0800)]
am
cde934dd: am
d9f6271d: Merge change Ia4f91efd into eclair-mr2
Merge commit '
cde934dd8e7aa610d8aa3e9d6cede9c2187a3aff'
* commit '
cde934dd8e7aa610d8aa3e9d6cede9c2187a3aff':
Moves get_thread_msec from JavaScriptCore/wtf/CurrentTime to WebKit/android/Timecounter.
Patrick Scott [Mon, 23 Nov 2009 15:05:03 +0000 (10:05 -0500)]
Fix the sim build.
Steve Block [Mon, 23 Nov 2009 15:02:07 +0000 (07:02 -0800)]
am
d9f6271d: Merge change Ia4f91efd into eclair-mr2
Merge commit '
d9f6271d56fca364fbf3c8eb190e8ccc6a040f75' into eclair-mr2-plus-aosp
* commit '
d9f6271d56fca364fbf3c8eb190e8ccc6a040f75':
Moves get_thread_msec from JavaScriptCore/wtf/CurrentTime to WebKit/android/Timecounter.
Steve Block [Mon, 23 Nov 2009 14:58:33 +0000 (06:58 -0800)]
am
c2ac86af: am
f49be335: Merge change I7f9c0552 into eclair-mr2
Merge commit '
c2ac86afd0a8c167c598694f597a2d059d1e0057'
* commit '
c2ac86afd0a8c167c598694f597a2d059d1e0057':
Updates Threading.h to reflect final version of Android atomicIncrement/Decrement submitted to webkit.org.
Android (Google) Code Review [Mon, 23 Nov 2009 14:58:11 +0000 (06:58 -0800)]
Merge change Ia4f91efd into eclair-mr2
* changes:
Moves get_thread_msec from JavaScriptCore/wtf/CurrentTime to WebKit/android/Timecounter.
Steve Block [Mon, 23 Nov 2009 14:54:25 +0000 (06:54 -0800)]
am
f49be335: Merge change I7f9c0552 into eclair-mr2
Merge commit '
f49be335d71adf2b6d0e2dfa55d13b56376a62a8' into eclair-mr2-plus-aosp
* commit '
f49be335d71adf2b6d0e2dfa55d13b56376a62a8':
Updates Threading.h to reflect final version of Android atomicIncrement/Decrement submitted to webkit.org.
Android (Google) Code Review [Mon, 23 Nov 2009 14:50:51 +0000 (06:50 -0800)]
Merge change I7f9c0552 into eclair-mr2
* changes:
Updates Threading.h to reflect final version of Android atomicIncrement/Decrement submitted to webkit.org.
Patrick Scott [Mon, 23 Nov 2009 14:28:30 +0000 (06:28 -0800)]
am
5d60391c: am
4ceb7286: Move the benchmark code inside libwebcore.so
Merge commit '
5d60391c4f5badd084507962f271c92c4325f012'
* commit '
5d60391c4f5badd084507962f271c92c4325f012':
Move the benchmark code inside libwebcore.so
Patrick Scott [Mon, 23 Nov 2009 14:25:26 +0000 (06:25 -0800)]
am
4ceb7286: Move the benchmark code inside libwebcore.so
Merge commit '
4ceb72860b5e5d1431e3a528e70b49d4358fecdb' into eclair-mr2-plus-aosp
* commit '
4ceb72860b5e5d1431e3a528e70b49d4358fecdb':
Move the benchmark code inside libwebcore.so
Patrick Scott [Mon, 23 Nov 2009 13:19:13 +0000 (08:19 -0500)]
Move the benchmark code inside libwebcore.so
This adds about 8k of code to the library but it allows the benchmark to run
without modifying the library. This makes it ideal when testing libwebcore.so
since it is the exact same as our running library. It also makes it possible to
always build the benchmark app.
Steve Block [Mon, 23 Nov 2009 11:58:54 +0000 (03:58 -0800)]
am
03ca695f: am
5c8e6732: Merge change Ic9c0f729 into eclair-mr2
Merge commit '
03ca695f5bcc0fdb6dc903fdb265832f860926cc'
* commit '
03ca695f5bcc0fdb6dc903fdb265832f860926cc':
Update the Android-specific fix in StringHash::equal to match the fix recently made in webkit.org.
Steve Block [Mon, 23 Nov 2009 11:55:38 +0000 (03:55 -0800)]
am
5c8e6732: Merge change Ic9c0f729 into eclair-mr2
Merge commit '
5c8e67320b039ad4e9fdd0300118c6f87fd28091' into eclair-mr2-plus-aosp
* commit '
5c8e67320b039ad4e9fdd0300118c6f87fd28091':
Update the Android-specific fix in StringHash::equal to match the fix recently made in webkit.org.
Android (Google) Code Review [Mon, 23 Nov 2009 11:51:08 +0000 (03:51 -0800)]
Merge change Ic9c0f729 into eclair-mr2
* changes:
Update the Android-specific fix in StringHash::equal to match the fix recently made in webkit.org.
Steve Block [Fri, 20 Nov 2009 17:32:13 +0000 (17:32 +0000)]
Update the Android-specific fix in StringHash::equal to match the fix recently made in webkit.org.
StringHash::equal includes an Android-specific fix for platforms which don't
provide 4-byte alignment ...
https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
05d23612a67d710479fb2359e98d7ac49a982025
This was recently fixed in webkit.org ...
http://trac.webkit.org/changeset/51006
This patch updates Android to use the fix from webkit.org to avoid future merge conflicts.
Background ...
The fix in webkit.org uses a loop, whereas the Android fix uses memcmp.
Tests by WebKit have apparently shown a loop to be faster than memcmp for small
strings. This is consistent with an equivalent fix in AtomicString ...
http://trac.webkit.org/changeset/19930
Change-Id: Ic9c0f729117e31bfdcb1bc1c28e85c048a464173
Steve Block [Mon, 23 Nov 2009 10:49:08 +0000 (10:49 +0000)]
Updates Threading.h to reflect final version of Android atomicIncrement/Decrement submitted to webkit.org.
See https://bugs.webkit.org/show_bug.cgi?id=31715
Change-Id: I7f9c0552bd9f3c51e7b869bd1c782ef72d28f1a4
Leon Scroggins [Fri, 20 Nov 2009 21:42:36 +0000 (13:42 -0800)]
am
1abfaf08: am
ce5633ca: Draw ListBoxes to look like MenuLists.
Merge commit '
1abfaf084b9a676a69f6bb336f85bd8ff5b4de50'
* commit '
1abfaf084b9a676a69f6bb336f85bd8ff5b4de50':
Draw ListBoxes to look like MenuLists.
Leon Scroggins [Fri, 20 Nov 2009 21:36:22 +0000 (13:36 -0800)]
am
ce5633ca: Draw ListBoxes to look like MenuLists.
Merge commit '
ce5633cace44e557954c70720fac3b47502a6ca5' into eclair-mr2-plus-aosp
* commit '
ce5633cace44e557954c70720fac3b47502a6ca5':
Draw ListBoxes to look like MenuLists.
Leon Scroggins [Fri, 20 Nov 2009 19:47:54 +0000 (14:47 -0500)]
Draw ListBoxes to look like MenuLists.
Cherry-pick of an earlier change, listed below, which was somehow
lost. Fixes http://b/issue?id=
2273867
https://android-git.corp.google.com/g/#change,5072
Fix <select with multiple and/or size > 1.
With the latest WebKit drop we lost a hack we had to make ListBoxes
behave like MenuLists. Rather than reviving it, now in WebViewCore
check for isListBox(). This makes a click once again open the list
so the user can choose the selection. Also disable WebKit's drawing
of the text shown, and simply draw it ourselves, so we can draw
nothing or the first item selected.
Steve Block [Fri, 20 Nov 2009 16:40:36 +0000 (08:40 -0800)]
am
76687725: am
453d3796: Merge change Id484e955 into eclair-mr2
Merge commit '
76687725c90d22c9e1c7c43387abb79a1dc52b5d'
* commit '
76687725c90d22c9e1c7c43387abb79a1dc52b5d':
Bring TextBreakIteratorInternalICU.cpp in to line with WebKit version.
Steve Block [Fri, 20 Nov 2009 16:36:38 +0000 (08:36 -0800)]
am
453d3796: Merge change Id484e955 into eclair-mr2
Merge commit '
453d3796805ae4e29fb55d8d4358692597c78b2b' into eclair-mr2-plus-aosp
* commit '
453d3796805ae4e29fb55d8d4358692597c78b2b':
Bring TextBreakIteratorInternalICU.cpp in to line with WebKit version.
Android (Google) Code Review [Fri, 20 Nov 2009 16:33:49 +0000 (08:33 -0800)]
Merge change Id484e955 into eclair-mr2
* changes:
Bring TextBreakIteratorInternalICU.cpp in to line with WebKit version.
Steve Block [Fri, 20 Nov 2009 15:57:33 +0000 (15:57 +0000)]
Bring TextBreakIteratorInternalICU.cpp in to line with WebKit version.
Note that this is a comment change only.
See http://trac.webkit.org/changeset/45762#file3
Change-Id: Id484e955a5aeb948dc8068626e8013dbad757e22
Steve Block [Fri, 20 Nov 2009 13:26:23 +0000 (13:26 +0000)]
Moves get_thread_msec from JavaScriptCore/wtf/CurrentTime to WebKit/android/Timecounter.
This function is an Android addition to JavaScriptCore::WTF, but is not used anywhere in WebCore or JavaScriptCore.
Futhermore, JavaScriptCore/wtf/CurrentTime does not contain any other platform additions.
It's used primarily in WebKit/android/TimeCounter, so I've moved it there.
I've also updated the name to getThreadMsec to match WebKit style.
Change-Id: Ia4f91efd3caaafd1fb079afe6c493aefea402582
Steve Block [Fri, 20 Nov 2009 14:49:21 +0000 (06:49 -0800)]
am
3aa0c186: am
6f781ac6: Removes a superfluous Android include from TypeTraits.cpp.
Merge commit '
3aa0c186fa51b17af2009bdc0b775b0bbb1cd229'
* commit '
3aa0c186fa51b17af2009bdc0b775b0bbb1cd229':
Removes a superfluous Android include from TypeTraits.cpp.
Steve Block [Fri, 20 Nov 2009 14:45:57 +0000 (06:45 -0800)]
am
6f781ac6: Removes a superfluous Android include from TypeTraits.cpp.
Merge commit '
6f781ac6264a1eb957adc5a410ae350ddeb2a6a2' into eclair-mr2-plus-aosp
* commit '
6f781ac6264a1eb957adc5a410ae350ddeb2a6a2':
Removes a superfluous Android include from TypeTraits.cpp.
Steve Block [Fri, 20 Nov 2009 14:19:22 +0000 (06:19 -0800)]
am
29f4c1b6: am
44991d72: Cleans up Threading.cpp/h ready for upstreaming to webkit.org.
Merge commit '
29f4c1b61f60c2faae09556e51ea807058d389bc'
* commit '
29f4c1b61f60c2faae09556e51ea807058d389bc':
Cleans up Threading.cpp/h ready for upstreaming to webkit.org.
Steve Block [Fri, 20 Nov 2009 14:15:54 +0000 (06:15 -0800)]
am
44991d72: Cleans up Threading.cpp/h ready for upstreaming to webkit.org.
Merge commit '
44991d7282295431aa1809bf22c45850d69ec428' into eclair-mr2-plus-aosp
* commit '
44991d7282295431aa1809bf22c45850d69ec428':
Cleans up Threading.cpp/h ready for upstreaming to webkit.org.
Steve Block [Fri, 20 Nov 2009 12:33:44 +0000 (12:33 +0000)]
Removes a superfluous Android include from TypeTraits.cpp.
Change-Id: I344d69490b8050ff659e2b380c05fb9872d66cde
Steve Block [Fri, 20 Nov 2009 11:13:56 +0000 (11:13 +0000)]
Cleans up Threading.cpp/h ready for upstreaming to webkit.org.
$ diff ~/WebKitTipOfTree/JavaScriptCore/wtf/Threading.cpp JavaScriptCore/wtf/Threading.cpp
$ diff ~/WebKitTipOfTree/JavaScriptCore/wtf/Threading.h JavaScriptCore/wtf/Threading.h
75a76,77
> #elif PLATFORM(ANDROID)
> #include "cutils/atomic.h"
234a237,241
> #elif PLATFORM(ANDROID)
>
> inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); }
> inline int atomicDecrement(int volatile* addend) { return android_atomic_dec(addend); }
>
Change-Id: Ie4835ff88aae608b7a1844be1b422d105b327528
Steve Block [Fri, 20 Nov 2009 11:25:31 +0000 (03:25 -0800)]
am
81a6f395: am
2cc70629: Updates WebCore/config.h to reflect changes made when upstreaming to webkit.org.
Merge commit '
81a6f3953fd94c7def576b68cb5c72ecd7039132'
* commit '
81a6f3953fd94c7def576b68cb5c72ecd7039132':
Updates WebCore/config.h to reflect changes made when upstreaming to webkit.org.
Steve Block [Fri, 20 Nov 2009 11:22:03 +0000 (03:22 -0800)]
am
2cc70629: Updates WebCore/config.h to reflect changes made when upstreaming to webkit.org.
Merge commit '
2cc706295f906df0bb49f51c9efe92a97c427464' into eclair-mr2-plus-aosp
* commit '
2cc706295f906df0bb49f51c9efe92a97c427464':
Updates WebCore/config.h to reflect changes made when upstreaming to webkit.org.
Steve Block [Thu, 19 Nov 2009 16:49:23 +0000 (16:49 +0000)]
Updates WebCore/config.h to reflect changes made when upstreaming to webkit.org.
See https://bugs.webkit.org/show_bug.cgi?id=31671
Note that we only need to undef a feature enable flag when we are overwriting a default value previosuly set
in Platform.h. Also, we now rely on the default value for ENABLE_DATABASE.
Change-Id: I26ca5ef5402609ead880bdd1ce05cdb3646c1bbc
Patrick Scott [Fri, 20 Nov 2009 01:39:52 +0000 (17:39 -0800)]
am
c4585f56: am
16cdc1c7: Merge change Ifb1214a6 into eclair-mr2
Merge commit '
c4585f560051ddddb0be34c05236a3eb670890ff'
* commit '
c4585f560051ddddb0be34c05236a3eb670890ff':
Change window focus only if the user initiated the event.
Patrick Scott [Thu, 19 Nov 2009 19:52:57 +0000 (11:52 -0800)]
am
16cdc1c7: Merge change Ifb1214a6 into eclair-mr2
Merge commit '
16cdc1c75e84e6c6fed91095d72520f4cc5b5237' into eclair-mr2-plus-aosp
* commit '
16cdc1c75e84e6c6fed91095d72520f4cc5b5237':
Change window focus only if the user initiated the event.
Android (Google) Code Review [Thu, 19 Nov 2009 19:47:54 +0000 (11:47 -0800)]
Merge change Ifb1214a6 into eclair-mr2
* changes:
Change window focus only if the user initiated the event.
Steve Block [Thu, 19 Nov 2009 17:08:26 +0000 (09:08 -0800)]
am
835a0579: am
a02602e4: Merge change Iede51a8d into eclair-mr2
Merge commit '
835a0579adf69a5faf9a092f7daa751436f457e2'
* commit '
835a0579adf69a5faf9a092f7daa751436f457e2':
Fix the fact that enablement of VIDEO and WORKERS erroneously depends upon whether SVG is enabled!
Steve Block [Thu, 19 Nov 2009 17:06:42 +0000 (09:06 -0800)]
am
a02602e4: Merge change Iede51a8d into eclair-mr2
Merge commit '
a02602e4c650ddbff39da2c6e8cb2006db6f9ab8' into eclair-mr2-plus-aosp
* commit '
a02602e4c650ddbff39da2c6e8cb2006db6f9ab8':
Fix the fact that enablement of VIDEO and WORKERS erroneously depends upon whether SVG is enabled!
Android (Google) Code Review [Thu, 19 Nov 2009 17:04:33 +0000 (09:04 -0800)]
Merge change Iede51a8d into eclair-mr2
* changes:
Fix the fact that enablement of VIDEO and WORKERS erroneously depends upon whether SVG is enabled!
Steve Block [Thu, 19 Nov 2009 16:36:46 +0000 (16:36 +0000)]
Fix the fact that enablement of VIDEO and WORKERS erroneously depends upon whether SVG is enabled!
This dependency was accidentally introduced in the following changes ...
https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
917149bb7d8c49bb401a6e3740a1046168397bc4#patch5
https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
fc3566dd8afb671f5f2629103dc98fc790e21a90#patch5
Change-Id: Iede51a8d98cbd97a2e3b164e325705c862d8f399
Steve Block [Thu, 19 Nov 2009 16:29:38 +0000 (08:29 -0800)]
am
68642022: am
0e9f14cb: Merge change I873491c4 into eclair-mr2
Merge commit '
68642022a7da5f28f972a05b008c69fcff3ce3b3'
* commit '
68642022a7da5f28f972a05b008c69fcff3ce3b3':
Cleans up Android-specific changes to Platform.h, ready for upstreaming to webkit.org.
Steve Block [Thu, 19 Nov 2009 16:29:34 +0000 (08:29 -0800)]
am
41755ca7: am
defa5285: Merge change Ia0156890 into eclair-mr2
Merge commit '
41755ca72a42fdf062cd6c2daa86019a46b85e46'
* commit '
41755ca72a42fdf062cd6c2daa86019a46b85e46':
Improves documentation for GeolocationPermissions class.
Ben Murdoch [Thu, 19 Nov 2009 16:29:29 +0000 (08:29 -0800)]
am
7ffaaf94: am
be1d7806: Merge change I0248ac15 into eclair-mr2
Merge commit '
7ffaaf94a030ac7aa20474669764c9f59c742ccb'
* commit '
7ffaaf94a030ac7aa20474669764c9f59c742ccb':
Remove leading/trailing newlines and tabs as well as spaces from URLs.
Steve Block [Thu, 19 Nov 2009 16:20:39 +0000 (08:20 -0800)]
am
0e9f14cb: Merge change I873491c4 into eclair-mr2
Merge commit '
0e9f14cb2d158e01ec95cf76e7113dee48fd0ef3' into eclair-mr2-plus-aosp
* commit '
0e9f14cb2d158e01ec95cf76e7113dee48fd0ef3':
Cleans up Android-specific changes to Platform.h, ready for upstreaming to webkit.org.
Steve Block [Thu, 19 Nov 2009 16:20:35 +0000 (08:20 -0800)]
am
defa5285: Merge change Ia0156890 into eclair-mr2
Merge commit '
defa5285dd6cf3c9903edc857339e7ea0790330d' into eclair-mr2-plus-aosp
* commit '
defa5285dd6cf3c9903edc857339e7ea0790330d':
Improves documentation for GeolocationPermissions class.
Ben Murdoch [Thu, 19 Nov 2009 16:20:30 +0000 (08:20 -0800)]
am
be1d7806: Merge change I0248ac15 into eclair-mr2
Merge commit '
be1d78063958c86f1195ef4846f68f5ed7b9ec95' into eclair-mr2-plus-aosp
* commit '
be1d78063958c86f1195ef4846f68f5ed7b9ec95':
Remove leading/trailing newlines and tabs as well as spaces from URLs.
Android (Google) Code Review [Thu, 19 Nov 2009 16:16:34 +0000 (08:16 -0800)]
Merge change I873491c4 into eclair-mr2
* changes:
Cleans up Android-specific changes to Platform.h, ready for upstreaming to webkit.org.
Android (Google) Code Review [Thu, 19 Nov 2009 16:15:28 +0000 (08:15 -0800)]
Merge change Ia0156890 into eclair-mr2
* changes:
Improves documentation for GeolocationPermissions class.
Android (Google) Code Review [Thu, 19 Nov 2009 16:15:10 +0000 (08:15 -0800)]
Merge change I0248ac15 into eclair-mr2
* changes:
Remove leading/trailing newlines and tabs as well as spaces from URLs.
Steve Block [Thu, 19 Nov 2009 16:02:09 +0000 (16:02 +0000)]
Cleans up Android-specific changes to Platform.h, ready for upstreaming to webkit.org.
Change-Id: I873491c433058c5f3bc9d00f40e80813f831f736
Steve Block [Thu, 19 Nov 2009 12:29:21 +0000 (12:29 +0000)]
Improves documentation for GeolocationPermissions class.
Change-Id: Ia0156890af339f32270db5fdf8e876d07f68b719
Patrick Scott [Wed, 18 Nov 2009 18:55:30 +0000 (13:55 -0500)]
Change window focus only if the user initiated the event.
This does not work in the javascript case because the user gesture is stored in
the caller's script environment and that knowledge is not obtainable in the
receiving frame. However, this change allows targeted links to change the focus
to the correct window but prevents sites like slate.com from changing back to
the opening window.
This change will be followed by a simple revert of the previous change in the
Browser app.
Bug:
2161671
Ben Murdoch [Thu, 19 Nov 2009 13:05:33 +0000 (05:05 -0800)]
am
5fe295a9: am
19e61e8b: Add support for returning the anchor text back to Java land.
Merge commit '
5fe295a9c42ddd63a9de77bd9450fc604f28a074'
* commit '
5fe295a9c42ddd63a9de77bd9450fc604f28a074':
Add support for returning the anchor text back to Java land.
Ben Murdoch [Thu, 19 Nov 2009 13:00:22 +0000 (05:00 -0800)]
am
19e61e8b: Add support for returning the anchor text back to Java land.
Merge commit '
19e61e8bbfd288bd9bf211069dd66e51ffadce15' into eclair-mr2-plus-aosp
* commit '
19e61e8bbfd288bd9bf211069dd66e51ffadce15':
Add support for returning the anchor text back to Java land.
Cary Clark [Wed, 18 Nov 2009 19:58:34 +0000 (11:58 -0800)]
am
b8b529eb: am
92c9b35d: Merge change I7018b1ca into eclair-mr2
Merge commit '
b8b529ebfcb9481927b00f6e2581873616ccf424'
* commit '
b8b529ebfcb9481927b00f6e2581873616ccf424':
rename nativeFindIsDown to nativeFindIsUp