summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-4.4.4_r1' into HEADcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0Ricardo Cerqueira2014-06-201-0/+5
|\ | | | | | | Android 4.4.4 Release 1
| * Sanitize selector Intent when handling intent: scheme.Marcin Kosiba2014-06-171-0/+5
| | | | | | | | | | | | | | | | | | Android Intents have a selector field which, if present, are used to search for the Activity to invoke. These must also be sanitized before handing off to the OS. BUG:14562482 Change-Id: I30461e11be48ec623ab0f56d0d0f206dc2849c98
* | reduce cookie tracking (2/4): add a way to count cookiesRobin Humble2014-06-081-0/+5
| | | | | | | | Change-Id: I471e284104467cd299072fbb6704f30d61e6ac02
* | Merge tag 'android-4.4.3_r1' into HEADRicardo Cerqueira2014-06-03107-506/+2288
|\| | | | | | | | | | | | | | | | | Android 4.4.3 release 1 Conflicts: chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java Change-Id: Ia744b48e21220c90da11ded272e73601270d21a7
| * Add missing Chromium LICENSE file.Ben Murdoch2014-04-081-0/+27
| | | | | | | | | | | | | | | | The frameworks/webview project contains code from the Chromium project which needs a copy of the Chromium license. Bug: 13789162 Change-Id: I15e6984321f1ca2cc03d76ce36a4bbf49349e67c
| * Revert "Support a prebuilt WebView."Torne (Richard Coles)2014-03-211-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | To work around framework resource IDs not being constant, go back to building webviewchromium.jar from source. This reverts commit 9c9341f1d2368b4209fe982f3f1c5de384f67fb7. Orignal Bug: 11426593 Bug: 11324052 (cherry picked from commit cf686f7adb1cbc4efe3e93ae69b040d328b0e23f) Change-Id: Id4e9d644f832fe3ecee9d2cc31234359857ce8c9
| * Fix check when setLayerType is called in constructorBo Liu2014-03-181-1/+6
| | | | | | | | | | | | BUG: 13514997 Change-Id: I8414b7caf3a7fb6770242dd4d1640ff89c9be26a
| * Plumb setLayerType to AwContentsBo Liu2014-03-141-2/+12
| | | | | | | | | | BUG: 13328348 Change-Id: Ib8f21cb18b22937bb6108d6a48d996dd5ebb055a
| * Update resources to match upstream.Marcin Kosiba2014-03-0317-26/+27
| | | | | | | | | | | | | | | | This updates resources to match the upstream M33 release branch at r254123. BUG: 11964789 Change-Id: I0561b916b242d310d291d8c403bb04f415492889
| * Import translations. DO NOT MERGEBaligh Uddin2014-02-191-1/+1
| | | | | | | | | | Change-Id: I04d722ba942122591211d03696964fab0e781930 Auto-generated-cl: translation import
| * Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-131-1/+0
| | | | | | | | | | | | This reverts commit 82fd1199a69c681c79ca1aa6d7a49c47afc1d33e. Change-Id: Idfb2df3132dad448aeadde18e2d1a72ada8a2d79
| * Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-071-0/+1
| | | | | | | | | | | | | | | | AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv() thus minimizing build dependencies. Change-Id: I2267327ddc0244fc255f4ec2981ac069d30823d1
| * Merge scripts: duplicate arm makefile for arm64.Torne (Richard Coles)2014-01-301-0/+8
| | | | | | | | | | | | | | | | To support multiarch arm/arm64 builds, copy the top-level makefile so that the same makefiles will be used for arm64 as are currently used for arm. Change-Id: I79bff65dd57e6528ab543b090203553849c665e4
| * Don't strip ColorPicker resources referenced from XML.Ben Murdoch2014-01-241-0/+14
| | | | | | | | Change-Id: Ib74f8d7a46a25b94a1684c9b05ee2ccafbdcc4ff (cherry picked from commit 6b18e81fbb548f00151092bf7a9cb6e23733e934)
| * Remove @override to fix build breakSelim Gurun2014-01-231-1/+0
| | | | | | | | | | | | Remove @override to fix a build break in master-gpl branch. Change-Id: Id3f58dbecfec4a806f7857a6c1c73954e1bdd6e3 (cherry picked from commit 106c4320b02fb790d9955de133013662bbdc3094)
| * Add WebSettings API tracingMikhail Naganov2014-01-081-3/+43
| | | | | | | | | | | | | | | | (Cherry pick from master-chromium) This seems to be useful for tracking app's interaction with WebView Change-Id: I1a88f4d2296a822a2d1c0afe398fbc621a3352f0 (cherry picked from commit d7ad43dc1ed52dc48532738c950ea825e9b7def0)
| * Reland "automerger: download gn before generating makefiles."Richard Coles2014-01-021-0/+11
| | | | | | | | | | | | This relands the original commit c673dbdbfa853ed101dfc9193a34c14b5134cc78. The gn binary build process has been fixed upstream so that it generates Debian-compatible binaries. Change-Id: I58a418b7ca2c6ed976367d116d06f65b851fbe79 (cherry picked from commit d7fe98f16c652eb648ff5668a2d81858458c18f6)
| * Merge master-chromium into m33 at r241094Torne (Richard Coles)2014-01-0215-11/+94
| |\ | | | | | | | | | | | | | | | This commit was generated by merge_to_master.py. Change-Id: Icfa82bbab9ec740b58774edc9faf8f0097847e5a
| | * Do not merge third_party/angle_dx11Bo Liu2013-12-161-1/+0
| | | | | | | | | | | | | | | | | | This is no longer needed and replaced by third_party/angle. Change-Id: I19c8303745dd0211e96416fe77c3c4f0a3f0e2cc
| | * Merge "Revert "Adding a fake on page started for data url's since we know it ↵Martin Kosiba2013-12-161-10/+0
| | |\ | | | | | | | | | | | | wont be sent"" into master-chromium
| | | * Revert "Adding a fake on page started for data url's since we know it wont ↵Martin Kosiba2013-12-121-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be sent" This reverts commit f401798d628ddb492defeb0a00bf289284d1677a. This code was moved upstream: http://crrev.com/110573003 BUG=10570052
| | * | Add third_party/angle to merged project list.Torne (Richard Coles)2013-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Chromium needs third_party/angle again. Change-Id: I886614fe0bf538b69e0a4cbda58edc59de526c36
| | * | Revert "Revert "Wire up resources for the Form Validation message bubble.""Ben Murdoch2013-12-1313-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 477b059d2035e22280f5ee2892d257b035cca32e. Change-Id: I3cb22edb023bee31ebf66c166be9ca52eeb44420
| | * | Revert "Wire up resources for the Form Validation message bubble."Mikhail Naganov2013-12-1313-93/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0820c3d292380d5f06017de0877706b4924f0c60. Change-Id: I95f17cb99d2e565a416d3e918d6d7ade6c0d9589
| | * | Wire up resources for the Form Validation message bubble.Ben Murdoch2013-12-1213-0/+93
| | |/ | | | | | | | | | | | | Bug: 11481260 Change-Id: If8782f7a00904ceea7bad61e5296e12e23315001
| * | Import translations. DO NOT MERGEBaligh Uddin2013-12-301-1/+1
| | | | | | | | | | | | | | | Change-Id: I88b2f7712e6f78b73963c8ef7bceffc56b49ed9b Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEBaligh Uddin2013-12-2655-1100/+550
| | | | | | | | | | | | | | | Change-Id: Ibed719c3b7e082f04b34ed7b269a61cf58a5a517 Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEBaligh Uddin2013-12-1855-55/+1155
| | | | | | | | | | | | | | | Change-Id: Ic461aac635891501fcb85a0faa2fffeadb47d6cf Auto-generated-cl: translation import
| * | Merge master-chromium into master at r240154Torne (Richard Coles)2013-12-1812-35/+201
| |\| | | | | | | | | | | | | | | | This commit was generated by merge_to_master.py. Change-Id: Ia61470ff57c573bccec9f7c9043bab7ac8d41fa5
| | * Merge "Resources for "Support datalist for date/time input types on ↵Bo Liu2013-12-115-2/+55
| | |\ | | | | | | | | | | | | Android"" into master-chromium
| | | * Resources for "Support datalist for date/time input types on Android"Bo Liu2013-12-095-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | Add resources introduced in crrev.com/r239290 Change-Id: I5788a60e9f98164f09cccd291fda767b2de97d8c
| | * | Merge "Revert "automerger: download gn before generating makefiles."" into ↵Richard Coles2013-12-111-11/+0
| | |\ \ | | | |/ | | |/| | | | | master-chromium
| | | * Revert "automerger: download gn before generating makefiles."Richard Coles2013-12-111-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c673dbdbfa853ed101dfc9193a34c14b5134cc78. The downloaded gn is not compatible with the automerger's version of libc; don't attempt to download it. Change-Id: Ice705f9dc344b7662535f37810701b19e7b08f72
| | * | Add resource after chromium crrev.com/r239076Bo Liu2013-12-054-0/+7
| | |/ | | | | | | | | | Change-Id: I73c193454cb9cb2e8a77981675395e9c06844ae2
| | * automerger: download gn before generating makefiles.Torne (Richard Coles)2013-12-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | The gyp process now needs to run gn to generate some of the gyp files as part of the gyp->gn transition. Normally this is downloaded by runhooks, but we don't run hooks during the merge. Just copy the download command from DEPS for now. Change-Id: Ide64ccd156b6eb5a0dee6c8732a7ab7ab88dea50
| | * Merge "Update resources needed for colour picker." into master-chromiumPrimiano Tucci2013-12-049-25/+124
| | |\
| | | * Update resources needed for colour picker.Primiano Tucci2013-12-039-25/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7621527 Match the upstream changes of crrev.com/23026006 Change-Id: I5645388cb599affc4ee8ed6e93cada330084286b
| | * | Enable webview printingSelim Gurun2013-12-021-7/+7
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10288759 Klp-XX branches already have printing support. This is to add printing to master. Depends on crrev.com/54963005 The original change was 412d84be859ce0eb91baf2f9afe5e6326a15d76a Change-Id: Ia2d0685b7fd01e1251aed2e4a673d2544d47bba5
| | * Merge "Allow CookieManager to be used without starting Chromium." into ↵Torne (Richard Coles)2013-11-291-1/+8
| | |\ | | | | | | | | | | | | master-chromium
| | | * Allow CookieManager to be used without starting Chromium.Torne (Richard Coles)2013-11-271-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If getCookieManager is called without Chromium having been started, set the application context but don't start Chromium. The native code will create a temporary cookie manager. Bug: 10969703 Change-Id: Ic1bd67d352dee78a761a4abf549cd9ba9ddb9f8d (cherry picked from commit 9dab5652ee2433cb990baca967d4331be0b2d3f3)
| * | | am 26ed03a2: (-s ours) DO NOT MERGE: Support a prebuilt WebView.Torne (Richard Coles)2013-12-100-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '26ed03a28a28395f14c119f4bc723c09a9d6547b': DO NOT MERGE: Support a prebuilt WebView.
| | * | | DO NOT MERGE: Support a prebuilt WebView.Torne (Richard Coles)2013-12-091-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the product sets PRODUCT_PREBUILT_WEBVIEWCHROMIUM, do not attempt to build most of the WebView from source; build only libwebviewchromium_plat_support. Bug: 10824652 Change-Id: I0e7b791c7afa7221b0593a432a8d6ca45ea995cc
| * | | | am 52c771c9: (-s ours) DO NOT MERGE reset to goog/klp-volantis-devQiwen Zhao2013-12-100-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '52c771c927739d2a4108313d463b8b93c0fb460e':
| | * | | DO NOT MERGE reset to goog/klp-volantis-devQiwen Zhao2013-12-090-0/+0
| | |\ \ \
| * | | | | am 26c0eaa0: (-s ours) am bc0f8d36: (-s ours) am 5fc2b7c0: (-s ours) Import ↵Baligh Uddin2013-12-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '26c0eaa0b61b34499180260c2ac9543199589955':
| | * | | | am bc0f8d36: (-s ours) am 5fc2b7c0: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-050-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc0f8d3645329287c8965168672def96c6c8212f': Import translations. DO NOT MERGE
| | | * \ \ \ am 5fc2b7c0: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-050-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5fc2b7c0aa383e8c693e7292081e81c6a2944d53': Import translations. DO NOT MERGE
| * | | | | | | am 8009977d: (-s ours) am 3ba0b9a1: am cf686f7a: Revert "Support a prebuilt ↵Torne (Richard Coles)2013-12-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebView." * commit '8009977db575433507a018e0bc903376aac6815d':
| | * | | | | | am 3ba0b9a1: am cf686f7a: Revert "Support a prebuilt WebView."Torne (Richard Coles)2013-10-301-6/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3ba0b9a13dadcc75e2078c6a6567d8656360b160': Revert "Support a prebuilt WebView."
| | | * | | | | am cf686f7a: Revert "Support a prebuilt WebView."Torne (Richard Coles)2013-10-301-6/+2
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf686f7adb1cbc4efe3e93ae69b040d328b0e23f': Revert "Support a prebuilt WebView."
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 03:55:45 +0000