summaryrefslogtreecommitdiff
path: root/chromium
AgeCommit message (Collapse)Author
2015-09-18Import translations. DO NOT MERGEandroid-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-dr-devBaligh Uddin
Change-Id: Ib7c3c0833967db07378d1ae04829d38cc4b24777 Auto-generated-cl: translation import
2015-07-11Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ie8eac3f74855135f99873b64790e09f89d991223 Auto-generated-cl: translation import
2015-06-12Increment kAwDrawGLInfoVersionChris Craik
bug:17322378 Change-Id: I18e2311277dc015a74683a3f0ccc2d84605ef68c
2015-05-30Import translations. DO NOT MERGEGeoff Mendal
Change-Id: If3e356f74682531ad9b49097d4d4e5f1b8bc7ab7 Auto-generated-cl: translation import
2015-05-28Remove no-longer-used webview glue sources.Torne (Richard Coles)
The WebView glue code no longer lives in Android, it's in the Chromium repository with the rest of the WebView implementation. Remove the unused sources, the unused build configuration, and also the obsolete scripts for running the downstream buildbot and merging Chromium changes into Android. Change-Id: If45550f5951bc7773c7ed011c05f845d1b65251b
2015-04-24Merge "Return error code when failing to load webview relro file."Gustav Sennton
2015-04-22Merge "Revert "Revert "GraphicsJNI update"""John Reck
2015-04-22Revert "Revert "GraphicsJNI update""John Reck
This reverts commit c2aae77521ed9db7157053968fe1070b8cac2d6a.
2015-04-22Merge "Import translations. DO NOT MERGE"Geoff Mendal
2015-04-22Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I5c0a6b5dc4a74623ef4e816879fef88c17d8df22 Auto-generated-cl: translation import
2015-04-22Import translations. DO NOT MERGEGeoff Mendal
Change-Id: If45be07dbaf0bd921408b0f041d79f983705e395 Auto-generated-cl: translation import
2015-04-20[Android WebView] Delete WebViewShell.Tim Volodine
WebViewShell now lives in the chromium repository, so this patch removes it from the android checkout (see crbug.com/475084). Change-Id: I88dfc95eeb4597d38e936d2b13f801bbf5509fbb
2015-04-17Revert "GraphicsJNI update"John Reck
This reverts commit 260be08b742bf725cf92239c50f47a8c07280130. Change-Id: I4a50e890a63d22ff517ae1bd53f00bf05d8553ff
2015-04-17Return error code when failing to load webview relro file.Gustav Sennton
Instead of just returning a boolean representing whether the webview relro file loads successfully, return an integer representing either success or the reason for failure. Change-Id: Iade4044d130f0ac6b777f4e5d82f78b3cb977739
2015-04-14GraphicsJNI updateJohn Reck
Change-Id: I72a6721d1130e7e87372beed492b42ac613695b7
2015-04-07Merge "Removing jank tests from frameworks/webview."Allen Hair
2015-04-03Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I43945b554ef6bbe47cca355afbf95e9a376463af Auto-generated-cl: translation import
2015-03-30Removing jank tests from frameworks/webview.Allen Hair
These tests are now located in platform_testing/jank/webview. Change-Id: I99a6836a97f86822a2916f9b09a35bf305f3d524
2015-03-24Merge "Add WebViewBrowserActivity and cleanup to WebViewShell."Tim Volodine
2015-03-23Add WebViewBrowserActivity and cleanup to WebViewShell.Tim Volodine
Add activity for displaying urls for testing in WebViewShell. Also clean up some bits while at it. Change-Id: Id3a78328493be5ca2ebb0b9393f08387999315a7
2015-03-21Merge "Import translations. DO NOT MERGE"Geoff Mendal
2015-03-21Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I82411b0f588ae3a038eb8b732892a1d744e62f27 Auto-generated-cl: translation import
2015-03-21Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I15609e50219d9e215864733260698dfedd904428 Auto-generated-cl: translation import
2015-03-09Update WebViewFlingTest to use new janktesthelper annotation format.Allen Hair
Change-Id: Ia957e3e74821cefd8ba39500b70e0b254431ca52
2015-01-21Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I013f8656cadd628011d1d0e9016b73e72cd2e08f Auto-generated-cl: translation import
2015-01-05Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I25f8ff97639b73264add19cfe70985b21f1d64c9 Auto-generated-cl: translation import
2014-12-22Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Iaf295cf2a945379c1f34c0f2d3330cb4ef5d5531 Auto-generated-cl: translation import
2014-12-08Stop building the webview APK from source.Torne (Richard Coles)
There is now a prebuilt webview APK in external/chromium-webview, so stop building the webview APK from sources in this project. Bug: 18255219 Change-Id: I360819a01d8091d9fac74dbae41c1f0a996915e2
2014-11-26Merge "Fork draw_gl.h/draw_sw.h." into master-chromiumMarcin Kosiba
2014-11-25Fork draw_gl.h/draw_sw.h.Marcin Kosiba
This is to make it possible to remove external/chromium_org sources. Change-Id: Id001c75a9f32788372c713b83ee6bc5cb9259122
2014-11-24Wrap all of the WebView ContextsMarcin Kosiba
We're missing a few places in WebViewChromium and WebViewChromium where we should be wrapping the application context. Particularly we need to override getApplicationContext on ContextWrapper to return a wrapped version. Change-Id: I5ce6db1ebea6c5fc545b159a49115dad7c88a624
2014-11-18Remove DRP manager codeSelim Gurun
Remove DRP manager code from master chromium. We will reintroduce the code to proper branch once the test setup is ready. Bug: 17998706 Conflicts: chromium/java/com/android/webview/chromium/DataReductionProxyManager.java chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java Change-Id: Iad8c5f0614002c6fa39abdb2aaa24094d87bc227
2014-11-18Merge "Fix reflection for detecting fullscreen API support." into ↵Ben Murdoch
master-chromium
2014-11-18Fix reflection for detecting fullscreen API support.Ben Murdoch
We need to check the class hierarchy for the methods, all the way up to the direct child of WebChromeClient. Bug: 18099831 Change-Id: Ib1c647643e601015eb1bc16c613d51aca4cf38c6 (cherry picked from commit 9f3473ac53192eca3e10c9a1dd3614dea48ea8a7)
2014-11-18Fix WebView targetSDK checks.Ben Murdoch
The 4.4W SDK bump between K and L means that apps running on L that are compiled with targetSDK 20 are picking up some features only intended to be enabled on L devices, due to erroneous target SDK checks that didn't take 4.4W into account. Bug: 18385629 Change-Id: Ia7996e948f9902c535e9f7fa7dea5b05db0a1aa0 (cherry picked from commit 12399ba4bb12154b7897cf88bee04aca0adeb770)
2014-11-18Update WebViewFlingTest to use new UiAutomator API.Allen Hair
Change-Id: I932fc013c923c502082a9cb81fabe130bdf8c928 (cherry picked from commit c287310ea4204c907e76593e2b0d6a874c88c813)
2014-11-18Update to latest master-chromium.Torne (Richard Coles)
Start building against the system SDK.
2014-11-18Merge up to ee0f312 from master-chromium.Torne (Richard Coles)
Bring in changes that remove most of the direct dependencies on hidden APIs.
2014-11-17Allow dex preopt in webview.Torne (Richard Coles)
The bug around preopting a multiarch apk has been fixed for a while; stop disabling LOCAL_DEX_PREOPT. Bug: 17772057 Change-Id: Ie653d7e79ef5cef5dc01e9b87c8f3ee78175f4f9
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)