OSDN Git Service

android-x86/external-webkit.git
14 years agoam 42fa9723: Merge change I685fd143 into eclair-mr2
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.

14 years agoMerge change I685fd143 into eclair-mr2
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.

14 years agoRemoves superfluous use of LOCAL_SRC_FILES in derived Makefiles.
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

14 years agoam 2e8bf3a3: Merge change Ib6355d33 into eclair-mr2
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

14 years agoMerge change Ib6355d33 into eclair-mr2
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

14 years agoremove 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.

14 years agoam f913b011: 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.

14 years agoFix 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.

14 years agoam e0a9ca53: Merge change I46e116c9 into eclair-mr2
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.

14 years agoMerge change I46e116c9 into eclair-mr2
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.

14 years agoam ecf268d4: Merge change Ia6cf2f30 into eclair-mr2
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.

14 years agoMerge change Ia6cf2f30 into eclair-mr2
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.

14 years agoam d0a23140: Merge change If7c73ee1 into eclair-mr2
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.

14 years agoMerge change If7c73ee1 into eclair-mr2
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.

14 years agoUpdates an Android-specific work-around in V8GCController.cpp now that std::sort...
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

14 years agoMoves initializeMaximumHTTPConnectionCountPerHost to a new ResourceRequestAndroid...
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

14 years agoam 85d8801c: Merge change I30add3d6 into eclair-mr2
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.

14 years agoam 9fa16a4e: Removes some Symbian platform files which are not not used by Android...
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.

14 years agoMerge change I30add3d6 into eclair-mr2
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.

14 years agoRemoves some Symbian platform files which are not not used by Android are no longer...
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

14 years agoUpdates MainThreadAndroid.cpp to reflect version upstreamed to webkit.org.
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

14 years agoRemoves Android-specific wrapper for std::sort in Profile class.
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

14 years agoam fb5979ac: Fix the sim build.
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.

14 years agoFix the sim build.
Patrick Scott [Mon, 23 Nov 2009 15:05:03 +0000 (10:05 -0500)]
Fix the sim build.

14 years agoam d9f6271d: Merge change Ia4f91efd into eclair-mr2
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.

14 years agoMerge change Ia4f91efd into eclair-mr2
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.

14 years agoam f49be335: Merge change I7f9c0552 into eclair-mr2
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.

14 years agoMerge change I7f9c0552 into eclair-mr2
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.

14 years agoam 4ceb7286: 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

14 years agoMove 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.

14 years agoam 5c8e6732: Merge change Ic9c0f729 into eclair-mr2
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.

14 years agoMerge change Ic9c0f729 into eclair-mr2
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.

14 years agoUpdate the Android-specific fix in StringHash::equal to match the fix recently made...
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

14 years agoUpdates Threading.h to reflect final version of Android atomicIncrement/Decrement...
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

14 years agoam ce5633ca: 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.

14 years agoDraw 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.

14 years agoam 453d3796: Merge change Id484e955 into eclair-mr2
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.

14 years agoMerge change Id484e955 into eclair-mr2
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.

14 years agoBring 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

14 years agoMoves get_thread_msec from JavaScriptCore/wtf/CurrentTime to WebKit/android/Timecounter.
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

14 years agoam 6f781ac6: 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.

14 years agoam 44991d72: 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.

14 years agoRemoves a superfluous Android include from TypeTraits.cpp.
Steve Block [Fri, 20 Nov 2009 12:33:44 +0000 (12:33 +0000)]
Removes a superfluous Android include from TypeTraits.cpp.

Change-Id: I344d69490b8050ff659e2b380c05fb9872d66cde

14 years agoCleans up Threading.cpp/h ready for upstreaming to webkit.org.
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

14 years agoam 2cc70629: Updates WebCore/config.h to reflect changes made when upstreaming to...
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.

14 years agoUpdates 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

14 years agoam 16cdc1c7: Merge change Ifb1214a6 into eclair-mr2
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.

14 years agoMerge change Ifb1214a6 into eclair-mr2
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.

14 years agoam a02602e4: Merge change Iede51a8d into eclair-mr2
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!

