OSDN Git Service
Grace Kloba [Thu, 3 Dec 2009 04:29:55 +0000 (20:29 -0800)]
am
2c5eb99f: am
73b03f71: Merge change Ie0a2c0d4 into eclair-mr2
Merge commit '
2c5eb99f7c6a71583620a93bc07b161751c34e17'
* commit '
2c5eb99f7c6a71583620a93bc07b161751c34e17':
Move dump display tree to sdcard as dom and render tree.
Cary Clark [Thu, 3 Dec 2009 04:26:10 +0000 (20:26 -0800)]
am
ac94ea1b: am
5f1379c6: Merge change I3aa3fc5b into eclair-mr2
Merge commit '
ac94ea1b6a7f61d693151647c572f1c33b2cdbf6'
* commit '
ac94ea1b6a7f61d693151647c572f1c33b2cdbf6':
skip nodes when building nav cache if parents are clipped out
Cary Clark [Thu, 3 Dec 2009 04:25:10 +0000 (20:25 -0800)]
am
b50d4472: am
96070103: nav to container if it wants key events
Merge commit '
b50d4472b389f7d51a80b6082ba1f5cfceead194'
* commit '
b50d4472b389f7d51a80b6082ba1f5cfceead194':
nav to container if it wants key events
Steve Block [Thu, 3 Dec 2009 04:20:07 +0000 (20:20 -0800)]
am
8845a283: am
fb77ce99: Updates Geolocation V8 bindings to match patch submitted to webkit.org.
Merge commit '
8845a2839cb6fb5d1c221fee655feb30a49e2ecb'
* commit '
8845a2839cb6fb5d1c221fee655feb30a49e2ecb':
Updates Geolocation V8 bindings to match patch submitted to webkit.org.
Patrick Scott [Fri, 16 Oct 2009 19:11:59 +0000 (15:11 -0400)]
Use STLPort instead of our stripped version.
This fixes the simulator build and allows us to get closer to sharing code with
chromium.
STLPort was copied with minor edits from the Android port of gears.
Grace Kloba [Wed, 2 Dec 2009 17:57:56 +0000 (09:57 -0800)]
am
73b03f71: Merge change Ie0a2c0d4 into eclair-mr2
Merge commit '
73b03f71b87666e532e997c6bcd3eb6a4fc3228d' into eclair-mr2-plus-aosp
* commit '
73b03f71b87666e532e997c6bcd3eb6a4fc3228d':
Move dump display tree to sdcard as dom and render tree.
Android (Google) Code Review [Wed, 2 Dec 2009 17:51:27 +0000 (09:51 -0800)]
Merge change Ie0a2c0d4 into eclair-mr2
* changes:
Move dump display tree to sdcard as dom and render tree.
Cary Clark [Wed, 2 Dec 2009 17:50:59 +0000 (09:50 -0800)]
am
5f1379c6: Merge change I3aa3fc5b into eclair-mr2
Merge commit '
5f1379c6c79e49753999830866c2809a920cc3e4' into eclair-mr2-plus-aosp
* commit '
5f1379c6c79e49753999830866c2809a920cc3e4':
skip nodes when building nav cache if parents are clipped out
Android (Google) Code Review [Wed, 2 Dec 2009 17:41:07 +0000 (09:41 -0800)]
Merge change I3aa3fc5b into eclair-mr2
* changes:
skip nodes when building nav cache if parents are clipped out
Cary Clark [Wed, 2 Dec 2009 17:12:19 +0000 (12:12 -0500)]
skip nodes when building nav cache if parents are clipped out
This is a fairly conservative fix, since it actually checks to
see if a parent element is clipped out, rather than the bounds
of the element itself.
fixes http://b/
2291936
Cary Clark [Wed, 2 Dec 2009 14:25:21 +0000 (06:25 -0800)]
am
96070103: nav to container if it wants key events
Merge commit '
960701032df6956d9fb640a26d315122f7b2c4be' into eclair-mr2-plus-aosp
* commit '
960701032df6956d9fb640a26d315122f7b2c4be':
nav to container if it wants key events
Cary Clark [Wed, 2 Dec 2009 13:59:01 +0000 (08:59 -0500)]
nav to container if it wants key events
When a text field or text area (or plugin) has another navable
element completely overlaying it, allow the trackball to move
from that inner element to the outer one.
Also, allow this to get a 'second chance' -- treat the case
when one element overlays another as a spacial nav and allow
it to retry in nav find algorithms.
fixes http://b/
2266756
Steve Block [Wed, 2 Dec 2009 12:20:35 +0000 (04:20 -0800)]
am
fb77ce99: Updates Geolocation V8 bindings to match patch submitted to webkit.org.
Merge commit '
fb77ce99397e423500cc148c206ffe89796091fb' into eclair-mr2-plus-aosp
* commit '
fb77ce99397e423500cc148c206ffe89796091fb':
Updates Geolocation V8 bindings to match patch submitted to webkit.org.
Steve Block [Thu, 26 Nov 2009 11:24:22 +0000 (11:24 +0000)]
Updates Geolocation V8 bindings to match patch submitted to webkit.org.
See http://trac.webkit.org/changeset/51540
Change-Id: If60a5650750b1dc48353773947d451f4e8a3ec52
Jean-Baptiste Queru [Wed, 2 Dec 2009 03:13:09 +0000 (19:13 -0800)]
Revert "Don't use the WebKit STL when building the simulator"
This reverts commit
afa94bcc85b11e170818a896b14f38521d11d333.
Grace Kloba [Mon, 23 Nov 2009 23:40:48 +0000 (15:40 -0800)]
Move dump display tree to sdcard as dom and render tree.
Fix dump render tree code.
Jean-Baptiste Queru [Tue, 1 Dec 2009 22:35:03 +0000 (14:35 -0800)]
Don't use the WebKit STL when building the simulator
Derek Sollenberger [Tue, 1 Dec 2009 17:15:50 +0000 (09:15 -0800)]
am
afbff3f5: am
c1cf958c: cleaning up local JNI references for plugins and caching appropriate JNI ids.
Merge commit '
afbff3f52cb0fd1c342805daaaf3a89320bb3caa'
* commit '
afbff3f52cb0fd1c342805daaaf3a89320bb3caa':
cleaning up local JNI references for plugins and caching appropriate JNI ids.
Derek Sollenberger [Tue, 1 Dec 2009 17:15:34 +0000 (09:15 -0800)]
am
ed6d1c6a: am
ec48e7e1: Adding native portion of the PluginActivity class.
Merge commit '
ed6d1c6ac2964793be32d230bcb104cd58bdebb3'
* commit '
ed6d1c6ac2964793be32d230bcb104cd58bdebb3':
Adding native portion of the PluginActivity class.
Steve Block [Tue, 1 Dec 2009 17:15:29 +0000 (09:15 -0800)]
am
9f916fc4: am
feb18091: Merge change I783ff698 into eclair-mr2
Merge commit '
9f916fc4a8f13e8105acd7eae40dd9d7535586c3'
* commit '
9f916fc4a8f13e8105acd7eae40dd9d7535586c3':
Removes superfluous file V8 DerivedSourcesAllInOne.cpp from Android build.
Derek Sollenberger [Tue, 1 Dec 2009 17:15:24 +0000 (09:15 -0800)]
am
70e6e683: am
bf0f70e4: Cleanup how a plugin requests to go full-screen.
Merge commit '
70e6e683de7c73efbae3d27c600ccfa800177b94'
* commit '
70e6e683de7c73efbae3d27c600ccfa800177b94':
Cleanup how a plugin requests to go full-screen.
Derek Sollenberger [Tue, 1 Dec 2009 17:14:00 +0000 (09:14 -0800)]
am
d728ed1c: am
1305ed10: Merge change I24ba66f9 into eclair-mr2
Merge commit '
d728ed1cd7623201cdf0889705a761db823ab8ce'
* commit '
d728ed1cd7623201cdf0889705a761db823ab8ce':
Cleaning up android_npapi by removing implemented functions and unused parameters.
Steve Block [Tue, 1 Dec 2009 17:13:54 +0000 (09:13 -0800)]
am
32329f36: am
57751861: Merge change Iae9809cb into eclair-mr2
Merge commit '
32329f3649519c7eac4e71eca3c3017220250b0b'
* commit '
32329f3649519c7eac4e71eca3c3017220250b0b':
Fixes Makefiles to have proper dependency on HTMLTagNames.in and HTMLAttributeNames.in.
Cary Clark [Tue, 1 Dec 2009 17:11:04 +0000 (09:11 -0800)]
am
3e915743: am
a0428a86: navigate preferably between children of the same parent
Merge commit '
3e915743f84410a3d39534ca7ee358e8b00b0c4b'
* commit '
3e915743f84410a3d39534ca7ee358e8b00b0c4b':
navigate preferably between children of the same parent
Cary Clark [Tue, 1 Dec 2009 17:10:26 +0000 (09:10 -0800)]
am
bbc9c547: am
39e2da62: Merge change Ib72d8281 into eclair-mr2
Merge commit '
bbc9c5478d1e012c541c20ddbdf8dd7588aefa49'
* commit '
bbc9c5478d1e012c541c20ddbdf8dd7588aefa49':
fix bugs in nav cache dump
Mike Reed [Tue, 1 Dec 2009 17:10:10 +0000 (09:10 -0800)]
am
36c0d4d5: am
df52d119: Merge change I11fe1a14 into eclair-mr2
Merge commit '
36c0d4d5d8272ebb80883b40f6b178119e871a36'
* commit '
36c0d4d5d8272ebb80883b40f6b178119e871a36':
add ANDROID to the list of platforms that support font-face
Patrick Scott [Tue, 1 Dec 2009 17:07:17 +0000 (09:07 -0800)]
am
6397e841: am
db239ca3: Fix a crash when closing the native history.
Merge commit '
6397e841625f1a0a7f3415752cf07903fb9e72ed'
* commit '
6397e841625f1a0a7f3415752cf07903fb9e72ed':
Fix a crash when closing the native history.
Steve Block [Tue, 1 Dec 2009 17:07:08 +0000 (09:07 -0800)]
am
e74e6f92: am
a8aa6b7d: Merge change Ie9bc2064 into eclair-mr2
Merge commit '
e74e6f92a7447892c64a09556d417377d3e65679'
* commit '
e74e6f92a7447892c64a09556d417377d3e65679':
Remove the Android-specific setCMYKXXXColor methods, which are not used.
Derek Sollenberger [Tue, 1 Dec 2009 16:08:45 +0000 (08:08 -0800)]
am
c1cf958c: cleaning up local JNI references for plugins and caching appropriate JNI ids.
Merge commit '
c1cf958cf053d63e0f2a09d2af1ec2fafdd32cd9' into eclair-mr2-plus-aosp
* commit '
c1cf958cf053d63e0f2a09d2af1ec2fafdd32cd9':
cleaning up local JNI references for plugins and caching appropriate JNI ids.
Derek Sollenberger [Tue, 1 Dec 2009 15:53:06 +0000 (10:53 -0500)]
cleaning up local JNI references for plugins and caching appropriate JNI ids.
Derek Sollenberger [Tue, 1 Dec 2009 14:46:12 +0000 (06:46 -0800)]
am
ec48e7e1: Adding native portion of the PluginActivity class.
Merge commit '
ec48e7e106a9287efddd3a1f5a72431d51b6ca38' into eclair-mr2-plus-aosp
* commit '
ec48e7e106a9287efddd3a1f5a72431d51b6ca38':
Adding native portion of the PluginActivity class.
Derek Sollenberger [Tue, 1 Dec 2009 14:36:06 +0000 (09:36 -0500)]
Adding native portion of the PluginActivity class.
Steve Block [Tue, 1 Dec 2009 14:18:11 +0000 (06:18 -0800)]
am
feb18091: Merge change I783ff698 into eclair-mr2
Merge commit '
feb18091fcb31a80be16e4c41cdbcb0864358e0f' into eclair-mr2-plus-aosp
* commit '
feb18091fcb31a80be16e4c41cdbcb0864358e0f':
Removes superfluous file V8 DerivedSourcesAllInOne.cpp from Android build.
Android (Google) Code Review [Tue, 1 Dec 2009 14:15:31 +0000 (06:15 -0800)]
Merge change I783ff698 into eclair-mr2
* changes:
Removes superfluous file V8 DerivedSourcesAllInOne.cpp from Android build.
Derek Sollenberger [Tue, 1 Dec 2009 14:14:38 +0000 (06:14 -0800)]
am
bf0f70e4: Cleanup how a plugin requests to go full-screen.
Merge commit '
bf0f70e47055eb2d5ab1ca78f459e2a25e36dc10' into eclair-mr2-plus-aosp
* commit '
bf0f70e47055eb2d5ab1ca78f459e2a25e36dc10':
Cleanup how a plugin requests to go full-screen.
Derek Sollenberger [Tue, 1 Dec 2009 13:43:57 +0000 (08:43 -0500)]
Cleanup how a plugin requests to go full-screen.
Derek Sollenberger [Tue, 1 Dec 2009 13:20:39 +0000 (05:20 -0800)]
am
1305ed10: Merge change I24ba66f9 into eclair-mr2
Merge commit '
1305ed10ce1551e77289a8cc90d42275aa1359a6' into eclair-mr2-plus-aosp
* commit '
1305ed10ce1551e77289a8cc90d42275aa1359a6':
Cleaning up android_npapi by removing implemented functions and unused parameters.
Steve Block [Tue, 1 Dec 2009 13:20:34 +0000 (05:20 -0800)]
am
57751861: Merge change Iae9809cb into eclair-mr2
Merge commit '
57751861baa18ede66f3cf3a0c41383735c964fd' into eclair-mr2-plus-aosp
* commit '
57751861baa18ede66f3cf3a0c41383735c964fd':
Fixes Makefiles to have proper dependency on HTMLTagNames.in and HTMLAttributeNames.in.
Android (Google) Code Review [Tue, 1 Dec 2009 13:17:57 +0000 (05:17 -0800)]
Merge change I24ba66f9 into eclair-mr2
* changes:
Cleaning up android_npapi by removing implemented functions and unused parameters.
Android (Google) Code Review [Tue, 1 Dec 2009 13:15:06 +0000 (05:15 -0800)]
Merge change Iae9809cb into eclair-mr2
* changes:
Fixes Makefiles to have proper dependency on HTMLTagNames.in and HTMLAttributeNames.in.
Steve Block [Mon, 30 Nov 2009 14:56:15 +0000 (14:56 +0000)]
Removes superfluous file V8 DerivedSourcesAllInOne.cpp from Android build.
This was added in https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
6d62749f698529d29ec7cf61f6c8ec323ae52b83#patch1
Also revert Android-specific changes to DerivedSourcesAllInOne.cpp, to avoid future conflicts in WebKit merge.
Change-Id: I783ff698af8212c02c48012f97bd1bc3d90b7ea2
Steve Block [Tue, 1 Dec 2009 11:55:51 +0000 (11:55 +0000)]
Fixes Makefiles to have proper dependency on HTMLTagNames.in and HTMLAttributeNames.in.
Previously, the path to these files was expanded prior to execution of the rule,
thus breaking the dependency.
Change-Id: Iae9809cb925dfc26606f02a47a4dd930c99a3106
Cary Clark [Mon, 30 Nov 2009 21:20:45 +0000 (13:20 -0800)]
am
a0428a86: navigate preferably between children of the same parent
Merge commit '
a0428a863bd79d20e416d6d981d0120bd1569edf' into eclair-mr2-plus-aosp
* commit '
a0428a863bd79d20e416d6d981d0120bd1569edf':
navigate preferably between children of the same parent
Cary Clark [Mon, 30 Nov 2009 20:46:06 +0000 (15:46 -0500)]
navigate preferably between children of the same parent
The nav cache attempts to take advantage of the order that
the dom is walked to know when multiple nodes have the same
parent. The old implementation doesn't always work, and a
simpler non-cached version makes more sense.
The algorithm now walks nodes until the parent has more than
one child, and assigns that parent as the 'parent group'. On
the other end, nodes with no parent group are never allowed
to get preferential matching treatment.
Cary Clark [Mon, 30 Nov 2009 20:44:27 +0000 (12:44 -0800)]
am
39e2da62: Merge change Ib72d8281 into eclair-mr2
Merge commit '
39e2da62da0cbe8b66815b72ea0a2a3e13bda40b' into eclair-mr2-plus-aosp
* commit '
39e2da62da0cbe8b66815b72ea0a2a3e13bda40b':
fix bugs in nav cache dump
Android (Google) Code Review [Mon, 30 Nov 2009 20:39:07 +0000 (12:39 -0800)]
Merge change Ib72d8281 into eclair-mr2
* changes:
fix bugs in nav cache dump
Cary Clark [Mon, 30 Nov 2009 20:15:04 +0000 (15:15 -0500)]
fix bugs in nav cache dump
Fix errors in empty frames, escape character sequences,
and characters outside the ascii range. These fixes are
specific to dumping the nav cache and are commented out
in all builds.
Mike Reed [Mon, 30 Nov 2009 19:34:04 +0000 (11:34 -0800)]
am
df52d119: Merge change I11fe1a14 into eclair-mr2
Merge commit '
df52d1194a5c266d0d20b5f65e24fd93edd34618' into eclair-mr2-plus-aosp
* commit '
df52d1194a5c266d0d20b5f65e24fd93edd34618':
add ANDROID to the list of platforms that support font-face
Android (Google) Code Review [Mon, 30 Nov 2009 19:29:39 +0000 (11:29 -0800)]
Merge change I11fe1a14 into eclair-mr2
* changes:
add ANDROID to the list of platforms that support font-face
Mike Reed [Mon, 30 Nov 2009 18:18:08 +0000 (13:18 -0500)]
add ANDROID to the list of platforms that support font-face
Derek Sollenberger [Mon, 30 Nov 2009 16:53:41 +0000 (11:53 -0500)]
Cleaning up android_npapi by removing implemented functions and unused parameters.
Patrick Scott [Mon, 30 Nov 2009 16:42:51 +0000 (08:42 -0800)]
am
db239ca3: Fix a crash when closing the native history.
Merge commit '
db239ca3504af9998d5717708fdef4676e286602' into eclair-mr2-plus-aosp
* commit '
db239ca3504af9998d5717708fdef4676e286602':
Fix a crash when closing the native history.
Patrick Scott [Mon, 30 Nov 2009 15:42:28 +0000 (10:42 -0500)]
Fix a crash when closing the native history.
The item for a given frame can be null when closing the history while reusing
the same WebView. If the item is null, no need to visit the children since they
will also not have a history item.
Derek Sollenberger [Mon, 30 Nov 2009 16:18:06 +0000 (11:18 -0500)]
resolved conflicts for merge of
4ca6bde9 to master
Steve Block [Mon, 30 Nov 2009 16:09:03 +0000 (08:09 -0800)]
am
a8aa6b7d: Merge change Ie9bc2064 into eclair-mr2
Merge commit '
a8aa6b7d72075facc6ca0672894b0f936669f341' into eclair-mr2-plus-aosp
* commit '
a8aa6b7d72075facc6ca0672894b0f936669f341':
Remove the Android-specific setCMYKXXXColor methods, which are not used.
Android (Google) Code Review [Mon, 30 Nov 2009 16:06:41 +0000 (08:06 -0800)]
Merge change Ie9bc2064 into eclair-mr2
* changes:
Remove the Android-specific setCMYKXXXColor methods, which are not used.
Derek Sollenberger [Mon, 30 Nov 2009 15:56:04 +0000 (07:56 -0800)]
am
1a15528b: Refactoring plugins to use new java interfaces.
Merge commit '
1a15528b92bc6af8faeaad983c380fcca4d1de44' into eclair-mr2-plus-aosp
* commit '
1a15528b92bc6af8faeaad983c380fcca4d1de44':
Refactoring plugins to use new java interfaces.
Derek Sollenberger [Tue, 24 Nov 2009 20:05:24 +0000 (15:05 -0500)]
Refactoring plugins to use new java interfaces.
This change contains extensive cleanup as we now keep track of a pointer
to the plugin's java entry point (WebkitPlugin.class). Also given that we
track this object and changes to plugin packaging we nolonger need to pass
additional parameters in quite a few methods.
Steve Block [Fri, 27 Nov 2009 12:18:50 +0000 (04:18 -0800)]
am
c8a266d4: am
ff2e3e9f: Merge change I49a4a258 into eclair-mr2
Merge commit '
c8a266d47a2e615e0ef8b76c2a9ed1b2b861672d'
* commit '
c8a266d47a2e615e0ef8b76c2a9ed1b2b861672d':
Removes superfluous code from Android implementation of AuthenticationChallenge.
Steve Block [Fri, 27 Nov 2009 12:14:50 +0000 (04:14 -0800)]
am
ff2e3e9f: Merge change I49a4a258 into eclair-mr2
Merge commit '
ff2e3e9f1bdd1f49652c92473824e3a46c46e575' into eclair-mr2-plus-aosp
* commit '
ff2e3e9f1bdd1f49652c92473824e3a46c46e575':
Removes superfluous code from Android implementation of AuthenticationChallenge.
Android (Google) Code Review [Fri, 27 Nov 2009 12:11:33 +0000 (04:11 -0800)]
Merge change I49a4a258 into eclair-mr2
* changes:
Removes superfluous code from Android implementation of AuthenticationChallenge.
Steve Block [Thu, 26 Nov 2009 12:54:29 +0000 (12:54 +0000)]
Removes superfluous code from Android implementation of AuthenticationChallenge.
- On Android, we use only the default constructor.
See WebCore/platform/network/ResourceHandleInternal.h.
- AuthenticationChallenge::sourceHandle is only required for CF.
See WebCore/platform/network/cf/AuthenticationCF.cpp.
The method was originally added only for CF in http://trac.webkit.org/changeset/18880
but has since been copied to other platforms, despite not being required.
Change-Id: I49a4a2587a9551107a105573bd9da2e56ee0f52e
Steve Block [Thu, 26 Nov 2009 15:50:24 +0000 (15:50 +0000)]
Remove the Android-specific setCMYKXXXColor methods, which are not used.
Change-Id: Ie9bc2064b10c01579d60e31f62ea6996974f8f4a
Steve Block [Thu, 26 Nov 2009 10:28:16 +0000 (02:28 -0800)]
am
06a4c0b3: am
89d209fb: Merge change Ice535a82 into eclair-mr2
Merge commit '
06a4c0b3161e239d8459a40eee9131e8c779c36d'
* commit '
06a4c0b3161e239d8459a40eee9131e8c779c36d':
Restores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.
Steve Block [Thu, 26 Nov 2009 10:24:53 +0000 (02:24 -0800)]
am
89d209fb: Merge change Ice535a82 into eclair-mr2
Merge commit '
89d209fb97856ae61773dd203dbb5dd12c9f5a6c' into eclair-mr2-plus-aosp
* commit '
89d209fb97856ae61773dd203dbb5dd12c9f5a6c':
Restores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.
Android (Google) Code Review [Thu, 26 Nov 2009 10:21:19 +0000 (02:21 -0800)]
Merge change Ice535a82 into eclair-mr2
* changes:
Restores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.
Android (Google) Code Review [Wed, 25 Nov 2009 20:30:36 +0000 (12:30 -0800)]
Merge change Ie2a6df3e
* changes:
Android ICU4.2.1 upgrade. Added "include <config.h>" into WebKit/android/icu/unicode/ucnv.cpp to avoid compiler error.
Andrei Popescu [Wed, 25 Nov 2009 16:50:07 +0000 (08:50 -0800)]
am
83a9cc46: am
3dd6957f: Merge change Ie4e91d61 into eclair-mr2
Merge commit '
83a9cc46c41569d5c40d0c7bb70d729d7b34ee31'
* commit '
83a9cc46c41569d5c40d0c7bb70d729d7b34ee31':
Bring Android files in line with what landed at webkit.org.
Andrei Popescu [Wed, 25 Nov 2009 16:46:31 +0000 (08:46 -0800)]
am
3dd6957f: Merge change Ie4e91d61 into eclair-mr2
Merge commit '
3dd6957f3a954583cb88b92ecc780f6a6df0e21e' into eclair-mr2-plus-aosp
* commit '
3dd6957f3a954583cb88b92ecc780f6a6df0e21e':
Bring Android files in line with what landed at webkit.org.
Android (Google) Code Review [Wed, 25 Nov 2009 16:43:40 +0000 (08:43 -0800)]
Merge change Ie4e91d61 into eclair-mr2
* changes:
Bring Android files in line with what landed at webkit.org.
Steve Block [Wed, 25 Nov 2009 16:42:18 +0000 (08:42 -0800)]
am
88968515: am
d789cf5e: Merge change I4b0151ad into eclair-mr2
Merge commit '
8896851570d0c58b7793877046bab35d9ed00fe0'
* commit '
8896851570d0c58b7793877046bab35d9ed00fe0':
Fixes a PLATFORM(ANDROID) guard in RenderBlock.h which causes problems when building on Mac.
Steve Block [Wed, 25 Nov 2009 16:38:26 +0000 (08:38 -0800)]
am
d789cf5e: Merge change I4b0151ad into eclair-mr2
Merge commit '
d789cf5eaa873bbf5b3e643fb26747ac441ee682' into eclair-mr2-plus-aosp
* commit '
d789cf5eaa873bbf5b3e643fb26747ac441ee682':
Fixes a PLATFORM(ANDROID) guard in RenderBlock.h which causes problems when building on Mac.
Andrei Popescu [Wed, 25 Nov 2009 16:35:29 +0000 (08:35 -0800)]
am
2c59a585: am
3c1ede04: Merge change I1890130f into eclair-mr2
Merge commit '
2c59a58553ae6bb3603c4659728bf485626b67eb'
* commit '
2c59a58553ae6bb3603c4659728bf485626b67eb':
Update files in platform/android to match what was upstreamed in
Android (Google) Code Review [Wed, 25 Nov 2009 16:34:23 +0000 (08:34 -0800)]
Merge change I4b0151ad into eclair-mr2
* changes:
Fixes a PLATFORM(ANDROID) guard in RenderBlock.h which causes problems when building on Mac.
Andrei Popescu [Wed, 25 Nov 2009 16:31:31 +0000 (08:31 -0800)]
am
3c1ede04: Merge change I1890130f into eclair-mr2
Merge commit '
3c1ede0435c25d0d2138cfc0211708c01266430e' into eclair-mr2-plus-aosp
* commit '
3c1ede0435c25d0d2138cfc0211708c01266430e':
Update files in platform/android to match what was upstreamed in
Andrei Popescu [Wed, 25 Nov 2009 16:20:53 +0000 (16:20 +0000)]
Bring Android files in line with what landed at webkit.org.
Picks up changes made by Apple in
http://trac.webkit.org/changeset/51191/trunk/WebCore/platform/android/LocalizedStringsAndroid.cpp
Android (Google) Code Review [Wed, 25 Nov 2009 16:27:02 +0000 (08:27 -0800)]
Merge change I1890130f into eclair-mr2
* changes:
Update files in platform/android to match what was upstreamed in
Andrei Popescu [Tue, 24 Nov 2009 12:04:22 +0000 (12:04 +0000)]
Update files in platform/android to match what was upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=31825
https://bugs.webkit.org/show_bug.cgi?id=31831
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.
Steve Block [Wed, 25 Nov 2009 15:13:50 +0000 (15:13 +0000)]
Restores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.
This default was recently removed but is required to build on Mac.
See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
2cc706295f906df0bb49f51c9efe92a97c427464#patch1
Change-Id: Ice535a8205d14a0f3c3bfc4f32bc7d71132fbc2a
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 15:02:57 +0000 (15:02 +0000)]
Fixes a PLATFORM(ANDROID) guard in RenderBlock.h which causes problems when building on Mac.
This code was modified recently to aid upstreaming by wrapping all Android changes in PLATFORM(ANDROID).
To allow the build to succeed on other paltforms, we need to be more careful with our use of the guards.
See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
bc7b84de3fd863c500a8169fd00dca3811cadbb3#patch28
Change-Id: I4b0151ad62023821171742c5dfbba1dd7b39d8ed
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
Claire Ho [Tue, 24 Nov 2009 22:03:26 +0000 (14:03 -0800)]
Android ICU4.2.1 upgrade.
Added "include <config.h>" into WebKit/android/icu/unicode/ucnv.cpp to avoid
compiler error.
Bug:
1823720
Reviewed-by: benm@google.com,enh@google.com
CC:
Signed-off-by:
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