summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-19Merge "Use Java code from external/chromium_org" into chromium-devchromium-devMartin Kosiba
2015-01-19Use Java code from external/chromium_orgMarcin Kosiba
Because nobody wants to maintain two copies of the same code. Also remove the resources as we're using the upstream ones anyway. Change-Id: Ib2b305fd6653cc8abe8fad89a4b67a4e532250fa
2014-12-10Merge "Replace TraceEvent.begin()/end() with explicit names" into chromium-devRichard Coles
2014-12-09Replace TraceEvent.begin()/end() with explicit namesBo Liu
Replace TraceEvent.begin()/end() calls which implicitly gets the trace event name by doing a costly stack dump, with explicitly named trace event names. Also wrap traces around try/finally. Chromium crbug.com/439118 Change-Id: Iec15663bba1da76049e9ee99e9df437ae33f59d5
2014-12-08Merge "Update chromium-dev to match master again." into chromium-devTorne (Richard Coles)
2014-12-08Update chromium-dev to match master again.Torne (Richard Coles)
chromium-dev had lagged behind; update it to be identical to master as there are no chromium-dev specific changes outstanding at the moment. Change-Id: I3aaa2c1a531d6e0f850848b2eb53596c5fe8a813
2014-12-05Merge "Fix remaining references to hidden fields."android-wear-5.0.0_r1lollipop-wear-releaseMartin Kosiba
2014-12-05Fix remaining references to hidden fields.Torne (Richard Coles)
A few hidden references were missed in previous commits. Change-Id: Ia4c8fdae59f1de98b88d0bc77d5b7b434cf3db9b
2014-11-27Merge "Track move of android.net.http.ErrorStrings."Narayan Kamath
2014-11-27Track move of android.net.http.ErrorStrings.Narayan Kamath
It's now android.webkit.ErrorStrings. Change-Id: I112ab739b0cb9bd47cee76481f5cf22d1e194b99
2014-11-20Merge internal glue layer to AOSP at c28cfda.Torne (Richard Coles)
Update glue layer to remove dependencies on to-be-removed private framework APIs.
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-18Merge glue layer up to 7f6067d into AOSP.Torne (Richard Coles)
Bring the AOSP version of the glue layer up to date with the current internal version. Change-Id: Ibb993d77c9bcd6d4f4d5b2929a76118a419e3826
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-13Merge "[WebView] Add NullWebViewDFP constructor with WebViewDelegate arg."Ignacio Solla
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-13[WebView] Add NullWebViewDFP constructor with WebViewDelegate arg.Ignacio Solla
Replace the NullWebViewDelegateFactoryProvider constructor with a version taking a WebViewDelegate as an argument. This will allow us to remove a fallback from WebViewFactory that we don't need BUG:18152150 Change-Id: Ib6b51e93ee88b5bb8b3e9d0a36bd6b9da7a4cdc6
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-07Merge "Push m39 glue to chromium-dev" into chromium-devMartin Kosiba
2014-11-07Push m39 glue to chromium-devBo Liu
M39 sha1: 8a26cc6f7dd4d893790e7c4f13df901845ab045d This be built against android-5.0.0_r2 frameworks/base. Change-Id: I668b7279b706b7288de7b24cebdb20e2aad13912
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-30Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I72dccad6851ff79f72b79af3f31e02e65a968a82 Auto-generated-cl: translation import
2014-10-29Revert "Wrap one more Context"Torne (Richard Coles)
This reverts commit f0c97c192953010508e2c97991c67243ec3ee05e. The change was needed in AOSP before the L release but is obsolete now and depends on another change that was skipped.
2014-10-29resolved conflicts for merge of 5a706141 to stage-aosp-masterTorne (Richard Coles)
Change-Id: I1d4eb2b0bd794085cae12ae24ec47bcd89b159a4
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 "Merge chromium-dev up to 7d62eab"Torne (Richard Coles)
2014-10-27Merge chromium-dev up to 7d62eabTorne (Richard Coles)
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 09:42:35 +0000