summaryrefslogtreecommitdiffstats
path: root/webkit
Commit message (Collapse)AuthorAgeFilesLines
* Part of fix for bug 5455901 Add exports needed for autofill and cookiesKristian Monsen2011-10-212-2/+16
| | | | | | | Local only exports due to using of autofill and cookies outside chromium. All changes marked with #ifdef ANDROID Change-Id: I72dcd7fe0fe546073c271663123ba17469deaa83
* Part of fix for 5065047: build libchromium as a shared libKristian Monsen2011-07-281-0/+6
| | | | | | | | | Linking chromium_net as a static lib. Needed to update the jni to be handled internally instead of using the one from webkit it got linked with. Change-Id: Ia717a29afa879be39835d22faacb6c4810728b53
* Preparation for fixing bug 5065047: build libchromium as a shared libKristian Monsen2011-07-282-4/+4
| | | | | | Use FormField from chromium instead of Android. Change-Id: I63565da382ea5dd10e7aed57a5a0f47293d160a0
* Merge Chromium at 12.0.742.130: Initial merge by gitKristian Monsen2011-07-263-4/+4
| | | | | | Fix for bug 5080607 Update external/chromium to latest revision Change-Id: I5c98b0d2845fccca4cbcdcea506e8f1759ba5416
* Merge Chromium at r12.0.742.93: Initial merge by gitKristian Monsen2011-07-08140-1912/+3213
| | | | Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
* Merge Chromium at r11.0.696.0: Initial merge by gitKristian Monsen2011-06-2944-173/+441
| | | | Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-14118-1037/+2170
| | | | Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-2562-90/+289
| | | | Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-16290-36392/+2276
| | | | Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
* Merge Chromium at 9.0.597.106Steve Block2011-02-182-2/+8
| | | | | | This is branches/597 at r74919. Change-Id: Iab4795189c52e254b04051b05cbceda407afb0b6
* Merge Chromium at 9.0.597.76: Trivial merge by GitBen Murdoch2011-01-201-14/+7
| | | | Change-Id: I3a36375821806209cd5c303c78225428396c5010
* Merge Chromium at 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-1651-76/+174
| | | | | | /branches/597/src@71538 Change-Id: Id9fad65a5e6d2ab901d9c8bff6dbf96ab7977f36
* Merge chromium at 9.0.597.55: Initial merge by git.Ben Murdoch2011-01-1162-677/+840
| | | | Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
* Merge Chromium at r66597: Initial merge by git.Ben Murdoch2010-12-0329-336/+248
| | | | Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
* Merge Chromium at r65505: Initial merge by git.Ben Murdoch2010-11-18115-1247/+2465
| | | | Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-03126-1379/+3993
| | | | Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
* Adding missing files to webkit/glueKristian Monsen2010-10-2760-0/+3886
| | | | Change-Id: I4aaf5edd697c73913a1bc16c686bbb969d417380
* Merge Chromium at 7.0.540.0 : Initial merge by gitIain Merrick2010-10-19215-3384/+5386
| | | | | | Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used. Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
* Intial set of changes to enable autofill on Android.Ben Murdoch2010-09-131-0/+4
| | | | | | | | | | | | | This is the initial checkin of AutoFill code into external/chromium. There's still lots to do, but this basically gets autofill working end to end, using a precanned profile injected from WebCore. By default, autofill is not enabled at the moment. For testing you can turn it on by setting the ENABLE_AUTOFILL environment variable to "true" and rebuilding. There is a corresponding change in external/webkit. Change-Id: I74ef1ccc3fd0625f1bb8e2f85b43a60d23c59ffc
* Merge Chromium src@r53293Ben Murdoch2010-08-04376-0/+49510
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34