14 years agoMerge change Iede51a8d into eclair-mr2
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!

14 years agoFix the fact that enablement of VIDEO and WORKERS erroneously depends upon whether...
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

14 years agoam 0e9f14cb: Merge change I873491c4 into eclair-mr2
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.

14 years agoam defa5285: Merge change Ia0156890 into eclair-mr2
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.

14 years agoam be1d7806: Merge change I0248ac15 into eclair-mr2
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.

14 years agoMerge change I873491c4 into eclair-mr2
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.

14 years agoMerge change Ia0156890 into eclair-mr2
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.

14 years agoMerge change I0248ac15 into eclair-mr2
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.

14 years agoCleans up Android-specific changes to Platform.h, ready for upstreaming to webkit...
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

14 years agoImproves documentation for GeolocationPermissions class.
Steve Block [Thu, 19 Nov 2009 12:29:21 +0000 (12:29 +0000)]
Improves documentation for GeolocationPermissions class.

Change-Id: Ia0156890af339f32270db5fdf8e876d07f68b719

14 years agoChange window focus only if the user initiated the event.
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

14 years agoam 19e61e8b: 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.

14 years agoam 92c9b35d: Merge change I7018b1ca into eclair-mr2
Cary Clark [Wed, 18 Nov 2009 19:47:17 +0000 (11:47 -0800)]
am 92c9b35d: Merge change I7018b1ca into eclair-mr2

Merge commit '92c9b35dac946e4bdaa2c36ddadb2c517953f2a7' into eclair-mr2-plus-aosp

* commit '92c9b35dac946e4bdaa2c36ddadb2c517953f2a7':
  rename nativeFindIsDown to nativeFindIsUp

14 years agoam ed604335: am ffe27b58: Integrate WebKit security fix http://trac.webkit.org/change...
Grace Kloba [Wed, 18 Nov 2009 19:47:06 +0000 (11:47 -0800)]
am ed604335: am ffe27b58: Integrate WebKit security fix trac.webkit.org/changeset/50466

Merge commit 'ed6043358cfce2b3a20a5a4aace2ae99b5302200' into eclair-mr2-plus-aosp

* commit 'ed6043358cfce2b3a20a5a4aace2ae99b5302200':
  Integrate WebKit security fix

14 years agoAdd support for returning the anchor text back to Java land.
Ben Murdoch [Mon, 16 Nov 2009 18:14:02 +0000 (18:14 +0000)]
Add support for returning the anchor text back to Java land.

Change-Id: Ic092a6fbacd577dab363896be38c882166230c3a

14 years agoMerge change I7018b1ca into eclair-mr2
Android (Google) Code Review [Wed, 18 Nov 2009 12:36:19 +0000 (04:36 -0800)]
Merge change I7018b1ca into eclair-mr2

* changes:
  rename nativeFindIsDown to nativeFindIsUp

14 years agoRemove leading/trailing newlines and tabs as well as spaces from URLs.
Ben Murdoch [Tue, 17 Nov 2009 18:08:16 +0000 (18:08 +0000)]
Remove leading/trailing newlines and tabs as well as spaces from URLs.

Change-Id: I0248ac1597fb0289ff34c346e6f92b3bd507ee39

14 years agoam ffe27b58: Integrate WebKit security fix http://trac.webkit.org/changeset/50466
Grace Kloba [Wed, 18 Nov 2009 02:40:37 +0000 (18:40 -0800)]
am ffe27b58: Integrate WebKit security fix trac.webkit.org/changeset/50466

Merge commit 'ffe27b58c77e71641efd3bd4258323cd4c29c39a' into eclair-mr2

* commit 'ffe27b58c77e71641efd3bd4258323cd4c29c39a':
  Integrate WebKit security fix

14 years agoIntegrate WebKit security fix
Grace Kloba [Wed, 18 Nov 2009 02:07:26 +0000 (18:07 -0800)]
Integrate WebKit security fix
http://trac.webkit.org/changeset/50466

Fix http://b/issue?id=2268722

