OSDN Git Service

android-x86/external-webkit.git
14 years agoDon't use the WebKit STL when building the simulator
Jean-Baptiste Queru [Tue, 1 Dec 2009 22:35:03 +0000 (14:35 -0800)]
Don't use the WebKit STL when building the simulator

14 years agoam afbff3f5: am c1cf958c: cleaning up local JNI references for plugins and caching...
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.

14 years agoam ed6d1c6a: am ec48e7e1: Adding native portion of the PluginActivity class.
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.

14 years agoam 9f916fc4: am feb18091: Merge change I783ff698 into eclair-mr2
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.

14 years agoam 70e6e683: am bf0f70e4: Cleanup how a plugin requests to go full-screen.
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.

14 years agoam d728ed1c: am 1305ed10: Merge change I24ba66f9 into eclair-mr2
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.

14 years agoam 32329f36: am 57751861: Merge change Iae9809cb into eclair-mr2
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.

14 years agoam 3e915743: am a0428a86: navigate preferably between children of the same parent
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

14 years agoam bbc9c547: am 39e2da62: Merge change Ib72d8281 into eclair-mr2
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

14 years agoam 36c0d4d5: am df52d119: Merge change I11fe1a14 into eclair-mr2
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

14 years agoam 6397e841: am db239ca3: Fix a crash when closing the native history.
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.

14 years agoam e74e6f92: am a8aa6b7d: Merge change Ie9bc2064 into eclair-mr2
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.

14 years agoam c1cf958c: cleaning up local JNI references for plugins and caching appropriate...
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.

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

14 years agoam ec48e7e1: Adding native portion of the PluginActivity class.
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.

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

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

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

14 years agoam bf0f70e4: Cleanup how a plugin requests to go full-screen.
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.

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

14 years agoam 1305ed10: Merge change I24ba66f9 into eclair-mr2
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.

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

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

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

14 years agoRemoves superfluous file V8 DerivedSourcesAllInOne.cpp from Android build.
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

14 years agoFixes Makefiles to have proper dependency on HTMLTagNames.in and HTMLAttributeNames.in.
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

14 years agoam a0428a86: navigate preferably between children of the same parent
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

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

14 years agoam 39e2da62: Merge change Ib72d8281 into eclair-mr2
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

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

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

14 years agoam df52d119: Merge change I11fe1a14 into eclair-mr2
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

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

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

14 years agoCleaning up android_npapi by removing implemented functions and unused parameters.
Derek Sollenberger [Mon, 30 Nov 2009 16:53:41 +0000 (11:53 -0500)]
Cleaning up android_npapi by removing implemented functions and unused parameters.

14 years agoam db239ca3: Fix a crash when closing the native history.
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.

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

14 years agoresolved conflicts for merge of 4ca6bde9 to master
Derek Sollenberger [Mon, 30 Nov 2009 16:18:06 +0000 (11:18 -0500)]
resolved conflicts for merge of 4ca6bde9 to master

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

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

14 years agoam 1a15528b: Refactoring plugins to use new java interfaces.
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.

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

14 years agoam c8a266d4: am ff2e3e9f: Merge change I49a4a258 into eclair-mr2
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.

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

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

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

14 years agoRemove the Android-specific setCMYKXXXColor methods, which are not used.
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

14 years agoam 06a4c0b3: am 89d209fb: Merge change Ice535a82 into eclair-mr2
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.

14 years agoam 89d209fb: Merge change Ice535a82 into eclair-mr2
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.

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

14 years agoMerge change Ie2a6df3e
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.

14 years agoam 83a9cc46: am 3dd6957f: Merge change Ie4e91d61 into eclair-mr2
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.

14 years agoam 3dd6957f: Merge change Ie4e91d61 into eclair-mr2
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.

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

14 years agoam 88968515: am d789cf5e: Merge change I4b0151ad into eclair-mr2
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.

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

14 years agoam 2c59a585: am 3c1ede04: Merge change I1890130f into eclair-mr2
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

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

14 years agoam 3c1ede04: Merge change I1890130f into eclair-mr2
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

14 years agoBring Android files in line with what landed at webkit.org.
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

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

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

14 years agoam c0d334f9: am 6e752dd8: Remove nativeTextInputMotionUp.
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.

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

14 years agoRestores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.
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

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

14 years agoFixes a PLATFORM(ANDROID) guard in RenderBlock.h which causes problems when building...
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

14 years agoam 878645d8: am 5b4f8170: Fixes use of statics of non-built-in types in Geolocation.
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.

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

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

14 years agoam 6dc2b039: am c3d01e35: Merge change I6d6312e9 into eclair-mr2
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.

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

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

14 years agoresolved conflicts for merge of c3ebd21f to master
Ben Murdoch [Wed, 25 Nov 2009 12:49:39 +0000 (12:49 +0000)]
resolved conflicts for merge of c3ebd21f to master

Change-Id: I7ca6ae7cb23e34765801782961bb052d6bb63fa4

14 years agoam 8d4e6f47: Merge change I973e6b03 into eclair-mr2
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.

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

14 years agoam 8d1e4004: am 42fa9723: Merge change I685fd143 into eclair-mr2
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.

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 agoFixes WTF include in WebCore/page/Geolocation.cpp to fix Mac build.
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

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 ago Android ICU4.2.1 upgrade.
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:

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

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 df404c77: am f913b011: Fix the occassional build break.
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.

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 agoUnfork WebCore/bridge/jni.
Ben Murdoch [Mon, 23 Nov 2009 14:25:39 +0000 (14:25 +0000)]
Unfork WebCore/bridge/jni.

Change-Id: I973e6b03286b1d8f6e6325a2b31d0cf9e99d19b3

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

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 e9fa2337: am ecf268d4: Merge change Ia6cf2f30 into eclair-mr2
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.

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 2748ca9c: am d0a23140: Merge change If7c73ee1 into eclair-mr2
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.

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