summaryrefslogtreecommitdiff
path: root/chromium
AgeCommit message (Collapse)Author
2014-11-17Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I700de4b1b6c8963fe482dbb0b97db0245c9a46d0 Auto-generated-cl: translation import
2014-11-14[WebView] Remove dependencies on DebugFlags.Ignacio Solla
BUG:18152150 Change-Id: Ifafa06a01db4a679b9777798f3bdeda0abc3021e (cherry picked from commit 4eb3b4bdb57147426190c8fb42a7b5c33a0a2857) (cherry picked from commit 53cb980b31715024c38abc06a5147918ca937e39)
2014-11-13[WebView] Start building against the System SDK.Ignacio Solla
BUG:18152150 Change-Id: I995dd1a5f72bc817bdd71507fa4eee790144846a (cherry picked from commit 0dd72dc2dac5ee57fd597f172e5015650312a700)
2014-11-13Merge "Import translations. DO NOT MERGE"Geoff Mendal
2014-11-12Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I79b85ac124b49a3001995770f5943958a4e60195 Auto-generated-cl: translation import
2014-11-13[WebView] Fix build breakage after cherry-pick from lmp-mr1-dev.Ignacio Solla
The cherry-pick from lmp-mr1-dev removed the dependency on ActivityThread, but a new dependency in master-chromium has been introduced since mr1. Change-Id: I1c1c3358a3b85387e329dce4c41845d95601ea7e
2014-11-13Cherry-pick: [WebView] Remove direct dependencies on hidden APIs.Ignacio Solla
Manually cherry-picked from commit 45702509d4752478188935eaf442c549c2c220be and resolved conflicts. BUG:18152150 Change-Id: If2b6c43f322b4223460b1be6c633858476244756
2014-11-12[WebView] Remove unused method in CookieManagerIgnacio Solla
Change-Id: I3d9d761d6d32eff392bfb568cef10657464ba117 (cherry picked from commit edcfb0f0e74b0cbbd025397ecec6a80cb866854d)
2014-11-12[WebView] Remove dependencies on DebugFlags.Ignacio Solla
BUG:18152150 Change-Id: Ifafa06a01db4a679b9777798f3bdeda0abc3021e (cherry picked from commit 4eb3b4bdb57147426190c8fb42a7b5c33a0a2857)
2014-11-12[WebView] Remove dependency on Build.IS_DEBUGGABLE.Ignacio Solla
BUG:18152150 Change-Id: If9c8e28f6dd737ae0f677afc89ef5136a8e2268b (cherry picked from commit bf95f761ba3d2dee0ee98b7204d289f35c4f478d)
2014-11-12[WebView] Remove dependency on FileUtils.Ignacio Solla
We implement our own version of deleteContents to avoid depending on FileUtils, a hidden Android API. BUG:18152150 Change-Id: I8607e36827bacc38a80a35f65c13f39f561551a0 (cherry picked from commit 5112943866a77868d1987617ed1320e73e2a9ce4)
2014-11-12Merge master-chromium into master at 03655fd3f6d7Torne (Richard Coles)
2014-11-12Add support for SmartClip interface in the glue layer.Ben Murdoch
Bug: 18222974 Change-Id: Ie39d49e9dfe90f20b6eb5d28009313781eac8e01
2014-11-10Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Icd223a1246c0e4a7b8bb2f72a0d207b7b7a086f6 Auto-generated-cl: translation import
2014-11-06Import translations. DO NOT MERGEBaligh Uddin
Change-Id: If2d109afc30cc6c9f7c89b245153c755e663ffc2 Auto-generated-cl: translation import
2014-11-06Merge master-chromium into master at db3f05efe0f9Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I7c0ed48fc7a60918a5a04e64b179104983f75964
2014-11-03Fix RequestDrawGL logic.Hui Shu
We're not supposed to request a blocking DrawGL with a not null canvas. Just throw an exception in this case. Change-Id: I452e781577ab1040d06acfcba1d03646bab00fa4
2014-10-31Cherry-pick: [WebView] Remove dependency on WEBVIEW_DATA_REDUCTION_PROXY.Ignacio Solla
BUG:18152150 Change-Id: Ie1f09273de1f18bdd587020cd77f914e727af9c9 (cherry picked from commit 0c24beba16b0d27ff66ebbd5d8757a60d87ecd67)
2014-10-31Merge "[WebView] Remove dependency on WEBVIEW_DATA_REDUCTION_PROXY." into ↵Ignacio Solla
master-chromium
2014-10-28[WebView] Remove dependency on WEBVIEW_DATA_REDUCTION_PROXY.Ignacio Solla
BUG:18152150 Change-Id: Ie1f09273de1f18bdd587020cd77f914e727af9c9
2014-10-28Always add the path to the WebView assets.Ben Murdoch
Bug: 18133926 Change-Id: I33ae4101fd6865df057e365b6f33aef0ef9fd272 (cherry picked from commit ddbcc0351201dc71b48252573b37da33deba1a83)
2014-10-27Enable minimalistic crash handler for WebView.Primiano Tucci
This complements crrev.com/678763005. It enables the handler that dumps out the WebView version in logcat in the case of a crash. The previous handlers are chained and reinstalled after the print. Change-Id: I2068d7925bb73c95cf0b5471936aa728280e1588
2014-10-27Merge master-chromium into master at 614f7b807940Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ieb34abff7c3789e7b41ef995d9b65c9d9932dc7f
2014-10-22Fix typo in WebViewChromium.onScrollChangedMarcin Kosiba
Change-Id: Id265d12cb981673f404440d808c9d8f51185c89b
2014-10-22Update WebView package version to 40.Ben Murdoch
Change-Id: Ib49fb2c9f13f210e47d1466a3357333452976885
2014-10-22Merge "Hook up WebView.onScrollChanged" into master-chromiumMarcin Kosiba
2014-10-22Suport initializing DRP from cmd line switches.Hui Shu
If there is a command line switch to enable the data reduction proxy, we will try to initialize the DRP by reading the DRP key from command line. If the key from command line is empty, use the key embedded in WebView apk. BUG: 17211028 Change-Id: I496b0d8a9dcd1763d4bbf2065e2d9e996ba6e873 (cherry picked from commit e41c9c1d9c3bf72381f8e0acd62bd17346bf1d7e) (cherry picked from commit ca3ebe61951d92501599e3120c0fd30b0d7264de)
2014-10-21Don't build the platform libraries in a tapas build.Torne (Richard Coles)
When building the WebView APK with tapas, don't depend on libwebviewchromium_loader or libwebviewchromium_plat_support as these are part of the platform, not part of the APK, and there's no reason to build them in the tapas build. Also remove libwebviewchromium from the list entirely as it's already listed in LOCAL_JNI_SHARED_LIBRARIES and thus already gets built, and remove an obsolete comment. Change-Id: I2b68a0537a4c36c627e933b6aeec571b5f665203
2014-10-20Hook up WebView.onScrollChangedMarcin Kosiba
This hooks up WebView.onScrollChanged to the coresponding AwContents method. We have defensive code in AwContents to sync scroll offset because many apps override onScrollChanged without calling super.onScrollChanged and so we ended up not noticing this was never hooked up. Change-Id: I09f9cb21808fc9229bbbe498d8d9b5400fe3c6b5
2014-10-15Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I2ff82931922b8ad50ee034b2d0cce11447ae1ee8 Auto-generated-cl: translation import
2014-10-15Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ia0efac7449b689c0dfdea4f50bf1c534ff153eed Auto-generated-cl: translation import
2014-10-14Merge glue layer from master-chromium.Torne (Richard Coles)
Bring in the following CLs: Import translations. DO NOT MERGE Match removal of config_webSettingsDefaultTextEncoding. Add strings for Play Store text. Use overridden resources. Cherry-pick: Fix resource rewriting in apps with other shared libs. No changes to Chromium are required; these are all glue-layer only changes.
2014-10-13Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I38768ec914f77e586b586bde7654c1b8b0fd9ebb Auto-generated-cl: translation import
2014-10-13Match removal of config_webSettingsDefaultTextEncoding.Marcin Kosiba
This is to match http://ag/565166 which removes the resource. Change-Id: Id064af59410ac5d031af0c26817a5a15ea320906 (cherry picked from commit 53dc1aa95198e9cf7020ec848f3b27cbee50b35e)
2014-10-13Match removal of config_webSettingsDefaultTextEncoding.Marcin Kosiba
This is to match http://ag/565166 which removes the resource. Change-Id: Id064af59410ac5d031af0c26817a5a15ea320906 (cherry picked from commit 53dc1aa95198e9cf7020ec848f3b27cbee50b35e)
2014-10-08Add strings for Play Store text.Ben Murdoch
We need to trigger translation. Bug: 17031560 Change-Id: I17041ed27b109f42926918ace8c5d25318c6e140
2014-10-06Use overridden resources.Ben Murdoch
Updates the WebView build rule to take into account any overridden resources. Bug: 16902981 Change-Id: Ie8dea10fc093379afeff37a6e7b9c972370d5ad5 (cherry picked from commit d6a17bc6ba1bc12e43f180397abacb8c1cd194ec) (cherry picked from commit 6084b0bc9180898565b917c5694a79defd0060fb)
2014-10-03Cherry-pick: Fix resource rewriting in apps with other shared libs.Torne (Richard Coles)
The resource rewriter was inadvertantly rewriting the resources for the first shared library it found in the current application whether that was the WebView or not due to a copy and paste oversight. Actually check the name of the package before rewriting its resources. This is the name of the package as the R class sees it, which is always com.android.webview even when the manifest package name has been changed. Also remove unused imports. BUG=17539974 Change-Id: I6c35451748ee9c32011b9a8b885f7c9b0b2e915d
2014-10-01Merge master-chromium into master at 267aeeb8d85cPrimiano Tucci
This commit was generated by merge_to_master.py. Change-Id: I1126b4412fc30084b9345f7d0a6f307e49a4feb9
2014-09-28Merge "Import translations. DO NOT MERGE" into master-chromiumBaligh Uddin
2014-09-26Merge "Merge scripts: rename merge_to_master.py -> merge_to_android.py" into ↵Primiano Tucci
master-chromium
2014-09-25Merge scripts: rename merge_to_master.py -> merge_to_android.pyPrimiano Tucci
- Add an extra check to merge_from_chromium.py to ascertain that the remote branch exists locally. - Rename merge_to_master.py -> merge_to_android.py: the former name is confusing when we merge to M* branches. The new name is also more consistent with merge_from_chromium.py - Warn if the GYP_DEFINES env var is set. Change-Id: I180f9c27a106f31a7e472b14bfcacb2a7444d534
2014-09-25WebView does not require a touch screen.Ben Murdoch
Ensure devices that don't have a touchscreen are not prevented from getting a WebView update. Bug: 16902981 Change-Id: I423c5c3cdff549b2ecfee532ada820545b0d1c5d (cherry picked from commit 85e03c0a49a3cde16fa723bb90dc64868fbe3886) (cherry picked from commit 28e69d76d3f551659d9dc3d34c17477d1b6f843a)
2014-09-25Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Idf33c6a22e51acce295061a5549c295620747ec7 Auto-generated-cl: translation import
2014-09-24Merge "Add startup time tests to the WebViewShell" into master-chromiumMarcin Kosiba
2014-09-23Increase char limit for private browsing warning.Marcin Kosiba
BUG: 16955473 (cherry picked from commit 79ca909e4230d7f95103791a9d4b41e3650db6c3) Change-Id: I86a22b644f718f1028e8d642414ea60037bb83e6 (cherry picked from commit 8c02b6dc0ceb95154436021c9b8e9206da576992)
2014-09-22Add startup time tests to the WebViewShellMarcin Kosiba
BUG: 16870075 Change-Id: I3f5221accdf2e3ca9a05b1c030eb8d74a2ec12e2
2014-09-22Merge "Don't use reflection to rewrite the WebView resources." into ↵Ben Murdoch
master-chromium
2014-09-19Update WebView manifest to target/minSDK 21.Ben Murdoch
Bug: 16902981 Change-Id: I44594b62e94b034662b30f9e43a65946224c3152 (cherry picked from commit 8473b38625fa761e77c4b247e688b28755723dd9) (cherry picked from commit bb12c1a334f9bdcbe8cdda3cd2efac850f82ae17)
2014-09-19Merge "Match rename of WebResourceRequest.hasUserGestureInsecure to ↵Marcin Kosiba
hasGesture." into master-chromium