14 years agorename nativeFindIsDown to nativeFindIsUp
Cary Clark [Tue, 17 Nov 2009 21:00:54 +0000 (16:00 -0500)]
rename nativeFindIsDown to nativeFindIsUp

companion fix is in framework/base

fixes bug http://b/issue?id=2264941

14 years agoam 8dcb4bb3: Cleans up Android-specific changes to WebCore/bridge/jni ready for upstr...
Steve Block [Tue, 17 Nov 2009 15:05:27 +0000 (07:05 -0800)]
am 8dcb4bb3: Cleans up Android-specific changes to WebCore/bridge/jni ready for upstreaing to webkit.org.

Merge commit '8dcb4bb39afc3d3e0f58ecee412a420fe0290076' into eclair-mr2-plus-aosp

* commit '8dcb4bb39afc3d3e0f58ecee412a420fe0290076':
  Cleans up Android-specific changes to WebCore/bridge/jni ready for upstreaing to webkit.org.

14 years agoCleans up Android-specific changes to WebCore/bridge/jni ready for upstreaing to...
Steve Block [Tue, 17 Nov 2009 13:39:58 +0000 (13:39 +0000)]
Cleans up Android-specific changes to WebCore/bridge/jni ready for upstreaing to webkit.org.

Change-Id: I0778955bee95680a9924fdae2967158e4add81ba

14 years agoam 1865b306: Move V8 Makefiles to from V8Binding directory to WebCore directory,...
Steve Block [Tue, 17 Nov 2009 13:51:15 +0000 (05:51 -0800)]
am 1865b306: Move V8 Makefiles to from V8Binding directory to WebCore directory, to match JSC Makefiles.

Merge commit '1865b30642c7bb27315677df124eb2c4f14daea6' into eclair-mr2-plus-aosp

* commit '1865b30642c7bb27315677df124eb2c4f14daea6':
  Move V8 Makefiles to from V8Binding directory to WebCore directory, to match JSC Makefiles.

14 years agoMove V8 Makefiles to from V8Binding directory to WebCore directory, to match JSC...
Steve Block [Tue, 17 Nov 2009 12:30:38 +0000 (12:30 +0000)]
Move V8 Makefiles to from V8Binding directory to WebCore directory, to match JSC Makefiles.

Also move binding include paths to Android.*bindings.mk and clean up some comments.

Change-Id: I6d1475cdfcc330ec3e271cab1c3aa25a414f0448

14 years agoam 7a91213b: Merge change I4465d348 into eclair-mr2
Andrei Popescu [Tue, 17 Nov 2009 13:32:27 +0000 (05:32 -0800)]
am 7a91213b: Merge change I4465d348 into eclair-mr2

Merge commit '7a91213b05e33e75b6005212a655e1d36e89eb7b' into eclair-mr2-plus-aosp

* commit '7a91213b05e33e75b6005212a655e1d36e89eb7b':
  Update style after

14 years agoMerge change I4465d348 into eclair-mr2
Android (Google) Code Review [Tue, 17 Nov 2009 13:28:48 +0000 (05:28 -0800)]
Merge change I4465d348 into eclair-mr2

* changes:
  Update style after

14 years agoam c1d88f70: Removes some more superfluous code from the Makefiles.
Steve Block [Tue, 17 Nov 2009 12:36:15 +0000 (04:36 -0800)]
am c1d88f70: Removes some more superfluous code from the Makefiles.

Merge commit 'c1d88f70b95482a9ec4081573e739052f60a5c58' into eclair-mr2-plus-aosp

* commit 'c1d88f70b95482a9ec4081573e739052f60a5c58':
  Removes some more superfluous code from the Makefiles.

14 years agoUpdate style after
Andrei Popescu [Tue, 17 Nov 2009 12:31:18 +0000 (12:31 +0000)]
Update style after

https://bugs.webkit.org/show_bug.cgi?id=31423

landed.

14 years agoam 2a350060: Factors out common code from JSC and V8 Makefiles, ready for upstreaming...
Steve Block [Tue, 17 Nov 2009 12:11:25 +0000 (04:11 -0800)]
am 2a350060: Factors out common code from JSC and V8 Makefiles, ready for upstreaming to webkit.org.

Merge commit '2a35006024d3c1a6cb14cfc5dd0d6ba487f4b3a1' into eclair-mr2-plus-aosp

* commit '2a35006024d3c1a6cb14cfc5dd0d6ba487f4b3a1':
  Factors out common code from JSC and V8 Makefiles, ready for upstreaming to webkit.org.

14 years agoRemoves some more superfluous code from the Makefiles.
Steve Block [Mon, 16 Nov 2009 16:35:50 +0000 (16:35 +0000)]
Removes some more superfluous code from the Makefiles.

Change-Id: I9326a117296554c12ff43be0fff90b987a29561e

14 years agoFactors out common code from JSC and V8 Makefiles, ready for upstreaming to webkit...
Steve Block [Fri, 13 Nov 2009 20:36:38 +0000 (20:36 +0000)]
Factors out common code from JSC and V8 Makefiles, ready for upstreaming to webkit.org.

Both the JSC and V8 builds use Android.mk, WebCore/Android.mk and WebCore/Android.derived.mk.
The JSC build also uses WebCore/Android.jscbindings.mk and WebCore/Android.derived.jscbindings.mk.
The V8 build also uses V8Bindings/V8Binding.derived.mk.

Change details ...

Android.mk                 - Added content from both Android.jsc.mk and Android.v8.mk and removed these files.
                             Added ifdefs to switch between two builds.
WebCore/Android.mk         - Moved JSC bindings code to WebCore/Android.jscbindings.mk.
                             This file is now functionally identical to WebCore/Android.v8.mk, which was removed.
WebCore/Android.derived.mk - Moved JSC bindings code to WebCore/Android.derived.jscbindings.mk.
                             This file is now functionally identical to WebCore/Android.v8.derived.mk, which was removed.

Also updates copyright dates, as per WebKit requirements.

Change-Id: I92377b60f6f63c57283c316a2c7c2c64a13dc7de

14 years agoam 3545b177: Merge change If5d1fa4f into eclair-mr2
Andrei Popescu [Tue, 17 Nov 2009 10:57:19 +0000 (02:57 -0800)]
am 3545b177: Merge change If5d1fa4f into eclair-mr2

Merge commit '3545b177817f5f82c51ac218adf40b7d4baa9753' into eclair-mr2-plus-aosp

* commit '3545b177817f5f82c51ac218adf40b7d4baa9753':
  Split the GeolocationService implementation. This is a result of

14 years agoMerge change If5d1fa4f into eclair-mr2
Android (Google) Code Review [Tue, 17 Nov 2009 10:54:25 +0000 (02:54 -0800)]
Merge change If5d1fa4f into eclair-mr2

* changes:
  Split the GeolocationService implementation. This is a result of https://bugs.webkit.org/show_bug.cgi?id=31554

14 years agoam 2278eb4c: Revert https://android-git.corp.google.com/g/#change,31178 as http:...
Grace Kloba [Tue, 17 Nov 2009 01:49:34 +0000 (17:49 -0800)]
am 2278eb4c: Revert https://android-git.corp.google.com/g/#change,31178 as b/issue?id=2183371 is finally fixed.

Merge commit '2278eb4c5b402fda7021652c38f6ff5ee588c2ba' into eclair-mr2-plus-aosp

* commit '2278eb4c5b402fda7021652c38f6ff5ee588c2ba':
  Revert https://android-git.corp.google.com/g/#change,31178

14 years agoRevert https://android-git.corp.google.com/g/#change,31178
Grace Kloba [Tue, 17 Nov 2009 00:10:23 +0000 (16:10 -0800)]
Revert https://android-git.corp.google.com/g/#change,31178
as http://b/issue?id=2183371 is finally fixed.

14 years agoam 17a4c1d7: Merge change Ibac5ab03 into eclair-mr2
Nicolas Roard [Mon, 16 Nov 2009 22:37:32 +0000 (14:37 -0800)]
am 17a4c1d7: Merge change Ibac5ab03 into eclair-mr2

Merge commit '17a4c1d7f751a096335f214d1e01058fe1fb8b6b' into eclair-mr2-plus-aosp

* commit '17a4c1d7f751a096335f214d1e01058fe1fb8b6b':
  Add a guard on InspectorTimelineAgent, and remove unnecessary guards...

14 years agoam e650560b: Merge change Iad124f6d into eclair-mr2
Andrei Popescu [Mon, 16 Nov 2009 22:37:27 +0000 (14:37 -0800)]
am e650560b: Merge change Iad124f6d into eclair-mr2

Merge commit 'e650560b8bd25f0284dbecb3a834acc2c405c9fa' into eclair-mr2-plus-aosp

* commit 'e650560b8bd25f0284dbecb3a834acc2c405c9fa':
  Update Android tree with what was upstreamed in

14 years agoSplit the GeolocationService implementation. This is a result of
Andrei Popescu [Mon, 16 Nov 2009 19:00:25 +0000 (19:00 +0000)]
Split the GeolocationService implementation. This is a result of
https://bugs.webkit.org/show_bug.cgi?id=31554

14 years agoMerge change Ibac5ab03 into eclair-mr2
Android (Google) Code Review [Mon, 16 Nov 2009 14:26:35 +0000 (06:26 -0800)]
Merge change Ibac5ab03 into eclair-mr2

* changes:
  Add a guard on InspectorTimelineAgent, and remove unnecessary guards...

14 years agoMerge change Iad124f6d into eclair-mr2
Android (Google) Code Review [Mon, 16 Nov 2009 12:25:12 +0000 (04:25 -0800)]
Merge change Iad124f6d into eclair-mr2

* changes:
  Update Android tree with what was upstreamed in https://bugs.webkit.org/show_bug.cgi?id=31423

14 years agoUpdate Android tree with what was upstreamed in
Andrei Popescu [Sat, 14 Nov 2009 01:38:01 +0000 (01:38 +0000)]
Update Android tree with what was upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=31423

14 years agomerge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:19 +0000 (14:55 -0800)]
merge from open-source master

14 years agomerge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:03:14 +0000 (14:03 -0800)]
merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD

14 years agomerge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:03:13 +0000 (14:03 -0800)]
merge from open-source master

Merge commit 'goog/stage-korg-master^' into HEAD

14 years agoFix spurious build breaks.
Patrick Scott [Tue, 20 Oct 2009 15:30:21 +0000 (11:30 -0400)]
Fix spurious build breaks.

Split libwebcore.a into libwebcore.a and libjs.a and then link them together.

14 years agomerge from eclair
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:06:13 +0000 (12:06 -0800)]
merge from eclair

14 years agoAdd a guard on InspectorTimelineAgent, and remove unnecessary guards...
Nicolas Roard [Sat, 14 Nov 2009 04:18:29 +0000 (20:18 -0800)]
Add a guard on InspectorTimelineAgent, and remove unnecessary guards...

14 years agoRemove unused #defines from config.h
Ben Murdoch [Fri, 13 Nov 2009 17:50:33 +0000 (09:50 -0800)]
Remove unused #defines from config.h

Change-Id: I9e12f9344db4e4e84399ef0c58db9a3acad0ff93

14 years agoMerge change I1878e4cc into eclair-mr2
Android (Google) Code Review [Fri, 13 Nov 2009 22:23:11 +0000 (14:23 -0800)]
Merge change I1878e4cc into eclair-mr2

* changes:
  Removes some superfluous files from the JSC build.

14 years agoRemoves some superfluous files from the JSC build.
Steve Block [Fri, 13 Nov 2009 20:08:20 +0000 (20:08 +0000)]
Removes some superfluous files from the JSC build.

Note that these files are not built for V8.

Change-Id: I1878e4cc178cf89c103a7e88367eb84f08429f69

14 years agoBring webcore_test up-to-date.
Patrick Scott [Fri, 13 Nov 2009 19:37:59 +0000 (14:37 -0500)]
Bring webcore_test up-to-date.

startLoadingResource changed its signature. Some reference stuff changed and
SecurityOrigin got the local load policy stuff. Change the makefile to link
against the shared lib instead of the static lib.