| ad75a55a161c28a96c3cf1a2ad6bda28ea5e9799 |
14-Mar-2016 |
Torne (Richard Coles) <torne@google.com> |
Load the library using classloader's namespace.
Use the namespace corresponding to a given classloader to load the
native library. This allows the calling code in WebViewFactory to
associate the library with the WebView APK's classloader, preventing it
from being loaded twice in some situations.
Bug: 27189432
Change-Id: I89b21b28ebba4dbb817e519d349a4bb021cc6b10
hromium/Android.mk
hromium/loader/loader.cpp
|
| c76c75875b64c4c542ea6d45ec8d99ff7d8218bf |
03-Feb-2016 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 52454ab476 -s ours
am: 25673cb22e -s ours
* commit '25673cb22eb22712faa0515290a8ea929951c95a':
Import translations. DO NOT MERGE
|
| 542381305aa10cd0a44fc3796f06e71eebd68780 |
03-Feb-2016 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE am: 6a3952faab -s ours am: 383dfc2c83 -s ours
am: 0a85111f5f -s ours
* commit '0a85111f5f2f737b92ec46491d50050da8ba0555':
Import translations. DO NOT MERGE
|
| 25673cb22eb22712faa0515290a8ea929951c95a |
03-Feb-2016 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 52454ab476 -s ours
* commit '52454ab47623d2a2930994d1357b3287f703f568':
Import translations. DO NOT MERGE
|
| 0a85111f5f2f737b92ec46491d50050da8ba0555 |
03-Feb-2016 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE am: 6a3952faab -s ours
am: 383dfc2c83 -s ours
* commit '383dfc2c83f3b4e8e515c705a8ccfd1f86bed8ac':
Import translations. DO NOT MERGE
|
| 52454ab47623d2a2930994d1357b3287f703f568 |
03-Feb-2016 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
|
| a17bba99954ca057b964318c56653c4ff83e2bd8 |
03-Feb-2016 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I07ec37bd3b3684af468352c4f8a687f9ec75a46b
Auto-generated-cl: translation import
hromium/listing/res/values-az-rAZ/strings.xml
hromium/listing/res/values-bn-rBD/strings.xml
hromium/listing/res/values-de/strings.xml
hromium/listing/res/values-en-rAU/strings.xml
hromium/listing/res/values-en-rGB/strings.xml
hromium/listing/res/values-en-rIN/strings.xml
hromium/listing/res/values-eu-rES/strings.xml
hromium/listing/res/values-fa/strings.xml
hromium/listing/res/values-gu-rIN/strings.xml
hromium/listing/res/values-kn-rIN/strings.xml
hromium/listing/res/values-nl/strings.xml
hromium/listing/res/values-pt-rBR/strings.xml
hromium/listing/res/values-sq-rAL/strings.xml
|
| 383dfc2c83f3b4e8e515c705a8ccfd1f86bed8ac |
02-Feb-2016 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
am: 6a3952faab -s ours
* commit '6a3952faab395cb38216943bf1430d1441ee1a4d':
Import translations. DO NOT MERGE
|
| 6a3952faab395cb38216943bf1430d1441ee1a4d |
02-Feb-2016 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ie354a07837f74849ec87b9888ce95e6caf7f8c8c
Auto-generated-cl: translation import
hromium/listing/res/values-az-rAZ/strings.xml
hromium/listing/res/values-bn-rBD/strings.xml
hromium/listing/res/values-de/strings.xml
hromium/listing/res/values-en-rAU/strings.xml
hromium/listing/res/values-en-rGB/strings.xml
hromium/listing/res/values-en-rIN/strings.xml
hromium/listing/res/values-eu-rES/strings.xml
hromium/listing/res/values-fa/strings.xml
hromium/listing/res/values-gu-rIN/strings.xml
hromium/listing/res/values-kn-rIN/strings.xml
hromium/listing/res/values-nl/strings.xml
hromium/listing/res/values-pt-rBR/strings.xml
hromium/listing/res/values-sq-rAL/strings.xml
|
| caf2cee6d1c22623bfb7189266addaaa760e2629 |
23-Jan-2016 |
Mikhail Naganov <mnaganov@google.com> |
Add new interface method implementation into NullWebViewFactoryProvider
BUG: 22709088
Change-Id: Ib0b6ab15bc6460ffc8306bd97c34c8e22f41a862
ullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java
|
| fbf9603e725d893f981d348914665670ed91afca |
15-Jan-2016 |
Selim Gurun <sgurun@google.com> |
Update NullWebViewProvider
Add TokenbindingService override
Bug: 22665752
Change-Id: I04e60fe0e0ae1d6805c8d48f42033fdfd82609ac
ullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java
|
| 12226049d747c7dc8676409babcd24dca689c28a |
16-Dec-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE am: fb7517dcf9 -s ours am: 56c9eefcf8 -s ours am: e49a7169f4 -s ours
am: ea777404c4 -s ours
* commit 'ea777404c4457ecc1026d19727fab0cf7a21088a':
Import translations. DO NOT MERGE
|
| ea777404c4457ecc1026d19727fab0cf7a21088a |
16-Dec-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE am: fb7517dcf9 -s ours am: 56c9eefcf8 -s ours
am: e49a7169f4 -s ours
* commit 'e49a7169f49fc987bc6db91fa72f8df0d7382565':
Import translations. DO NOT MERGE
|
| e49a7169f49fc987bc6db91fa72f8df0d7382565 |
16-Dec-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE am: fb7517dcf9 -s ours
am: 56c9eefcf8 -s ours
* commit '56c9eefcf86e1b88e16ef5035b82282a7c1505dc':
Import translations. DO NOT MERGE
|
| 56c9eefcf86e1b88e16ef5035b82282a7c1505dc |
16-Dec-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
am: fb7517dcf9 -s ours
* commit 'fb7517dcf9ed50b4a08aefca4d400ae66b5d6cfb':
Import translations. DO NOT MERGE
|
| fb7517dcf9ed50b4a08aefca4d400ae66b5d6cfb |
16-Dec-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I9668e49956e6e37761a31cdb6b7fae707dd07e9e
Auto-generated-cl: translation import
hromium/listing/res/values-fa/strings.xml
|
| 9f2a5948f495fc46cb55b7fb853008b9d14a5160 |
05-Nov-2015 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE am: d38d0af9ea -s ours
am: 2cd1185eff -s ours
* commit '2cd1185eff42e702280cea1cf78a28aa8ebe68a7':
Import translations. DO NOT MERGE
|
| 2cd1185eff42e702280cea1cf78a28aa8ebe68a7 |
05-Nov-2015 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
am: d38d0af9ea -s ours
* commit 'd38d0af9ea56a99b641c37bde1d9d1c53be928ce':
Import translations. DO NOT MERGE
|
| d38d0af9ea56a99b641c37bde1d9d1c53be928ce |
05-Nov-2015 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug: 25433205
Change-Id: I6404c32ad823a37f9b1015a971ea6a1dc736f8c5
hromium/listing/res/values-bn-rBD/strings.xml
hromium/listing/res/values-en-rAU/strings.xml
hromium/listing/res/values-en-rGB/strings.xml
hromium/listing/res/values-en-rIN/strings.xml
hromium/listing/res/values-fa/strings.xml
hromium/listing/res/values-kn-rIN/strings.xml
hromium/listing/res/values-nl/strings.xml
hromium/listing/res/values-pt-rBR/strings.xml
|
| eb75f95330167262d293b3d4d624310bcdff56da |
29-Oct-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE am: 7102c3675f -s ours am: ec4623ce5c -s ours
am: 25e6573e78 -s ours
* commit '25e6573e78dd67974e5cd62e3d2b44b5dbb27f78':
Import translations. DO NOT MERGE
|
| 44434d276b623af3cf905082f47a48fb8dbb2942 |
29-Oct-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE am: bb3e2d9b51 -s ours am: ba480fd949 -s ours
am: c26256259e -s ours
* commit 'c26256259e05934d60c733c5d542b8b260f97c84':
Import translations. DO NOT MERGE
|
| 006e61248a9eb71c2131bfc2ce1b708d3d1b3b35 |
29-Oct-2015 |
Qiwen Zhao <zhao@google.com> |
Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: a082f08797 am: f5deeec57f am: b8de50cfea am: d2460a5c9d
am: d5ff3390f1
* commit 'd5ff3390f1444ea122b2a91edf28dac4f99f4fbe':
Fix WebView targetSDK checks.
Add support for SmartClip interface in the glue layer.
Always add the path to the WebView assets.
|
| c95ffe684b31ea017fe253d01def2c098c0faf4b |
29-Oct-2015 |
Baligh Uddin <baligh@google.com> |
am 379c1660: (-s ours) Import translations. DO NOT MERGE
am: 10b3d389e2 -s ours
* commit '10b3d389e251aa3086440a7390c1a7a96568b78d':
Import translations. DO NOT MERGE
|
| a2e53d12c5fc455df6cd11e5ee7c8e5394fed994 |
29-Oct-2015 |
Baligh Uddin <baligh@google.com> |
am bbc58c8e: (-s ours) am 9bc58b22: (-s ours) am af710f26: (-s ours) Import translations. DO NOT MERGE
am: 5478334cb2 -s ours
* commit '5478334cb2b58e52b6f126cb92e15fac98247b56':
Import translations. DO NOT MERGE
|
| 607dd25c3b63811e7be6c291f67295fba99682bc |
29-Oct-2015 |
Geoff Mendal <mendal@google.com> |
am c51c0cce: (-s ours) am 9ecaa9d5: (-s ours) Import translations. DO NOT MERGE
am: 5ebf317088 -s ours
* commit '5ebf3170886d05cd98bb5ee28ecc5e1142f61d31':
|
| cdca7806397671e3d26dc6af12ab89fa08e2c703 |
29-Oct-2015 |
Geoff Mendal <mendal@google.com> |
am d5242e10: (-s ours) am 74f2fe5f: (-s ours) am b2fd1224: (-s ours) am 9ecaa9d5: (-s ours) Import translations. DO NOT MERGE
am: 3c4a34dbfd -s ours
* commit '3c4a34dbfdf82a0e07bdcb8df4027e4e53365bfc':
|
| 02a8422ac2022e5cff71e0d33e44a456db7c4c9c |
29-Oct-2015 |
Geoff Mendal <mendal@google.com> |
am 15ed190c: (-s ours) am 26cfbd02: (-s ours) am 6eb32063: (-s ours) Import translations. DO NOT MERGE
am: 86df144c2d -s ours
* commit '86df144c2d3db2ed8d33dadba7c4ee91e0849171':
Import translations. DO NOT MERGE
|
| e686b46269f62dc898454497bfb4d041382cc1cd |
29-Oct-2015 |
Chris Craik <ccraik@google.com> |
am 5aaad90d: am 9ac94b56: Increment kAwDrawGLInfoVersion
am: 4246c67a9f
* commit '4246c67a9fe7c7a20ebe94c7f7b51b6e5fe3d9c5':
|
| 0682bc6aae2d3f3a3431e473f054fdae2002c66d |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am b12a26af: (-s ours) Merge WebView M40 build 1832189 into AOSP.
am: 8a4494dad1
* commit '8a4494dad13229047458a4373992cb933556d6d9':
|
| 41fe611d3adfce340b2aa52c54248b6a82290096 |
29-Oct-2015 |
Douglas Leung <douglas.leung@imgtec.com> |
am 40c98893: (-s ours) Add version code support for mips64.
am: 7a39ba25c6
* commit '7a39ba25c674c203e66d2348c7f282212ab432e7':
Add version code support for mips64.
|
| 08d2ac08e816b3a79299bcd59e394841e290c5f6 |
29-Oct-2015 |
Bo Liu <boliu@google.com> |
am 1e5f4268: (-s ours) Cherry-pick: aw: Make repeated detachGLFunctor work
am: cefd43d200
* commit 'cefd43d200689bd49cd4f4309fc888d2235fa895':
Cherry-pick: aw: Make repeated detachGLFunctor work
|
| bd246cf84a6716e19b76734ce55cd2f86545596c |
29-Oct-2015 |
Mikhail Naganov <mnaganov@google.com> |
am 00384b92: (-s ours) Merge "Provide OSS notice file for WebView, hook to Settings" into m40
am: 7c4bc794d7
* commit '7c4bc794d7cd82ee61da5004a2ae3a15cec6d4f4':
Provide OSS notice file for WebView, hook to Settings
|
| b4b3d7535560d3938128d6cfd6b84190697651fb |
29-Oct-2015 |
Mikhail Naganov <mnaganov@google.com> |
am 3b842054: (-s ours) Revert "Provide OSS notice file for WebView, hook to Settings"
am: 37c1dba51c
* commit '37c1dba51c74b043169c1600880a93fc3a17d7b2':
Revert "Provide OSS notice file for WebView, hook to Settings"
|
| 52f5e38956b9ee6079c182ce5c90d2018e7de983 |
29-Oct-2015 |
Mikhail Naganov <mnaganov@google.com> |
am 089bb9f1: (-s ours) Provide OSS notice file for WebView, hook to Settings
am: 0456195483
* commit '0456195483d24cf16cf38f5153dc9a52e335969c':
Provide OSS notice file for WebView, hook to Settings
|
| c9d6ed7896eb3c21b8315431cb56e47b52aa72f4 |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am 99c3fbb3: Update M40 glue layer from master.
am: 098ae7953f
* commit '098ae7953fd9e9c37dccdd02fdf8b5a8e02eb666':
|
| a6687f66cc4725b1b0256c87f7c347a47f3d9565 |
29-Oct-2015 |
Geoff Mendal <mendal@google.com> |
am a1d6b6b7: (-s ours) am f7b7ef98: (-s ours) Import translations. DO NOT MERGE
am: 18b990d62e -s ours
* commit '18b990d62e3537089a301f93af474e374b4a150f':
|
| b8d49cd3dc49a4a67c16f85c9277ab22007c0c9f |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am 8818e82a: Remove no-longer-used webview glue sources.
am: a813945b33
* commit 'a813945b33d4daffd3b417ea813c912c91e27a9e':
|
| ba09312185f77176a8d14e8c8774ef30b757e4de |
29-Oct-2015 |
Richard Coles <torne@google.com> |
am 2b22e3a2: (-s ours) Merge "Add version code support for mips64."
am: 3ae02df280
* commit '3ae02df2802c6fd61dc78604ab22c90dc07d6849':
Add version code support for mips64.
|
| 36a60ca8e64e05aaceac4d69cd6a043955533d6c |
29-Oct-2015 |
Selim Gurun <sgurun@google.com> |
am f2e74977: (-s ours) am 4a38c0de: Merge "Revert "Implement stub functions""
am: 640d1800bb
* commit '640d1800bb9d3c8b62747425cb678e9d7a4ff788':
Revert "Implement stub functions"
|
| e3c73bbdb0c0a203abdb4dda2d22cb871bb6b9f8 |
29-Oct-2015 |
Selim Gurun <sgurun@android.com> |
am 8898ecf7: (-s ours) am 7ed31a7d: Merge "Implement stub functions"
am: 6cbd83bf0c
* commit '6cbd83bf0cb56354a84f8f2d31966b246d28c982':
Implement stub functions
|
| d0c6b4aa9a5ef01c747ab26521e810226bd7b956 |
29-Oct-2015 |
Geoff Mendal <mendal@google.com> |
am 20135337: (-s ours) Import translations. DO NOT MERGE
am: 64363b84e3 -s ours
* commit '64363b84e3850486220ddf143169e21bdcc97bf6':
Import translations. DO NOT MERGE
|
| 99455338d9c7427b5a50f64ee89814402a3623e5 |
29-Oct-2015 |
Martin Kosiba <mkosiba@android.com> |
am 3f6ae772: (-s ours) am a770a09c: Merge "Fix remaining references to hidden fields."
am: ac1749bb56
* commit 'ac1749bb56e7a6b26abdd76b92c39f1b20c1ad57':
Fix remaining references to hidden fields.
|
| 1db07fc8a1bb2b2bfc5e1fcf7cf95457c7371de0 |
29-Oct-2015 |
Narayan Kamath <narayan@google.com> |
am 656ec984: (-s ours) resolved conflicts for merge of 83f6e3db to lmp-mr1-dev-plus-aosp
am: 286fb39a13
* commit '286fb39a13c395a713552b0e53c7b2e57429e7d7':
Track move of android.net.http.ErrorStrings.
|
| 94686e19f3915f63056d1380d5f4019eaf585f6a |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am 70949955: (-s ours) resolved conflicts for merge of d83e7f76 to lmp-mr1-dev-plus-aosp
am: bc3ce4136d
* commit 'bc3ce4136d77a4442a65b7db5a47229bb2d6fab2':
|
| 3043e44bcce43532d4536fbe5a4a8e457815ab17 |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am 30219730: (-s ours) resolved conflicts for merge of 4e0495ed to lmp-mr1-dev-plus-aosp
am: 4afe4d33ef
* commit '4afe4d33efd6c5203f524be0dc1e738ac0aa772b':
|
| c574cf5c091a964c1f9eca8ed9786e7ecc87ae03 |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am 539a1372: (-s ours) Merge correct version of glue layer.
am: 3d25aefa06
* commit '3d25aefa06493c44fc9cbc64385638aeea44eff7':
Add support for SmartClip interface in the glue layer.
[WebView] Start building against the System SDK.
[WebView] Remove direct dependencies on hidden APIs.
[WebView] Remove unused method in CookieManager
[WebView] Remove dependencies on DebugFlags.
[WebView] Remove dependency on Build.IS_DEBUGGABLE.
[WebView] Remove dependency on FileUtils.
Always add the path to the WebView assets.
Remove DRP manager code
Fix reflection for detecting fullscreen API support.
Match removal of config_webSettingsDefaultTextEncoding.
|
| 19f2e46a930e76e05bba8332794164050207e5af |
29-Oct-2015 |
Baligh Uddin <baligh@google.com> |
am 469cf491: (-s ours) am 9ee9488a: (-s ours) Import translations. DO NOT MERGE
am: 8128f66b97 -s ours
* commit '8128f66b97be8ce406864af954104c41a3ae4b4c':
Import translations. DO NOT MERGE
|
| 0781b2f2be9e0ffc4ef2be617f3377a74121ecf0 |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am 538dc44f: (-s ours) am 4bb8eed6: Revert "Wrap one more Context"
am: 8a98e0817c
* commit '8a98e0817cb5fa43eae7dfc127704a776021ace9':
Revert "Wrap one more Context"
|
| a5dc90acdb57214fee0e5f322d8afb98b311b0e2 |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am 9ca4f33e: (-s ours) am 3180c1cc: resolved conflicts for merge of 5a706141 to stage-aosp-master
am: 9fdcac7c30
* commit '9fdcac7c30346ac7f8a0b14c6bfa83b0204a7883':
Remove the default text encoding resource.
Wrap one more Context
|
| 200141ef1f44e1cbbce8c780e325de2b86f6bf71 |
29-Oct-2015 |
Marcin Kosiba <mkosiba@google.com> |
am 512dab0c: (-s ours) am a837930e: am 53dc1aa9: Match removal of config_webSettingsDefaultTextEncoding.
am: c92f7b205d
* commit 'c92f7b205db77b5096c140d72112022316cf3bd9':
Match removal of config_webSettingsDefaultTextEncoding.
|
| ae2009e79b396cbda05f075b3789a93f2e1726f3 |
29-Oct-2015 |
Ben Murdoch <benm@google.com> |
am ba3f200c: (-s ours) am b762bbe6: am 0c6c259a: Merge "Use overridden resources." into lmp-dev
am: bd20dadd12
* commit 'bd20dadd12b3eb7df996443bdcb8f3230d48b4b3':
Use overridden resources.
|
| 75090441252ee90d3d343750ec15d4c9af09d6a5 |
29-Oct-2015 |
Marcin Kosiba <mkosiba@google.com> |
am 6fb047a8: (-s ours) Match removal of config_webSettingsDefaultTextEncoding.
am: a98405eca2
* commit 'a98405eca23f6412063bc0a004e0d18a2672193c':
Match removal of config_webSettingsDefaultTextEncoding.
|
| c20f425f8447e5fda6c04a44ec8797e10c4173ab |
29-Oct-2015 |
Primiano Tucci <primiano@google.com> |
am 39781a2a: (-s ours) Reset the state of lmp-mr1-dev-plus-aosp to match lmp-dev-plus-aosp
am: 977fa9efe1
* commit '977fa9efe1fb36dfb389f21211d483a4d40e1e7c':
Webview: Remove dexpreopt flag
Remove WebView DRP Setting from Developer Settings
Suport initializing DRP from cmd line switches.
Wrap all of the WebView Contexts
WebView does not require a touch screen.
Update WebView manifest to target/minSDK 21.
Fix resource rewriting in apps with other shared libs.
Use drawables instead of mipmap for WebView icon.
WebViewChromiumFactoryProvider should import ResourceExtractor fromorg.chromium.base
Update some content classes to content_public
Don't declare WebView as a library.
|
| 79b4a56ad8478d4dfb22654f3d71ce9df2ce4a59 |
29-Oct-2015 |
Baligh Uddin <baligh@google.com> |
am 0113e744: (-s ours) am df873b4a: (-s ours) Import translations. DO NOT MERGE
am: 8e01be4acb -s ours
* commit '8e01be4acb3253cbc8ab6facf8c2184818020581':
Import translations. DO NOT MERGE
|
| b1a8d31413e51808a5590970be4f93fad53b9b3b |
29-Oct-2015 |
Baligh Uddin <baligh@google.com> |
am b17c1161: (-s ours) am adcbfb74: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
am: 98a9d85689 -s ours
* commit '98a9d85689fb653364967aa571d262e299b55a35':
Import translations. DO NOT MERGE
|
| 3029018a9b0854defcf5852bd00b088c8d8afb01 |
29-Oct-2015 |
Ying Wang <wangying@google.com> |
am 9aa2f10b: (-s ours) am a8cbb40a: Disable dex-preopt.
am: 26b7b26b3e
* commit '26b7b26b3e450528be8972f59b32a7ac6dccbe86':
Disable dex-preopt.
|
| 7656e66d39a3240dc3cfaa437dc52449f7d3b172 |
29-Oct-2015 |
Marcin Kosiba <mkosiba@google.com> |
am 1a4c1664: (-s ours) am fae9ed9a: Merge "Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev
am: 122d1a71f0
* commit '122d1a71f074cf217ab4c7be9e1cc417d54a3791':
Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
|
| 2045f03c29d8b96807c5d8d699550366ed3e3624 |
29-Oct-2015 |
Marcin Kosiba <mkosiba@google.com> |
am 8e6f4d6a: (-s ours) am a17d86e9: Don\'t use reflection to rewrite the WebView resources.
am: bf990ae2a5
* commit 'bf990ae2a587036cf21db5eb80a5d9b54c990e86':
Don't use reflection to rewrite the WebView resources.
|
| 2fe7807a61db1a45d3767ea4a115e39e496dc1cb |
29-Oct-2015 |
Ben Murdoch <benm@google.com> |
am 3b3a02d1: (-s ours) am 4510b8d1: Merge "Remove check for styleable resources in WebView ResourceRewriter." into lmp-dev
am: f6a305dd30
* commit 'f6a305dd308709c756a228ed64e7d6f2196a7441':
Remove check for styleable resources in WebView ResourceRewriter.
|
| 1c6ae39b13e1a0bfb55d6bed145df1e66a8afede |
29-Oct-2015 |
Tao Bai <michaelbai@google.com> |
am 0d3c16f8: (-s ours) am 35716689: Implement FileChooserParams.createIntent and parseResult
am: f44d74c435
* commit 'f44d74c435216fcdf13d11d4f53798a88f27f7a8':
Implement FileChooserParams.createIntent and parseResult
|
| f11939138d4c18bfbe42bf0cf290c693d5aa9d0f |
29-Oct-2015 |
Marcin Kosiba <mkosiba@google.com> |
am eb387421: (-s ours) am 98f9a279: Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
am: 49b02d48d0
* commit '49b02d48d09a12a70789653a2a5b56d00ef39528':
Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
|
| 9ab34c1db6f516354821caf42c6e984b9bf07d8d |
29-Oct-2015 |
Selim Gurun <sgurun@google.com> |
am e41e1345: (-s ours) am 5b026de6: Remove the plumbing for optOutDataReductionProxy API
am: 6ca2fc89ac
* commit '6ca2fc89acd0dc002c814f5710af5d90bb43623a':
Remove the plumbing for optOutDataReductionProxy API
|
| 8ebe53e3dd3d70c9c9013f8b0385cf656fc78da5 |
29-Oct-2015 |
Selim Gurun <sgurun@google.com> |
am 44d477c1: (-s ours) Remove the plumbing for optOutDataReductionProxy API
am: de93e720ab
* commit 'de93e720abc0f0d54f13a00575a5db376b6c8541':
Remove the plumbing for optOutDataReductionProxy API
|
| 8ed359fc986e92e085d47e5c9d6b4569b2e9ed34 |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am 30808fe0: (-s ours) Skip commits up to 76399f9 from AOSP.
am: e248b43f99
* commit 'e248b43f9904d3643626896757900de1a4761adc':
Don't declare WebView as a library.
|
| d703f0ca87e209942210eaaa04afdbaaf929f4ce |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am a71fdd6c: (-s ours) Merge "Make init command line happen early"
am: ee25a61b5d
* commit 'ee25a61b5dea5296d7397df4d6507cd569858689':
Make init command line happen early
|
| bf40c5afd5dbd91a9fedbe5537a64893a9310a90 |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am 98fae68c: (-s ours) Skip commits up to b20a4cb from AOSP.
am: 95e900d8a0
* commit '95e900d8a06d741a0b0127020172e7544cf0a0f8':
Don't use android.internal.R for resources.
AOSP-only changes to support the WebView loading from an APK.
Generate symlinks to libwebviewchromium.so in /system/priv-app
Generate resources before running aapt.
Include pak files in the WebView apk.
Move WebView resources to separate APK
Add com.android.webview to the package whitelist.
Make the WebView Java library into an APK.
|
| eee7f869d446eb6634ad143712caedc62a1da666 |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am 78e79ef7: (-s ours) Skip commits up to 2846d3c from AOSP.
am: 254320149b
* commit '254320149bf5883c671316114dae56691bd4c3ce':
Change function table assignment to allow new fields
Force software draws in AOSP
Force software draws in AOSP
Fix WebView crash on startup due to missing resource.
Match API changes from http://crrev.com/284123004
Add plumbing for the new fullscreen video path.
Make DrawGLFunctor work on 64-bit platforms.
|
| 72198ac3e32da100152b61c5ec7572cd77b0bf92 |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am d59fae72: (-s ours) Update from lmp-dev.
am: c2ab17cd3c
* commit 'c2ab17cd3cf3fd86fb741fa118dcc8a3ce689c64': (51 commits)
Suppress StrictMode warning reading command line file.
Update API name to comply with changes to API
Update WebView APK name.
Cherry-pick: Remove debug logging.
Disable building the APK when a prebuilt is in use.
WebView fix for devices running <LRW48.
Enable wrap_contents quirk for apps targetting pre-L SDK.
Update WebViewFlingTest to use new UiAutomator API.
Finish zoomBy API hookup.
Do not read DRP key from GServices
Delete profile data if the WebView is downgraded.
Add version to public structs
Set native pointers before initialization
Add a trace event for AwBrowserProcess.loadLibrary.
Generate version data for the WebView package.
Cherry-pick: [WebView] Notify Chromium whether the app supports fullscreen.
Fix merge_from_chromium.py script to work with new buildspec repo
Increase char limit for private browsing warning.
Start reading drp setting from GoogleSetting
Revert version code to 1
...
|
| 4aaf5bba8ee0444de0ecb4c77af39fe4cc6e6d74 |
29-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
am e64f201d: (-s ours) am f250ae82: (-s ours) Merge "Merge up to 33b9fe6 from chromium-dev."
am: e1760e0969
* commit 'e1760e09693ac1b0a6f382e513915169033001f7':
Update WebViewChromium to match http://crrev.com/274153002
|
| 6e4cd25875d394c87ed3fdbff6c979f1c013f324 |
29-Oct-2015 |
Baligh Uddin <baligh@google.com> |
am ddabdb61: (-s ours) Import translations. DO NOT MERGE
am: 53fe47f347 -s ours
* commit '53fe47f3475e13a61a7fc701c5e43c8410433880':
Import translations. DO NOT MERGE
|
| a77a01719ac57d718d84fe67038a2e0599f12856 |
29-Oct-2015 |
Hector Dearman <hjd@google.com> |
am 070f9117: (-s ours) Merge "Add Third Party Cookie API" into lmp-dev
am: 3ef7df8e9b
* commit '3ef7df8e9b89dbc131f8565965286e55f135e7e8':
Add Third Party Cookie API
|
| 99b23f4da5ecf90b697f653e76efa9be8d1bcb2d |
29-Oct-2015 |
Ben Murdoch <benm@google.com> |
am 881717f6: (-s ours) Merge "Implement WebViewChromium.preauthorizePermission." into lmp-dev
am: ae8ca01feb
* commit 'ae8ca01feb9cdd0c66e79705fcffa78e1a785c26':
Implement WebViewChromium.preauthorizePermission.
|
| dce3cfafbd8d94f8f5f7fd86e0bf552de38b63e4 |
27-Oct-2015 |
Torne (Richard Coles) <torne@google.com> |
Merge from M up to 9ecaa9d.
* commit '9ecaa9d5af42effca6b4701d70d234029d447a2e':
Import translations. DO NOT MERGE
Increment kAwDrawGLInfoVersion
Import translations. DO NOT MERGE
Remove no-longer-used webview glue sources.
Change-Id: I7655ead2253a9598abfe960d152fbbcbd2bbb79c
|
| 25e6573e78dd67974e5cd62e3d2b44b5dbb27f78 |
26-Oct-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE am: 7102c3675f -s ours
am: ec4623ce5c -s ours
* commit 'ec4623ce5c4d35869d6030c55d1b73de8f76bcc6':
Import translations. DO NOT MERGE
|
| ec4623ce5c4d35869d6030c55d1b73de8f76bcc6 |
26-Oct-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
am: 7102c3675f -s ours
* commit '7102c3675f5058706dbf1cc62b23c014b167b75e':
Import translations. DO NOT MERGE
|
| 7102c3675f5058706dbf1cc62b23c014b167b75e |
26-Oct-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I321460befaa0bc076b4225814e6d68c900678a33
Auto-generated-cl: translation import
hromium/listing/res/values-fa/strings.xml
|
| c26256259e05934d60c733c5d542b8b260f97c84 |
21-Oct-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE am: bb3e2d9b51 -s ours
am: ba480fd949 -s ours
* commit 'ba480fd949f1ad36469f7f866e5ed990cfcf54f2':
Import translations. DO NOT MERGE
|
| ba480fd949f1ad36469f7f866e5ed990cfcf54f2 |
21-Oct-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
am: bb3e2d9b51 -s ours
* commit 'bb3e2d9b5128e9b21290a7b63df0c6c49291957f':
Import translations. DO NOT MERGE
|
| bb3e2d9b5128e9b21290a7b63df0c6c49291957f |
21-Oct-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I277ca2ed07fb5786a38156ef165b632698664127
Auto-generated-cl: translation import
hromium/listing/res/values-bn-rBD/strings.xml
hromium/listing/res/values-en-rAU/strings.xml
hromium/listing/res/values-en-rGB/strings.xml
hromium/listing/res/values-en-rIN/strings.xml
hromium/listing/res/values-gu-rIN/strings.xml
hromium/listing/res/values-kn-rIN/strings.xml
hromium/listing/res/values-nl/strings.xml
hromium/listing/res/values-pt-rBR/strings.xml
hromium/listing/res/values-sq-rAL/strings.xml
|
| d5ff3390f1444ea122b2a91edf28dac4f99f4fbe |
20-Oct-2015 |
Qiwen Zhao <zhao@google.com> |
Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: a082f08797 am: f5deeec57f am: b8de50cfea
am: d2460a5c9d
* commit 'd2460a5c9db4f157469d4bce1433c7131fda6b8f':
Fix WebView targetSDK checks.
Add support for SmartClip interface in the glue layer.
Always add the path to the WebView assets.
|
| d2460a5c9db4f157469d4bce1433c7131fda6b8f |
20-Oct-2015 |
Qiwen Zhao <zhao@google.com> |
Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: a082f08797 am: f5deeec57f
am: b8de50cfea
* commit 'b8de50cfea6364a1cddac50b987c9cda40f53dbb': (120 commits)
Revert "Implement stub functions"
Implement stub functions
Add version code support for mips64.
Import translations. DO NOT MERGE
Fix remaining references to hidden fields.
Track move of android.net.http.ErrorStrings.
Fix WebView targetSDK checks.
Add support for SmartClip interface in the glue layer.
[WebView] Start building against the System SDK.
[WebView] Remove direct dependencies on hidden APIs.
[WebView] Remove unused method in CookieManager
Add support for SmartClip interface in the glue layer.
[WebView] Remove dependencies on DebugFlags.
[WebView] Remove dependency on Build.IS_DEBUGGABLE.
Import translations. DO NOT MERGE
Revert "Wrap one more Context"
[WebView] Remove dependency on FileUtils.
Always add the path to the WebView assets.
Always add the path to the WebView assets.
Remove DRP manager code
...
|
| b8de50cfea6364a1cddac50b987c9cda40f53dbb |
20-Oct-2015 |
Qiwen Zhao <zhao@google.com> |
Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: a082f08797
am: f5deeec57f
* commit 'f5deeec57f4caaca1478dafa567c7d13df1cfa17': (120 commits)
Revert "Implement stub functions"
Implement stub functions
Add version code support for mips64.
Import translations. DO NOT MERGE
Fix remaining references to hidden fields.
Track move of android.net.http.ErrorStrings.
Fix WebView targetSDK checks.
Add support for SmartClip interface in the glue layer.
[WebView] Start building against the System SDK.
[WebView] Remove direct dependencies on hidden APIs.
[WebView] Remove unused method in CookieManager
Add support for SmartClip interface in the glue layer.
[WebView] Remove dependencies on DebugFlags.
[WebView] Remove dependency on Build.IS_DEBUGGABLE.
Import translations. DO NOT MERGE
Revert "Wrap one more Context"
[WebView] Remove dependency on FileUtils.
Always add the path to the WebView assets.
Always add the path to the WebView assets.
Remove DRP manager code
...
|
| f5deeec57f4caaca1478dafa567c7d13df1cfa17 |
20-Oct-2015 |
Qiwen Zhao <zhao@google.com> |
Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev
am: a082f08797
* commit 'a082f08797d44164d1c735b4f0a9d4f94b1d1410': (120 commits)
Revert "Implement stub functions"
Implement stub functions
Add version code support for mips64.
Import translations. DO NOT MERGE
Fix remaining references to hidden fields.
Track move of android.net.http.ErrorStrings.
Fix WebView targetSDK checks.
Add support for SmartClip interface in the glue layer.
[WebView] Start building against the System SDK.
[WebView] Remove direct dependencies on hidden APIs.
[WebView] Remove unused method in CookieManager
Add support for SmartClip interface in the glue layer.
[WebView] Remove dependencies on DebugFlags.
[WebView] Remove dependency on Build.IS_DEBUGGABLE.
Import translations. DO NOT MERGE
Revert "Wrap one more Context"
[WebView] Remove dependency on FileUtils.
Always add the path to the WebView assets.
Always add the path to the WebView assets.
Remove DRP manager code
...
|
| a082f08797d44164d1c735b4f0a9d4f94b1d1410 |
20-Oct-2015 |
Qiwen Zhao <zhao@google.com> |
Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into mnc-dev
|
| 8d19e50490bc9acf8fbdb3e4dc405596505d5c5c |
14-Oct-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I809aa4c2fb392db780d33256f899ec4324ee7d97
Auto-generated-cl: translation import
hromium/res/values-zh-rCN/strings.xml
|
| 10b3d389e251aa3086440a7390c1a7a96568b78d |
29-Sep-2015 |
Baligh Uddin <baligh@google.com> |
am 379c1660: (-s ours) Import translations. DO NOT MERGE
* commit '379c16606cce7e903c4d8ff458fea79e34fc2299':
Import translations. DO NOT MERGE
|
| 379c16606cce7e903c4d8ff458fea79e34fc2299 |
29-Sep-2015 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I4dfe698b18cff6df918a2806b7c52a8df059e98b
Auto-generated-cl: translation import
hromium/listing/res/values-bn-rBD/strings.xml
hromium/listing/res/values-en-rAU/strings.xml
hromium/listing/res/values-en-rGB/strings.xml
hromium/listing/res/values-en-rIN/strings.xml
hromium/listing/res/values-kn-rIN/strings.xml
hromium/listing/res/values-nl/strings.xml
hromium/listing/res/values-pt-rBR/strings.xml
|
| 5478334cb2b58e52b6f126cb92e15fac98247b56 |
19-Sep-2015 |
Baligh Uddin <baligh@google.com> |
am bbc58c8e: (-s ours) am 9bc58b22: (-s ours) am af710f26: (-s ours) Import translations. DO NOT MERGE
* commit 'bbc58c8eda9f054c458c7b93f133d0bf03601314':
Import translations. DO NOT MERGE
|
| bbc58c8eda9f054c458c7b93f133d0bf03601314 |
19-Sep-2015 |
Baligh Uddin <baligh@google.com> |
am 9bc58b22: (-s ours) am af710f26: (-s ours) Import translations. DO NOT MERGE
* commit '9bc58b22e64a50408d4af874d02af58c9a148d4a':
Import translations. DO NOT MERGE
|
| 9bc58b22e64a50408d4af874d02af58c9a148d4a |
19-Sep-2015 |
Baligh Uddin <baligh@google.com> |
am af710f26: (-s ours) Import translations. DO NOT MERGE
* commit 'af710f265a2502289955875c1810f4f825370da6':
Import translations. DO NOT MERGE
|
| af710f265a2502289955875c1810f4f825370da6 |
18-Sep-2015 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ib7c3c0833967db07378d1ae04829d38cc4b24777
Auto-generated-cl: translation import
hromium/listing/res/values-en-rAU/strings.xml
hromium/listing/res/values-en-rGB/strings.xml
hromium/listing/res/values-en-rIN/strings.xml
hromium/listing/res/values-gu-rIN/strings.xml
hromium/listing/res/values-nl/strings.xml
hromium/listing/res/values-pt-rBR/strings.xml
|
| 5ebf3170886d05cd98bb5ee28ecc5e1142f61d31 |
27-Aug-2015 |
Geoff Mendal <mendal@google.com> |
am c51c0cce: (-s ours) am 9ecaa9d5: (-s ours) Import translations. DO NOT MERGE
* commit 'c51c0cceb60fa59ee99cba78ae4932cba5b13717':
|
| 01ab01987c123e633159788e8e477a28c4b831b0 |
22-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I00c02b54c03ed2ad2a71724fb1fb78b03869b4bf
Auto-generated-cl: translation import
hromium/res/values-pt-rBR/strings.xml
|
| 00fd8bbd9aa28cdd14853ed6189124ed59c70189 |
20-Jul-2015 |
Torne (Richard Coles) <torne@google.com> |
Remove play store listing info.
We translate this elsewhere now so it no longer needs to be in the
Android tree.
Change-Id: Ibfc56c114dfae31ebfaed69d59b0162aa87796b4
hromium/listing/res/values-af/strings.xml
hromium/listing/res/values-am/strings.xml
hromium/listing/res/values-ar/strings.xml
hromium/listing/res/values-az-rAZ/strings.xml
hromium/listing/res/values-bg/strings.xml
hromium/listing/res/values-bn-rBD/strings.xml
hromium/listing/res/values-ca/strings.xml
hromium/listing/res/values-cs/strings.xml
hromium/listing/res/values-da/strings.xml
hromium/listing/res/values-de/strings.xml
hromium/listing/res/values-el/strings.xml
hromium/listing/res/values-en-rAU/strings.xml
hromium/listing/res/values-en-rGB/strings.xml
hromium/listing/res/values-en-rIN/strings.xml
hromium/listing/res/values-es-rUS/strings.xml
hromium/listing/res/values-es/strings.xml
hromium/listing/res/values-et-rEE/strings.xml
hromium/listing/res/values-eu-rES/strings.xml
hromium/listing/res/values-fa/strings.xml
hromium/listing/res/values-fi/strings.xml
hromium/listing/res/values-fr-rCA/strings.xml
hromium/listing/res/values-fr/strings.xml
hromium/listing/res/values-gl-rES/strings.xml
hromium/listing/res/values-gu-rIN/strings.xml
hromium/listing/res/values-hi/strings.xml
hromium/listing/res/values-hr/strings.xml
hromium/listing/res/values-hu/strings.xml
hromium/listing/res/values-hy-rAM/strings.xml
hromium/listing/res/values-in/strings.xml
hromium/listing/res/values-is-rIS/strings.xml
hromium/listing/res/values-it/strings.xml
hromium/listing/res/values-iw/strings.xml
hromium/listing/res/values-ja/strings.xml
hromium/listing/res/values-ka-rGE/strings.xml
hromium/listing/res/values-kk-rKZ/strings.xml
hromium/listing/res/values-km-rKH/strings.xml
hromium/listing/res/values-kn-rIN/strings.xml
hromium/listing/res/values-ko/strings.xml
hromium/listing/res/values-ky-rKG/strings.xml
hromium/listing/res/values-lo-rLA/strings.xml
hromium/listing/res/values-lt/strings.xml
hromium/listing/res/values-lv/strings.xml
hromium/listing/res/values-mk-rMK/strings.xml
hromium/listing/res/values-ml-rIN/strings.xml
hromium/listing/res/values-mn-rMN/strings.xml
hromium/listing/res/values-mr-rIN/strings.xml
hromium/listing/res/values-ms-rMY/strings.xml
hromium/listing/res/values-my-rMM/strings.xml
hromium/listing/res/values-nb/strings.xml
hromium/listing/res/values-ne-rNP/strings.xml
hromium/listing/res/values-nl/strings.xml
hromium/listing/res/values-pa-rIN/strings.xml
hromium/listing/res/values-pl/strings.xml
hromium/listing/res/values-pt-rPT/strings.xml
hromium/listing/res/values-pt/strings.xml
hromium/listing/res/values-ro/strings.xml
hromium/listing/res/values-ru/strings.xml
hromium/listing/res/values-si-rLK/strings.xml
hromium/listing/res/values-sk/strings.xml
hromium/listing/res/values-sl/strings.xml
hromium/listing/res/values-sq-rAL/strings.xml
hromium/listing/res/values-sr/strings.xml
hromium/listing/res/values-sv/strings.xml
hromium/listing/res/values-sw/strings.xml
hromium/listing/res/values-ta-rIN/strings.xml
hromium/listing/res/values-te-rIN/strings.xml
hromium/listing/res/values-th/strings.xml
hromium/listing/res/values-tl/strings.xml
hromium/listing/res/values-tr/strings.xml
hromium/listing/res/values-uk/strings.xml
hromium/listing/res/values-ur-rPK/strings.xml
hromium/listing/res/values-uz-rUZ/strings.xml
hromium/listing/res/values-vi/strings.xml
hromium/listing/res/values-zh-rCN/strings.xml
hromium/listing/res/values-zh-rHK/strings.xml
hromium/listing/res/values-zh-rTW/strings.xml
hromium/listing/res/values-zu/strings.xml
hromium/listing/res/values/strings.xml
|
| 3c4a34dbfdf82a0e07bdcb8df4027e4e53365bfc |
16-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am d5242e10: (-s ours) am 74f2fe5f: (-s ours) am b2fd1224: (-s ours) am 9ecaa9d5: (-s ours) Import translations. DO NOT MERGE
* commit 'd5242e10bf52a998798286684d444f0ca0cd324c':
Import translations. DO NOT MERGE
|
| d5242e10bf52a998798286684d444f0ca0cd324c |
16-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 74f2fe5f: (-s ours) am b2fd1224: (-s ours) am 9ecaa9d5: (-s ours) Import translations. DO NOT MERGE
* commit '74f2fe5f7b38ff06c5fb10c1512d473387d43e6c':
Import translations. DO NOT MERGE
|
| 74f2fe5f7b38ff06c5fb10c1512d473387d43e6c |
16-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am b2fd1224: (-s ours) am 9ecaa9d5: (-s ours) Import translations. DO NOT MERGE
* commit 'b2fd1224484a527c5f506ae86675d765de333fa3':
Import translations. DO NOT MERGE
|
| b2fd1224484a527c5f506ae86675d765de333fa3 |
16-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 9ecaa9d5: (-s ours) Import translations. DO NOT MERGE
* commit '9ecaa9d5af42effca6b4701d70d234029d447a2e':
Import translations. DO NOT MERGE
|
| c51c0cceb60fa59ee99cba78ae4932cba5b13717 |
16-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 9ecaa9d5: (-s ours) Import translations. DO NOT MERGE
* commit '9ecaa9d5af42effca6b4701d70d234029d447a2e':
Import translations. DO NOT MERGE
|
| 9ecaa9d5af42effca6b4701d70d234029d447a2e |
15-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I25885ec3a308bd96d81f6003dbe12695484b7e50
Auto-generated-cl: translation import
hromium/listing/res/values-bn-rBD/strings.xml
hromium/listing/res/values-gu-rIN/strings.xml
hromium/listing/res/values-kn-rIN/strings.xml
hromium/listing/res/values-sq-rAL/strings.xml
|
| 604fc4fd0e27ce32792d6747da936079e3f8a5e1 |
15-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I20321c8389000f25cc9171b7df8ce1a3736ef24e
Auto-generated-cl: translation import
hromium/listing/res/values-gu-rIN/strings.xml
|
| 86df144c2d3db2ed8d33dadba7c4ee91e0849171 |
13-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 15ed190c: (-s ours) am 26cfbd02: (-s ours) am 6eb32063: (-s ours) Import translations. DO NOT MERGE
* commit '15ed190c1148ef38b952cd293a77ab9df69190ab':
Import translations. DO NOT MERGE
|
| 15ed190c1148ef38b952cd293a77ab9df69190ab |
13-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 26cfbd02: (-s ours) am 6eb32063: (-s ours) Import translations. DO NOT MERGE
* commit '26cfbd025fc27791475c840813e886fe5312fc56':
Import translations. DO NOT MERGE
|
| 26cfbd025fc27791475c840813e886fe5312fc56 |
13-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 6eb32063: (-s ours) Import translations. DO NOT MERGE
* commit '6eb32063eb7d9aaae3ee3ccebe86a27a2f36aa19':
Import translations. DO NOT MERGE
|
| 6eb32063eb7d9aaae3ee3ccebe86a27a2f36aa19 |
11-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ie8eac3f74855135f99873b64790e09f89d991223
Auto-generated-cl: translation import
hromium/listing/res/values-bn-rBD/strings.xml
hromium/listing/res/values-kn-rIN/strings.xml
hromium/listing/res/values-sq-rAL/strings.xml
|
| 192af530ec7d9a330d1b592407888c3db412ad0e |
15-Jun-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: If08f04bd953d73794daa055271e662408d181dd2
Auto-generated-cl: translation import
hromium/listing/res/values-kn-rIN/strings.xml
|
| 4246c67a9fe7c7a20ebe94c7f7b51b6e5fe3d9c5 |
13-Jun-2015 |
Chris Craik <ccraik@google.com> |
am 5aaad90d: am 9ac94b56: Increment kAwDrawGLInfoVersion
* commit '5aaad90da7e00c3f274362779b29699c180cd8e7':
Increment kAwDrawGLInfoVersion
|
| 5aaad90da7e00c3f274362779b29699c180cd8e7 |
13-Jun-2015 |
Chris Craik <ccraik@google.com> |
am 9ac94b56: Increment kAwDrawGLInfoVersion
* commit '9ac94b56b31c90a50edb5f643f8afa4fd40e52d8':
Increment kAwDrawGLInfoVersion
|
| 9ac94b56b31c90a50edb5f643f8afa4fd40e52d8 |
13-Jun-2015 |
Chris Craik <ccraik@google.com> |
Increment kAwDrawGLInfoVersion
bug:17322378
Change-Id: I18e2311277dc015a74683a3f0ccc2d84605ef68c
hromium/plat_support/draw_gl.h
|
| 8a4494dad13229047458a4373992cb933556d6d9 |
12-Jun-2015 |
Torne (Richard Coles) <torne@google.com> |
am b12a26af: (-s ours) Merge WebView M40 build 1832189 into AOSP.
* commit 'b12a26afd7d137911cff560556dca646d0cb19a3':
|
| 7a39ba25c674c203e66d2348c7f282212ab432e7 |
12-Jun-2015 |
Douglas Leung <douglas.leung@imgtec.com> |
am 40c98893: (-s ours) Add version code support for mips64.
* commit '40c98893db933d5f535017125de4a763fa5c4810':
Add version code support for mips64.
|
| cefd43d200689bd49cd4f4309fc888d2235fa895 |
12-Jun-2015 |
Bo Liu <boliu@google.com> |
am 1e5f4268: (-s ours) Cherry-pick: aw: Make repeated detachGLFunctor work
* commit '1e5f42683e46df089d3446afdb9ba810eb95a07d':
Cherry-pick: aw: Make repeated detachGLFunctor work
|
| 7c4bc794d7cd82ee61da5004a2ae3a15cec6d4f4 |
12-Jun-2015 |
Mikhail Naganov <mnaganov@google.com> |
am 00384b92: (-s ours) Merge "Provide OSS notice file for WebView, hook to Settings" into m40
* commit '00384b927ef3b8177177bf1f8096e6838cb1a812':
Provide OSS notice file for WebView, hook to Settings
|
| 37c1dba51c74b043169c1600880a93fc3a17d7b2 |
12-Jun-2015 |
Mikhail Naganov <mnaganov@google.com> |
am 3b842054: (-s ours) Revert "Provide OSS notice file for WebView, hook to Settings"
* commit '3b842054b5f23dd1bc7a46104e16983a5993dce0':
Revert "Provide OSS notice file for WebView, hook to Settings"
|
| 0456195483d24cf16cf38f5153dc9a52e335969c |
12-Jun-2015 |
Mikhail Naganov <mnaganov@google.com> |
am 089bb9f1: (-s ours) Provide OSS notice file for WebView, hook to Settings
* commit '089bb9f123f3940593c123c95ca520b4ae47f2ed':
Provide OSS notice file for WebView, hook to Settings
|
| 098ae7953fd9e9c37dccdd02fdf8b5a8e02eb666 |
12-Jun-2015 |
Torne (Richard Coles) <torne@google.com> |
am 99c3fbb3: Update M40 glue layer from master.
* commit '99c3fbb3c64e1a2f55ea28b24675b00bc7a492e0':
|
| a2a5f397dd13d137acdfb720b1ae13032b7af351 |
03-Jun-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8cb42c4ed80c4d6a64abf068e4775175aebf5a2a
Auto-generated-cl: translation import
hromium/listing/res/values-bn-rBD/strings.xml
|
| 18b990d62e3537089a301f93af474e374b4a150f |
01-Jun-2015 |
Geoff Mendal <mendal@google.com> |
am a1d6b6b7: (-s ours) am f7b7ef98: (-s ours) Import translations. DO NOT MERGE
* commit 'a1d6b6b7a77552a6fbf7347aa1f0a117e0a2dbe3':
Import translations. DO NOT MERGE
|
| fe7b507af6130efb6ba51e5be6c4754a41249b03 |
01-Jun-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I63a67c0d145240851e4a8447abacf5acc88a0e27
Auto-generated-cl: translation import
hromium/listing/res/values-sq-rAL/strings.xml
|
| a1d6b6b7a77552a6fbf7347aa1f0a117e0a2dbe3 |
31-May-2015 |
Geoff Mendal <mendal@google.com> |
am f7b7ef98: (-s ours) Import translations. DO NOT MERGE
* commit 'f7b7ef98a673ea632c9b556418fbc638a54f31f2':
Import translations. DO NOT MERGE
|
| f7b7ef98a673ea632c9b556418fbc638a54f31f2 |
31-May-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: If3e356f74682531ad9b49097d4d4e5f1b8bc7ab7
Auto-generated-cl: translation import
hromium/listing/res/values-az-rAZ/strings.xml
|
| 788ff6f5ab926e7f23d51962f5aa2cb4556ff47f |
30-May-2015 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 84f4b65554524f30c5114ac3238b01e831e71419 |
30-May-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I2a15a6518a671ac07ff566872d1e8a11d27c1c5e
Auto-generated-cl: translation import
hromium/res/values-az-rAZ/strings.xml
|
| 0477f89751a67d2cbb2dc8487f6b24d242dceb5c |
30-May-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ibcd02144bdc975a632cc9787f96db5154fec8e7b
Auto-generated-cl: translation import
hromium/listing/res/values-az-rAZ/strings.xml
|
| a813945b33d4daffd3b417ea813c912c91e27a9e |
28-May-2015 |
Torne (Richard Coles) <torne@google.com> |
am 8818e82a: Remove no-longer-used webview glue sources.
* commit '8818e82a062f2031cc7af7e4d491e942c38aa7e9':
Remove no-longer-used webview glue sources.
|
| 8818e82a062f2031cc7af7e4d491e942c38aa7e9 |
28-May-2015 |
Torne (Richard Coles) <torne@google.com> |
Remove no-longer-used webview glue sources.
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
hromium/Android.mk
hromium/AndroidManifest.xml
hromium/jar_package_whitelist.txt
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/CookieManagerAdapter.java
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
hromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java
hromium/java/com/android/webview/chromium/GeolocationPermissionsAdapter.java
hromium/java/com/android/webview/chromium/GraphicsUtils.java
hromium/java/com/android/webview/chromium/ResourceRewriter.java
hromium/java/com/android/webview/chromium/ResourcesContextWrapperFactory.java
hromium/java/com/android/webview/chromium/UnimplementedWebViewApi.java
hromium/java/com/android/webview/chromium/WebBackForwardListChromium.java
hromium/java/com/android/webview/chromium/WebHistoryItemChromium.java
hromium/java/com/android/webview/chromium/WebIconDatabaseAdapter.java
hromium/java/com/android/webview/chromium/WebStorageAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
hromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java
hromium/java/com/android/webview/chromium/WebViewDelegateFactory.java
hromium/package.mk
hromium/proguard.flags
hromium/res/drawable-hdpi/ic_media_video_poster.png
hromium/res/drawable-hdpi/icon_webview.png
hromium/res/drawable-ldpi/ic_media_video_poster.png
hromium/res/drawable-mdpi/ic_media_video_poster.png
hromium/res/drawable-mdpi/icon_webview.png
hromium/res/drawable-xhdpi/ic_media_video_poster.png
hromium/res/drawable-xhdpi/icon_webview.png
hromium/res/drawable-xxhdpi/icon_webview.png
hromium/res/values-af/strings.xml
hromium/res/values-am/strings.xml
hromium/res/values-ar/strings.xml
hromium/res/values-az-rAZ/strings.xml
hromium/res/values-az/strings.xml
hromium/res/values-bg/strings.xml
hromium/res/values-bn-rBD/strings.xml
hromium/res/values-ca/strings.xml
hromium/res/values-cs/strings.xml
hromium/res/values-da/strings.xml
hromium/res/values-de/strings.xml
hromium/res/values-el/strings.xml
hromium/res/values-en-rAU/strings.xml
hromium/res/values-en-rGB/strings.xml
hromium/res/values-en-rIN/strings.xml
hromium/res/values-es-rUS/strings.xml
hromium/res/values-es/strings.xml
hromium/res/values-et-rEE/strings.xml
hromium/res/values-eu-rES/strings.xml
hromium/res/values-fa/strings.xml
hromium/res/values-fi/strings.xml
hromium/res/values-fr-rCA/strings.xml
hromium/res/values-fr/strings.xml
hromium/res/values-gl-rES/strings.xml
hromium/res/values-gu-rIN/strings.xml
hromium/res/values-hi/strings.xml
hromium/res/values-hr/strings.xml
hromium/res/values-hu/strings.xml
hromium/res/values-hy-rAM/strings.xml
hromium/res/values-in/strings.xml
hromium/res/values-is-rIS/strings.xml
hromium/res/values-it/strings.xml
hromium/res/values-iw/strings.xml
hromium/res/values-ja/strings.xml
hromium/res/values-ka-rGE/strings.xml
hromium/res/values-kk-rKZ/strings.xml
hromium/res/values-km-rKH/strings.xml
hromium/res/values-kn-rIN/strings.xml
hromium/res/values-ko/strings.xml
hromium/res/values-ky-rKG/strings.xml
hromium/res/values-lo-rLA/strings.xml
hromium/res/values-lt/strings.xml
hromium/res/values-lv/strings.xml
hromium/res/values-mk-rMK/strings.xml
hromium/res/values-ml-rIN/strings.xml
hromium/res/values-mn-rMN/strings.xml
hromium/res/values-mr-rIN/strings.xml
hromium/res/values-ms-rMY/strings.xml
hromium/res/values-my-rMM/strings.xml
hromium/res/values-nb/strings.xml
hromium/res/values-ne-rNP/strings.xml
hromium/res/values-ne/strings.xml
hromium/res/values-nl/strings.xml
hromium/res/values-pa-rIN/strings.xml
hromium/res/values-pl/strings.xml
hromium/res/values-pt-rPT/strings.xml
hromium/res/values-pt/strings.xml
hromium/res/values-ro/strings.xml
hromium/res/values-ru/strings.xml
hromium/res/values-si-rLK/strings.xml
hromium/res/values-si/strings.xml
hromium/res/values-sk/strings.xml
hromium/res/values-sl/strings.xml
hromium/res/values-sq-rAL/strings.xml
hromium/res/values-sr/strings.xml
hromium/res/values-sv/strings.xml
hromium/res/values-sw/strings.xml
hromium/res/values-ta-rIN/strings.xml
hromium/res/values-te-rIN/strings.xml
hromium/res/values-th/strings.xml
hromium/res/values-tl/strings.xml
hromium/res/values-tr/strings.xml
hromium/res/values-uk/strings.xml
hromium/res/values-ur-rPK/strings.xml
hromium/res/values-uz-rUZ/strings.xml
hromium/res/values-vi/strings.xml
hromium/res/values-zh-rCN/strings.xml
hromium/res/values-zh-rHK/strings.xml
hromium/res/values-zh-rTW/strings.xml
hromium/res/values-zu/strings.xml
hromium/res/values/strings.xml
hromium/tools/buildbot/bb_webview_tot.sh
hromium/tools/buildbot/webview_buildbot_functions.sh
hromium/tools/generate_local_manifest.py
hromium/tools/jar_check.py
hromium/tools/merge_common.py
hromium/tools/merge_from_chromium.py
hromium/tools/merge_to_android.py
hromium/tools/run_webview_cts.py
hromium/version.mk
|
| b12a26afd7d137911cff560556dca646d0cb19a3 |
27-May-2015 |
Torne (Richard Coles) <torne@google.com> |
Merge WebView M40 build 1832189 into AOSP.
|
| 40c98893db933d5f535017125de4a763fa5c4810 |
27-Feb-2015 |
Douglas Leung <douglas.leung@imgtec.com> |
Add version code support for mips64.
Change-Id: I2b71bdd83c105f9b45456b449ac91e3af0c57378
hromium/version.mk
|
| e36d1878b3f9399c440914e5c07cd03f115f6c58 |
20-May-2015 |
Ben Murdoch <benm@google.com> |
am 12399ba4: Fix WebView targetSDK checks.
* commit '12399ba4bb12154b7897cf88bee04aca0adeb770':
Fix WebView targetSDK checks.
|
| 3ae02df2802c6fd61dc78604ab22c90dc07d6849 |
27-Apr-2015 |
Richard Coles <torne@google.com> |
am 2b22e3a2: (-s ours) Merge "Add version code support for mips64."
* commit '2b22e3a20269b871c3450bc578e423465ee5d044':
Add version code support for mips64.
|
| 640d1800bb9d3c8b62747425cb678e9d7a4ff788 |
27-Apr-2015 |
Selim Gurun <sgurun@google.com> |
am f2e74977: (-s ours) am 4a38c0de: Merge "Revert "Implement stub functions""
* commit 'f2e74977bdd1ff2ba1837282c3adfcf1cc62fe13':
Revert "Implement stub functions"
|
| 6cbd83bf0cb56354a84f8f2d31966b246d28c982 |
27-Apr-2015 |
Selim Gurun <sgurun@android.com> |
am 8898ecf7: (-s ours) am 7ed31a7d: Merge "Implement stub functions"
* commit '8898ecf7d4a2da1468b9e566157bcd8e383a3fc9':
Implement stub functions
|
| 64363b84e3850486220ddf143169e21bdcc97bf6 |
27-Apr-2015 |
Geoff Mendal <mendal@google.com> |
am 20135337: (-s ours) Import translations. DO NOT MERGE
* commit '20135337834a8c6bee94dd2ae45e16dc60832480':
Import translations. DO NOT MERGE
|
| ac1749bb56e7a6b26abdd76b92c39f1b20c1ad57 |
27-Apr-2015 |
Martin Kosiba <mkosiba@android.com> |
am 3f6ae772: (-s ours) am a770a09c: Merge "Fix remaining references to hidden fields."
* commit '3f6ae772a090136a5dd9a307f5d3fd6c4e6aa3fd':
Fix remaining references to hidden fields.
|
| 286fb39a13c395a713552b0e53c7b2e57429e7d7 |
27-Apr-2015 |
Narayan Kamath <narayan@google.com> |
am 656ec984: (-s ours) resolved conflicts for merge of 83f6e3db to lmp-mr1-dev-plus-aosp
* commit '656ec98400d99448202abd5ea8e6ef96f94b40ab':
Track move of android.net.http.ErrorStrings.
|
| bc3ce4136d77a4442a65b7db5a47229bb2d6fab2 |
27-Apr-2015 |
Torne (Richard Coles) <torne@google.com> |
am 70949955: (-s ours) resolved conflicts for merge of d83e7f76 to lmp-mr1-dev-plus-aosp
* commit '70949955509754ca83446edf5031aef0df5a4a62':
|
| 4afe4d33efd6c5203f524be0dc1e738ac0aa772b |
27-Apr-2015 |
Torne (Richard Coles) <torne@google.com> |
am 30219730: (-s ours) resolved conflicts for merge of 4e0495ed to lmp-mr1-dev-plus-aosp
* commit '30219730dabe21f43f5fd6a1464165a9192243c1':
|
| 3d25aefa06493c44fc9cbc64385638aeea44eff7 |
27-Apr-2015 |
Torne (Richard Coles) <torne@google.com> |
am 539a1372: (-s ours) Merge correct version of glue layer.
* commit '539a13725846ed8b732f27ae832d952b3e7dd800':
Add support for SmartClip interface in the glue layer.
[WebView] Start building against the System SDK.
[WebView] Remove direct dependencies on hidden APIs.
[WebView] Remove unused method in CookieManager
[WebView] Remove dependencies on DebugFlags.
[WebView] Remove dependency on Build.IS_DEBUGGABLE.
[WebView] Remove dependency on FileUtils.
Always add the path to the WebView assets.
Remove DRP manager code
Fix reflection for detecting fullscreen API support.
Match removal of config_webSettingsDefaultTextEncoding.
|
| 8128f66b97be8ce406864af954104c41a3ae4b4c |
27-Apr-2015 |
Baligh Uddin <baligh@google.com> |
am 469cf491: (-s ours) am 9ee9488a: (-s ours) Import translations. DO NOT MERGE
* commit '469cf4916bf7256904f572a149fe610f602ed967':
Import translations. DO NOT MERGE
|
| 8a98e0817cb5fa43eae7dfc127704a776021ace9 |
27-Apr-2015 |
Torne (Richard Coles) <torne@google.com> |
am 538dc44f: (-s ours) am 4bb8eed6: Revert "Wrap one more Context"
* commit '538dc44fafcde6bc4fe2f76872ca0682d5ce63c1':
Revert "Wrap one more Context"
|
| 9fdcac7c30346ac7f8a0b14c6bfa83b0204a7883 |
27-Apr-2015 |
Torne (Richard Coles) <torne@google.com> |
am 9ca4f33e: (-s ours) am 3180c1cc: resolved conflicts for merge of 5a706141 to stage-aosp-master
* commit '9ca4f33e3a20e100af0390af4035382f7caa47eb':
Remove the default text encoding resource.
Wrap one more Context
|
| c92f7b205db77b5096c140d72112022316cf3bd9 |
27-Apr-2015 |
Marcin Kosiba <mkosiba@google.com> |
am 512dab0c: (-s ours) am a837930e: am 53dc1aa9: Match removal of config_webSettingsDefaultTextEncoding.
* commit '512dab0c0bc1590abc7032b262ccd33619eb0e9a':
Match removal of config_webSettingsDefaultTextEncoding.
|
| bd20dadd12b3eb7df996443bdcb8f3230d48b4b3 |
27-Apr-2015 |
Ben Murdoch <benm@google.com> |
am ba3f200c: (-s ours) am b762bbe6: am 0c6c259a: Merge "Use overridden resources." into lmp-dev
* commit 'ba3f200c4021682057c693648165f2d55f48ddbc':
Use overridden resources.
|
| a98405eca23f6412063bc0a004e0d18a2672193c |
27-Apr-2015 |
Marcin Kosiba <mkosiba@google.com> |
am 6fb047a8: (-s ours) Match removal of config_webSettingsDefaultTextEncoding.
* commit '6fb047a878a348b9fe333631fb68f23a384099c7':
Match removal of config_webSettingsDefaultTextEncoding.
|
| 977fa9efe1fb36dfb389f21211d483a4d40e1e7c |
27-Apr-2015 |
Primiano Tucci <primiano@google.com> |
am 39781a2a: (-s ours) Reset the state of lmp-mr1-dev-plus-aosp to match lmp-dev-plus-aosp
* commit '39781a2ada7233e0427844f4b7eef39170696bc5':
Webview: Remove dexpreopt flag
Remove WebView DRP Setting from Developer Settings
Suport initializing DRP from cmd line switches.
Wrap all of the WebView Contexts
WebView does not require a touch screen.
Update WebView manifest to target/minSDK 21.
Fix resource rewriting in apps with other shared libs.
Use drawables instead of mipmap for WebView icon.
WebViewChromiumFactoryProvider should import ResourceExtractor fromorg.chromium.base
Update some content classes to content_public
Don't declare WebView as a library.
|
| 8e01be4acb3253cbc8ab6facf8c2184818020581 |
26-Apr-2015 |
Baligh Uddin <baligh@google.com> |
am 0113e744: (-s ours) am df873b4a: (-s ours) Import translations. DO NOT MERGE
* commit '0113e744f224d10a0a6ec6d170696e768dfe3b6f':
Import translations. DO NOT MERGE
|
| 98a9d85689fb653364967aa571d262e299b55a35 |
26-Apr-2015 |
Baligh Uddin <baligh@google.com> |
am b17c1161: (-s ours) am adcbfb74: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'b17c11610c13d561203adfbf0d10e59734e52efb':
Import translations. DO NOT MERGE
|
| 26b7b26b3e450528be8972f59b32a7ac6dccbe86 |
26-Apr-2015 |
Ying Wang <wangying@google.com> |
am 9aa2f10b: (-s ours) am a8cbb40a: Disable dex-preopt.
* commit '9aa2f10bed64be30186275d3f874e7ed1c5a5458':
Disable dex-preopt.
|
| 122d1a71f074cf217ab4c7be9e1cc417d54a3791 |
26-Apr-2015 |
Marcin Kosiba <mkosiba@google.com> |
am 1a4c1664: (-s ours) am fae9ed9a: Merge "Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev
* commit '1a4c166477298cf24d4cb5276449457cfea98c2d':
Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
|
| bf990ae2a587036cf21db5eb80a5d9b54c990e86 |
26-Apr-2015 |
Marcin Kosiba <mkosiba@google.com> |
am 8e6f4d6a: (-s ours) am a17d86e9: Don\'t use reflection to rewrite the WebView resources.
* commit '8e6f4d6a3f1d5e0252e7a63c397d3b2dbeabfed9':
Don't use reflection to rewrite the WebView resources.
|
| f6a305dd308709c756a228ed64e7d6f2196a7441 |
26-Apr-2015 |
Ben Murdoch <benm@google.com> |
am 3b3a02d1: (-s ours) am 4510b8d1: Merge "Remove check for styleable resources in WebView ResourceRewriter." into lmp-dev
* commit '3b3a02d119127f3a4cc7d121db4d74a674e5526e':
Remove check for styleable resources in WebView ResourceRewriter.
|
| f44d74c435216fcdf13d11d4f53798a88f27f7a8 |
26-Apr-2015 |
Tao Bai <michaelbai@google.com> |
am 0d3c16f8: (-s ours) am 35716689: Implement FileChooserParams.createIntent and parseResult
* commit '0d3c16f8843de1c10a42d43a9fe2add8021af102':
Implement FileChooserParams.createIntent and parseResult
|
| 49b02d48d09a12a70789653a2a5b56d00ef39528 |
26-Apr-2015 |
Marcin Kosiba <mkosiba@google.com> |
am eb387421: (-s ours) am 98f9a279: Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
* commit 'eb387421d4987e7ee2b4ea871f2f51e89cf72f18':
Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
|
| 6ca2fc89acd0dc002c814f5710af5d90bb43623a |
26-Apr-2015 |
Selim Gurun <sgurun@google.com> |
am e41e1345: (-s ours) am 5b026de6: Remove the plumbing for optOutDataReductionProxy API
* commit 'e41e1345223db88c81501a96abc726ba44a4af6d':
Remove the plumbing for optOutDataReductionProxy API
|
| de93e720abc0f0d54f13a00575a5db376b6c8541 |
26-Apr-2015 |
Selim Gurun <sgurun@google.com> |
am 44d477c1: (-s ours) Remove the plumbing for optOutDataReductionProxy API
* commit '44d477c110a2b300057592682d7d9b9ced19fc98':
Remove the plumbing for optOutDataReductionProxy API
|
| e248b43f9904d3643626896757900de1a4761adc |
26-Apr-2015 |
Torne (Richard Coles) <torne@google.com> |
am 30808fe0: (-s ours) Skip commits up to 76399f9 from AOSP.
* commit '30808fe04a756152331a5196b64ca857de714ab1':
Don't declare WebView as a library.
|
| ee25a61b5dea5296d7397df4d6507cd569858689 |
26-Apr-2015 |
Torne (Richard Coles) <torne@google.com> |
am a71fdd6c: (-s ours) Merge "Make init command line happen early"
* commit 'a71fdd6cb2e928085caa4433cbde15daf9ef8109':
Make init command line happen early
|
| 95e900d8a06d741a0b0127020172e7544cf0a0f8 |
26-Apr-2015 |
Torne (Richard Coles) <torne@google.com> |
am 98fae68c: (-s ours) Skip commits up to b20a4cb from AOSP.
* commit '98fae68cbd9329026953fa1a0cbb6bbaa220b668':
Don't use android.internal.R for resources.
AOSP-only changes to support the WebView loading from an APK.
Generate symlinks to libwebviewchromium.so in /system/priv-app
Generate resources before running aapt.
Include pak files in the WebView apk.
Move WebView resources to separate APK
Add com.android.webview to the package whitelist.
Make the WebView Java library into an APK.
|
| 254320149bf5883c671316114dae56691bd4c3ce |
26-Apr-2015 |
Torne (Richard Coles) <torne@google.com> |
am 78e79ef7: (-s ours) Skip commits up to 2846d3c from AOSP.
* commit '78e79ef7576a620fe6f19da5a6327ca8ef2c53f5':
Change function table assignment to allow new fields
Force software draws in AOSP
Force software draws in AOSP
Fix WebView crash on startup due to missing resource.
Match API changes from http://crrev.com/284123004
Add plumbing for the new fullscreen video path.
Make DrawGLFunctor work on 64-bit platforms.
|
| c2ab17cd3cf3fd86fb741fa118dcc8a3ce689c64 |
26-Apr-2015 |
Torne (Richard Coles) <torne@google.com> |
am d59fae72: (-s ours) Update from lmp-dev.
* commit 'd59fae725b4274251238a5b88a63add56b9ec21a': (51 commits)
Suppress StrictMode warning reading command line file.
Update API name to comply with changes to API
Update WebView APK name.
Cherry-pick: Remove debug logging.
Disable building the APK when a prebuilt is in use.
WebView fix for devices running <LRW48.
Enable wrap_contents quirk for apps targetting pre-L SDK.
Update WebViewFlingTest to use new UiAutomator API.
Finish zoomBy API hookup.
Do not read DRP key from GServices
Delete profile data if the WebView is downgraded.
Add version to public structs
Set native pointers before initialization
Add a trace event for AwBrowserProcess.loadLibrary.
Generate version data for the WebView package.
Cherry-pick: [WebView] Notify Chromium whether the app supports fullscreen.
Fix merge_from_chromium.py script to work with new buildspec repo
Increase char limit for private browsing warning.
Start reading drp setting from GoogleSetting
Revert version code to 1
...
|
| e1760e09693ac1b0a6f382e513915169033001f7 |
26-Apr-2015 |
Torne (Richard Coles) <torne@google.com> |
am e64f201d: (-s ours) am f250ae82: (-s ours) Merge "Merge up to 33b9fe6 from chromium-dev."
* commit 'e64f201d176ba5fdf8d7a884ef104c311a78013f':
Update WebViewChromium to match http://crrev.com/274153002
|
| 53fe47f3475e13a61a7fc701c5e43c8410433880 |
26-Apr-2015 |
Baligh Uddin <baligh@google.com> |
am ddabdb61: (-s ours) Import translations. DO NOT MERGE
* commit 'ddabdb614303e5aba56573cb05265c9abf62cd3a':
Import translations. DO NOT MERGE
|
| 3ef7df8e9b89dbc131f8565965286e55f135e7e8 |
26-Apr-2015 |
Hector Dearman <hjd@google.com> |
am 070f9117: (-s ours) Merge "Add Third Party Cookie API" into lmp-dev
* commit '070f9117e104d2e280094e963083b045b7100cd1':
Add Third Party Cookie API
|
| ae8ca01feb9cdd0c66e79705fcffa78e1a785c26 |
26-Apr-2015 |
Ben Murdoch <benm@google.com> |
am 881717f6: (-s ours) Merge "Implement WebViewChromium.preauthorizePermission." into lmp-dev
* commit '881717f6822544e3a72c851efb4f3821a1afab91':
Implement WebViewChromium.preauthorizePermission.
|
| 4269df6d98c2cbd630c92cc3cf95e5218899e728 |
26-Apr-2015 |
Ben Murdoch <benm@google.com> |
am 446ce2c2: (-s ours) Add support for SmartClip interface in the glue layer.
* commit '446ce2c24d3a1670de478701ea970ceba323e543':
Add support for SmartClip interface in the glue layer.
|
| bf9d3943b3a33d9c13eabc3d405b5807ba97e36d |
26-Apr-2015 |
Ben Murdoch <benm@google.com> |
am ddbcc035: (-s ours) Always add the path to the WebView assets.
* commit 'ddbcc0351201dc71b48252573b37da33deba1a83':
Always add the path to the WebView assets.
|
| ccf262cbfb90ecac8bf97503cdcc78a209ff6b34 |
24-Apr-2015 |
Gustav Sennton <gsennton@google.com> |
Merge "Return error code when failing to load webview relro file."
|
| 01223cc646651c96b8493853ac78b54158cbf5ec |
22-Apr-2015 |
John Reck <jreck@google.com> |
Merge "Revert "Revert "GraphicsJNI update"""
|
| 165a43df7df4aa5121697893c31b9571492939bc |
22-Apr-2015 |
John Reck <jreck@google.com> |
Revert "Revert "GraphicsJNI update""
This reverts commit c2aae77521ed9db7157053968fe1070b8cac2d6a.
hromium/Android.mk
hromium/plat_support/graphics_utils.cpp
|
| 4ceb92495a0a693b4cdd274e7b1160e07c49a133 |
22-Apr-2015 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 68868d23cd4ae8df877b2a2423c419219055c8e3 |
22-Apr-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I5c0a6b5dc4a74623ef4e816879fef88c17d8df22
Auto-generated-cl: translation import
hromium/res/values-gu-rIN/strings.xml
hromium/res/values-pa-rIN/strings.xml
hromium/res/values-sq-rAL/strings.xml
|
| 68b56b5ecd8a5fb70fa06cd6f8e74b8fcaa47632 |
22-Apr-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: If45be07dbaf0bd921408b0f041d79f983705e395
Auto-generated-cl: translation import
hromium/listing/res/values-gu-rIN/strings.xml
hromium/listing/res/values-pa-rIN/strings.xml
hromium/listing/res/values-sq-rAL/strings.xml
|
| b2a12d96ed8a6b493dcdcb7b685a166207904df8 |
20-Apr-2015 |
Tim Volodine <timvolodine@google.com> |
[Android WebView] Delete WebViewShell.
WebViewShell now lives in the chromium repository, so this patch
removes it from the android checkout (see crbug.com/475084).
Change-Id: I88dfc95eeb4597d38e936d2b13f801bbf5509fbb
hromium/tools/WebViewShell/Android.mk
hromium/tools/WebViewShell/AndroidManifest.xml
hromium/tools/WebViewShell/res/drawable/ic_launcher.png
hromium/tools/WebViewShell/res/layout/activity_telemetry.xml
hromium/tools/WebViewShell/res/values/strings.xml
hromium/tools/WebViewShell/run_startup_time_test.sh
hromium/tools/WebViewShell/src/com/android/webview/chromium/shell/JankActivity.java
hromium/tools/WebViewShell/src/com/android/webview/chromium/shell/StartupTimeActivity.java
hromium/tools/WebViewShell/src/com/android/webview/chromium/shell/TelemetryActivity.java
hromium/tools/WebViewShell/src/com/android/webview/chromium/shell/WebViewBrowserActivity.java
|
| c2aae77521ed9db7157053968fe1070b8cac2d6a |
17-Apr-2015 |
John Reck <jreck@google.com> |
Revert "GraphicsJNI update"
This reverts commit 260be08b742bf725cf92239c50f47a8c07280130.
Change-Id: I4a50e890a63d22ff517ae1bd53f00bf05d8553ff
hromium/Android.mk
hromium/plat_support/graphics_utils.cpp
|
| 31af3be67f7db61f6da97457e4a198e3aa8d1576 |
17-Apr-2015 |
Gustav Sennton <gsennton@google.com> |
Return error code when failing to load webview relro file.
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
hromium/loader/loader.cpp
|
| 260be08b742bf725cf92239c50f47a8c07280130 |
14-Apr-2015 |
John Reck <jreck@google.com> |
GraphicsJNI update
Change-Id: I72a6721d1130e7e87372beed492b42ac613695b7
hromium/Android.mk
hromium/plat_support/graphics_utils.cpp
|
| 804a83dd8bb2240f803b7ace767f5a2ae3b6d2a7 |
07-Apr-2015 |
Allen Hair <allenhair@google.com> |
Merge "Removing jank tests from frameworks/webview."
|
| 337cd66163f33c744bc1f6a0ae0c63ac59344e97 |
04-Apr-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I43945b554ef6bbe47cca355afbf95e9a376463af
Auto-generated-cl: translation import
hromium/listing/res/values-lt/strings.xml
|
| bbf06ee33a29e2ac6553f6323ac744809c4f203e |
31-Mar-2015 |
Allen Hair <allenhair@google.com> |
Removing jank tests from frameworks/webview.
These tests are now located in platform_testing/jank/webview.
Change-Id: I99a6836a97f86822a2916f9b09a35bf305f3d524
hromium/tests/UbWebViewJankTests/Android.mk
hromium/tests/UbWebViewJankTests/AndroidManifest.xml
hromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java
hromium/tests/data/heavy/index.html
hromium/tests/data/light/index.html
hromium/tests/java/Android.mk
hromium/tests/java/src/com/android/uiautomator/platform/WebViewFlingTest.java
hromium/tests/prebuilts/android-janktesthelper.jar
|
| a030587565b13051f925622550f3a554a4ddb661 |
24-Mar-2015 |
Tim Volodine <timvolodine@google.com> |
Merge "Add WebViewBrowserActivity and cleanup to WebViewShell."
|
| 871ddc7732aadcfffbea2a72e3e6f9a4e6c0f2a7 |
19-Mar-2015 |
Tim Volodine <timvolodine@google.com> |
Add WebViewBrowserActivity and cleanup to WebViewShell.
Add activity for displaying urls for testing in WebViewShell. Also clean up
some bits while at it.
Change-Id: Id3a78328493be5ca2ebb0b9393f08387999315a7
hromium/tools/WebViewShell/AndroidManifest.xml
hromium/tools/WebViewShell/res/values/strings.xml
hromium/tools/WebViewShell/src/com/android/webview/chromium/shell/WebViewBrowserActivity.java
|
| 842f1b0ca3b90dfd395b31c9269aa27ac31e236d |
21-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| a199d8ad0391dee544cfba3645b3726f38bd876d |
21-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I82411b0f588ae3a038eb8b732892a1d744e62f27
Auto-generated-cl: translation import
hromium/res/values-en-rAU/strings.xml
|
| 4bf7a2fa2d315b7dbc49fa1624f230be91866927 |
21-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I15609e50219d9e215864733260698dfedd904428
Auto-generated-cl: translation import
hromium/listing/res/values-en-rAU/strings.xml
|
| 1db64e8b70e0f3efad7cf08e8bbf6ad75178e181 |
20-Mar-2015 |
Torne (Richard Coles) <torne@google.com> |
am aeafafb7: Merge changes landed in master after lmp-dev creation.
* commit 'aeafafb7fda87d35a53c321d89da2df1a0143ecd':
|
| 054071f14eb91f46daf938c1544ed9973916967b |
12-Mar-2015 |
Richard Coles <torne@google.com> |
am 2b22e3a2: Merge "Add version code support for mips64."
* commit '2b22e3a20269b871c3450bc578e423465ee5d044':
Add version code support for mips64.
|
| 2b22e3a20269b871c3450bc578e423465ee5d044 |
12-Mar-2015 |
Richard Coles <torne@google.com> |
Merge "Add version code support for mips64."
|
| f12c9f599e2e9e6ef8b4eb5341441caac62addf1 |
09-Mar-2015 |
Allen Hair <allenhair@google.com> |
Update WebViewFlingTest to use new janktesthelper annotation format.
Change-Id: Ia957e3e74821cefd8ba39500b70e0b254431ca52
hromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java
|
| 993bed6c1b106ea16ab16fbdb0dce044115e86b6 |
03-Mar-2015 |
Selim Gurun <sgurun@google.com> |
am f2e74977: am 4a38c0de: Merge "Revert "Implement stub functions""
* commit 'f2e74977bdd1ff2ba1837282c3adfcf1cc62fe13':
Revert "Implement stub functions"
|
| f2e74977bdd1ff2ba1837282c3adfcf1cc62fe13 |
03-Mar-2015 |
Selim Gurun <sgurun@google.com> |
am 4a38c0de: Merge "Revert "Implement stub functions""
* commit '4a38c0de3e68830dfe918c938c93f64bded0bfd2':
Revert "Implement stub functions"
|
| 4a38c0de3e68830dfe918c938c93f64bded0bfd2 |
03-Mar-2015 |
Selim Gurun <sgurun@google.com> |
Merge "Revert "Implement stub functions""
|
| 1db8b6b8680fea48faf9828b80dc1675604b4521 |
03-Mar-2015 |
Selim Gurun <sgurun@android.com> |
Revert "Implement stub functions"
This reverts commit 63deb681b045244bbaca5abaeff978d8092e7671.
Change-Id: I3c5ec54531c7d9c60d9547f44995b18a80616e42
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| d619a03e1d6ed2f08618bd99df8b2c9841c9de8a |
03-Mar-2015 |
Selim Gurun <sgurun@android.com> |
am 8898ecf7: am 7ed31a7d: Merge "Implement stub functions"
* commit '8898ecf7d4a2da1468b9e566157bcd8e383a3fc9':
Implement stub functions
|
| 8898ecf7d4a2da1468b9e566157bcd8e383a3fc9 |
03-Mar-2015 |
Selim Gurun <sgurun@android.com> |
am 7ed31a7d: Merge "Implement stub functions"
* commit '7ed31a7d6ff6434a7ac858087953a8d1786d18c0':
Implement stub functions
|
| 7ed31a7d6ff6434a7ac858087953a8d1786d18c0 |
03-Mar-2015 |
Selim Gurun <sgurun@android.com> |
Merge "Implement stub functions"
|
| 63deb681b045244bbaca5abaeff978d8092e7671 |
02-Mar-2015 |
Selim Gurun <sgurun@android.com> |
Implement stub functions
Implement stub functions to prevent build breakage related to
changes in android.webkit classes.
Bug: 10237116
Change-Id: I8723446925277eaaa8804f13636da1d93d552d78
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| aba574085fd44356200fcdf350822960c2eb21f0 |
27-Feb-2015 |
Douglas Leung <douglas.leung@imgtec.com> |
Add version code support for mips64.
Change-Id: I2b71bdd83c105f9b45456b449ac91e3af0c57378
hromium/version.mk
|
| 463b216bb6decfdc5ffdd5fc5f0c10a9803cb9ff |
27-Feb-2015 |
Geoff Mendal <mendal@google.com> |
am 20135337: (-s ours) Import translations. DO NOT MERGE
* commit '20135337834a8c6bee94dd2ae45e16dc60832480':
Import translations. DO NOT MERGE
|
| 20135337834a8c6bee94dd2ae45e16dc60832480 |
27-Feb-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I9920d90c808e80227387d26899fd015eaab7c2fd
Auto-generated-cl: translation import
hromium/listing/res/values-my-rMM/strings.xml
|
| 1e5f42683e46df089d3446afdb9ba810eb95a07d |
13-Feb-2015 |
Bo Liu <boliu@google.com> |
Cherry-pick: aw: Make repeated detachGLFunctor work
Cherry-pick of chromium
crrev.com/72cf6e83b26d24af3c1b270f839911dfaddf2d46
BUG: 19370054
Original description:
> aw: Make repeated detachGLFunctor work
>
> detachGLFunctor is called every time the webview is detached (ie when
> hardware acceleration is torn down and cleaned up). This can happen many
> times since webview can be attached and detached many times.
>
> However the implementation in the glue layer only does something on the
> first call.
>
> Also in general, it's a bad pattern for CleanupReference to have strong
> java refs.
>
> It's not necessary to call detachGLFunctor on gc; detach is enough. So
> move all that code out of the DestroyRunnable of the CleanupReference.
>
> This is a long standing bug since the first release of chromium webview.
Change-Id: If8697d88fcbd514ac6db3e5ccafad1b2d1149fca
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
|
| e03cc3e943e34a4469c7b2e966cd42832eeda70c |
21-Jan-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I013f8656cadd628011d1d0e9016b73e72cd2e08f
Auto-generated-cl: translation import
hromium/listing/res/values-my-rMM/strings.xml
|
| 00384b927ef3b8177177bf1f8096e6838cb1a812 |
08-Jan-2015 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Provide OSS notice file for WebView, hook to Settings" into m40
|
| e295d0d8b4f2f83c247f0a7cea9fc42d6eada560 |
18-Dec-2014 |
Mikhail Naganov <mnaganov@google.com> |
Provide OSS notice file for WebView, hook to Settings
Add rules to place the code attribution file to the assets dir.
Add an activity that implements android.settings.WEBVIEW_LICENSE
intent uses by Settings app.
Add a content provider for reading the notice file from the apk.
Bug: 18729447
Change-Id: Ic333328700953864c84656a6bd2dc9af1a7aed62
hromium/AndroidManifest.xml
hromium/java/com/android/webview/chromium/LicenseActivity.java
hromium/java/com/android/webview/chromium/LicenseContentProvider.java
hromium/package.mk
hromium/res/values/strings.xml
|
| 3b842054b5f23dd1bc7a46104e16983a5993dce0 |
08-Jan-2015 |
Mikhail Naganov <mnaganov@google.com> |
Revert "Provide OSS notice file for WebView, hook to Settings"
This reverts commit 089bb9f123f3940593c123c95ca520b4ae47f2ed.
Broke the build: https://android-build.storage.googleapis.com/builds/ub-webview-m40-linux-WebViewGoogle_x86_64/1670772/4342c0220a78cfa57f244881554329e4a9483a49b9cbfd69cf0487c31c73d6dc/logs/build.log?Expires=1420731972&GoogleAccessId=701025073339-mqn0q2nvir9iurm6q5d00tdv7blbgvjr%40developer.gserviceaccount.com&Signature=J0Q8Sz5ygAxGp4as2xEr0uOy44YFVAliDMgmpWjtwrFZ3piHZO2e%2BNnBooytcAbz3zF7YIygngwvfF302zTXGLJQWASghOF%2FRa28DoPvWWAkTr%2B%2F24Q15GnNuQYIeYnQN2oGC2QbYEqqcMj8yMNXWhenBeuGqwGl%2BlpnLA6cxSM%3D
Change-Id: Ie47c125da06ffe56edd45c4ae0a70de4ac40c69f
hromium/AndroidManifest.xml
hromium/java/com/android/webview/chromium/LicenseActivity.java
hromium/java/com/android/webview/chromium/LicenseContentProvider.java
hromium/package.mk
hromium/res/values/strings.xml
|
| 089bb9f123f3940593c123c95ca520b4ae47f2ed |
18-Dec-2014 |
Mikhail Naganov <mnaganov@google.com> |
Provide OSS notice file for WebView, hook to Settings
Add rules to place the code attribution file to the assets dir.
Add an activity that implements android.settings.WEBVIEW_LICENSE
intent uses by Settings app.
Add a content provider for reading the notice file from the apk.
Bug: 18729447
Change-Id: I6f2135dffb480aadc2f54dd35b13509412d79c63
hromium/AndroidManifest.xml
hromium/java/com/android/webview/chromium/LicenseActivity.java
hromium/java/com/android/webview/chromium/LicenseContentProvider.java
hromium/package.mk
hromium/res/values/strings.xml
|
| bd0a1d1b142922b8a3bb5dc181b9dfab0da333f9 |
05-Jan-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I25f8ff97639b73264add19cfe70985b21f1d64c9
Auto-generated-cl: translation import
hromium/listing/res/values-my-rMM/strings.xml
|
| eda8ceea1473438e709cc8bcf436d971182615d5 |
23-Dec-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Iaf295cf2a945379c1f34c0f2d3330cb4ef5d5531
Auto-generated-cl: translation import
hromium/listing/res/values-my-rMM/strings.xml
|
| 96dd8338c73fb9280165f80a668c6e40df0bf587 |
08-Dec-2014 |
Torne (Richard Coles) <torne@google.com> |
Stop building the webview APK from source.
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
hromium/Android.mk
|
| 3f6ae772a090136a5dd9a307f5d3fd6c4e6aa3fd |
05-Dec-2014 |
Martin Kosiba <mkosiba@android.com> |
am a770a09c: Merge "Fix remaining references to hidden fields."
* commit 'a770a09ca3346d8ec7cb4cdff90aaf83c8d2c5ff':
Fix remaining references to hidden fields.
|
| a770a09ca3346d8ec7cb4cdff90aaf83c8d2c5ff |
05-Dec-2014 |
Martin Kosiba <mkosiba@android.com> |
Merge "Fix remaining references to hidden fields."
|
| cb0c7574831740c1a54d9de458170b2c0c16ff46 |
05-Dec-2014 |
Torne (Richard Coles) <torne@google.com> |
Fix remaining references to hidden fields.
A few hidden references were missed in previous commits.
Change-Id: Ia4c8fdae59f1de98b88d0bc77d5b7b434cf3db9b
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 99c3fbb3c64e1a2f55ea28b24675b00bc7a492e0 |
03-Dec-2014 |
Torne (Richard Coles) <torne@google.com> |
Update M40 glue layer from master.
Bring in:
Fork draw_gl.h/draw_sw.h.
Wrap all of the WebView Contexts
|
| 39df4898858bfeda9ceabc0c1524fb4406bc4e98 |
03-Dec-2014 |
Torne (Richard Coles) <torne@google.com> |
Update glue layer from master-chromium.
Pull in:
Fork draw_gl.h/draw_sw.h.
Wrap all of the WebView Contexts
to prepare for moving to a prebuilt.
|
| 656ec98400d99448202abd5ea8e6ef96f94b40ab |
27-Nov-2014 |
Narayan Kamath <narayan@google.com> |
resolved conflicts for merge of 83f6e3db to lmp-mr1-dev-plus-aosp
Change-Id: I13caa0f4fd6141fd85355e6ab058e65e6a7cf5c8
|
| 83f6e3dbbf9532ee66cedcc0a67e3eb84b77a120 |
27-Nov-2014 |
Narayan Kamath <narayan@google.com> |
Merge "Track move of android.net.http.ErrorStrings."
|
| 0485a4665a84402c0a8aca1cb6700bf23cdb8385 |
27-Nov-2014 |
Narayan Kamath <narayan@google.com> |
Track move of android.net.http.ErrorStrings.
It's now android.webkit.ErrorStrings.
Change-Id: I112ab739b0cb9bd47cee76481f5cf22d1e194b99
hromium/java/com/android/webview/chromium/WebViewDelegateFactory.java
|
| 3c791cc22b289674702134029e06cd145f83730d |
26-Nov-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Fork draw_gl.h/draw_sw.h." into master-chromium
|
| e4be25a7c5d547be06ed43166d82237cb08ad38a |
25-Nov-2014 |
Marcin Kosiba <mkosiba@google.com> |
Fork draw_gl.h/draw_sw.h.
This is to make it possible to remove external/chromium_org sources.
Change-Id: Id001c75a9f32788372c713b83ee6bc5cb9259122
hromium/Android.mk
hromium/plat_support/draw_gl.h
hromium/plat_support/draw_gl_functor.cpp
hromium/plat_support/draw_sw.h
hromium/plat_support/graphic_buffer_impl.h
hromium/plat_support/graphics_utils.cpp
|
| a88fd788aa418e3f7ecf2b937517448f218a27de |
07-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
Wrap all of the WebView Contexts
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
hromium/java/com/android/webview/chromium/ResourcesContextWrapperFactory.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 70949955509754ca83446edf5031aef0df5a4a62 |
20-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
resolved conflicts for merge of d83e7f76 to lmp-mr1-dev-plus-aosp
Change-Id: I8d2faecfc87c0be8379d2a6d403f67c6fa8d9cb3
|
| d83e7f767cf5d3fccd1b80599b994c2397131452 |
20-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge internal glue layer to AOSP at c28cfda.
Update glue layer to remove dependencies on to-be-removed private
framework APIs.
|
| 30219730dabe21f43f5fd6a1464165a9192243c1 |
19-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
resolved conflicts for merge of 4e0495ed to lmp-mr1-dev-plus-aosp
Change-Id: Iaa581f2923c50fbdc31736a892ddcbd8859c71bf
|
| 9964a0bda0e13d265a092ba03963cd1820361769 |
18-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
Update master from master-chromium at ca22ae4.
Bring in all changes cherrypicked from previous branches:
Remove DRP manager code
Fix reflection for detecting fullscreen API support.
Fix WebView targetSDK checks.
Update WebViewFlingTest to use new UiAutomator API.
|
| ca22ae4017e46f1abee044d2657c1697f28e2b95 |
24-Oct-2014 |
Selim Gurun <sgurun@google.com> |
Remove DRP manager code
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
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 70c1e9cf968bf2b99a1249c32335a6ff84b2dd43 |
18-Nov-2014 |
Ben Murdoch <benm@google.com> |
Merge "Fix reflection for detecting fullscreen API support." into master-chromium
|
| ce259207909174ed4c1654964a0f448bc275197d |
23-Oct-2014 |
Ben Murdoch <benm@google.com> |
Fix reflection for detecting fullscreen API support.
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)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| df1c654aba5a23d37fef47e5376694b8c55b9e30 |
17-Nov-2014 |
Ben Murdoch <benm@google.com> |
Fix WebView targetSDK checks.
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)
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 86972eac40c7eb99bfd7621ba78586ed4d87ba52 |
19-Aug-2014 |
Allen Hair <allenhair@google.com> |
Update WebViewFlingTest to use new UiAutomator API.
Change-Id: I932fc013c923c502082a9cb81fabe130bdf8c928
(cherry picked from commit c287310ea4204c907e76593e2b0d6a874c88c813)
hromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java
|
| ca01ad7b3df82e5b05b49562851c957d1264c9f3 |
18-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
Update master-chromium.
Some changes had been made directly in master; bring them into
master-chromium to get them back in sync.
|
| b0fc23fd000409a323dc216ad4a033b5fe2b9b95 |
18-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
Update to latest master-chromium.
Start building against the system SDK.
|
| c28cfda48ebe288274a9e58f7605e08658f7ed87 |
18-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge up to ee0f312 from master-chromium.
Bring in changes that remove most of the direct dependencies on hidden
APIs.
|
| 4e0495ed16a0da2afa1d16bc34a71345172a258f |
18-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge glue layer up to 7f6067d into AOSP.
Bring the AOSP version of the glue layer up to date with the current
internal version.
Change-Id: Ibb993d77c9bcd6d4f4d5b2929a76118a419e3826
|
| 12399ba4bb12154b7897cf88bee04aca0adeb770 |
17-Nov-2014 |
Ben Murdoch <benm@google.com> |
Fix WebView targetSDK checks.
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
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| d96f01bc4bccc016cc35173358b9ebb4eb4ecae4 |
17-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
Allow dex preopt in webview.
The bug around preopting a multiarch apk has been fixed for a while;
stop disabling LOCAL_DEX_PREOPT.
Bug: 17772057
Change-Id: Ie653d7e79ef5cef5dc01e9b87c8f3ee78175f4f9
hromium/package.mk
|
| 539a13725846ed8b732f27ae832d952b3e7dd800 |
17-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge correct version of glue layer.
THis is the version of the glue layer that is compatible with AOSP
master's version of chromium and the L MR1 version of the framework.
Change-Id: Idc5aef9fbe649e378ede370555cbe3d0d3c24b93
|
| f118a318bb942ff5a02d07f5721f7122adeb4c3f |
17-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge AOSP master into M39 glue layer code.
Change-Id: I58c8e5a6b58f87fb737c6def35175990673e1683
|
| d04ef93249f34306cd5cfce2c4ae7df3b0d850cd |
17-Nov-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I700de4b1b6c8963fe482dbb0b97db0245c9a46d0
Auto-generated-cl: translation import
hromium/listing/res/values-my-rMM/strings.xml
|
| f99c4efe193b5d1a71a39edd87f70ad597d20677 |
03-Nov-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Remove dependencies on DebugFlags.
BUG:18152150
Change-Id: Ifafa06a01db4a679b9777798f3bdeda0abc3021e
(cherry picked from commit 4eb3b4bdb57147426190c8fb42a7b5c33a0a2857)
(cherry picked from commit 53cb980b31715024c38abc06a5147918ca937e39)
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| a0cac3151315da4adcd4dbea4ff21a3b4fc7ea54 |
13-Nov-2014 |
Ben Murdoch <benm@google.com> |
Merge "Add support for SmartClip interface in the glue layer." into m39
|
| 05a7888ca30d8f6c60f2900a592cfbaaef0ac236 |
06-Nov-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Start building against the System SDK.
BUG:18152150
Change-Id: I995dd1a5f72bc817bdd71507fa4eee790144846a
(cherry picked from commit 0dd72dc2dac5ee57fd597f172e5015650312a700)
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewDelegateFactory.java
hromium/package.mk
|
| 516a6fb93ff72171df296940852ffb0bf95704b6 |
13-Nov-2014 |
Ignacio Solla <igsolla@google.com> |
Merge "[WebView] Add NullWebViewDFP constructor with WebViewDelegate arg."
|
| 87292c13f461a0b2c3fd7f2a53ed2c4b5c225e31 |
13-Nov-2014 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 3e1da162043c037c9e3b670de999544d64c34bc7 |
13-Nov-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I79b85ac124b49a3001995770f5943958a4e60195
Auto-generated-cl: translation import
hromium/listing/res/values-my-rMM/strings.xml
|
| ee0f312eaa0858d2608d88011527f9458bfeb8bf |
13-Nov-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Fix build breakage after cherry-pick from lmp-mr1-dev.
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
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| e55a412c93f394c3fd2a88e2e30c2b3e66fad543 |
10-Nov-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Add NullWebViewDFP constructor with WebViewDelegate arg.
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
ullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java
|
| e123c46fa985229b9db4083a58602b01702228fd |
29-Oct-2014 |
Ignacio Solla <igsolla@google.com> |
Cherry-pick: [WebView] Remove direct dependencies on hidden APIs.
Manually cherry-picked from commit 45702509d4752478188935eaf442c549c2c220be
and resolved conflicts.
BUG:18152150
Change-Id: If2b6c43f322b4223460b1be6c633858476244756
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
hromium/java/com/android/webview/chromium/ResourceRewriter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
hromium/java/com/android/webview/chromium/WebViewDelegateFactory.java
|
| 93aa4460a530e619bd586213e0bf4a740f54a141 |
06-Nov-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Remove unused method in CookieManager
Change-Id: I3d9d761d6d32eff392bfb568cef10657464ba117
(cherry picked from commit edcfb0f0e74b0cbbd025397ecec6a80cb866854d)
hromium/java/com/android/webview/chromium/CookieManagerAdapter.java
|
| 53cb980b31715024c38abc06a5147918ca937e39 |
03-Nov-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Remove dependencies on DebugFlags.
BUG:18152150
Change-Id: Ifafa06a01db4a679b9777798f3bdeda0abc3021e
(cherry picked from commit 4eb3b4bdb57147426190c8fb42a7b5c33a0a2857)
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 720ec0b6972dbb2587b876f863ca0ca1108aff23 |
29-Oct-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Remove dependency on Build.IS_DEBUGGABLE.
BUG:18152150
Change-Id: If9c8e28f6dd737ae0f677afc89ef5136a8e2268b
(cherry picked from commit bf95f761ba3d2dee0ee98b7204d289f35c4f478d)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 8ae9c440cb8835fd8d95c51674b11b3857fc6885 |
28-Oct-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Remove dependency on FileUtils.
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)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 7f6067d8624f89594b8ab635871cd78fba998eaf |
12-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at 03655fd3f6d7
|
| 36b0a0d250253f649c9200b73abbeb61fbc31292 |
04-Nov-2014 |
Ben Murdoch <benm@google.com> |
Add support for SmartClip interface in the glue layer.
Bug: 18222974
Change-Id: Ie39d49e9dfe90f20b6eb5d28009313781eac8e01
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/proguard.flags
|
| c6c1f3d81bdfd8a9b8bbc56cc63ff7275e2fe291 |
04-Nov-2014 |
Ben Murdoch <benm@google.com> |
Add support for SmartClip interface in the glue layer.
Bug: 18222974
Change-Id: Ie39d49e9dfe90f20b6eb5d28009313781eac8e01
Conflicts:
chromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/proguard.flags
|
| 30fd32cd0d9debc0496043d6f31957e04a449f34 |
10-Nov-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: Icd223a1246c0e4a7b8bb2f72a0d207b7b7a086f6
Auto-generated-cl: translation import
hromium/listing/res/values-my-rMM/strings.xml
|
| 0dd72dc2dac5ee57fd597f172e5015650312a700 |
06-Nov-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Start building against the System SDK.
BUG:18152150
Change-Id: I995dd1a5f72bc817bdd71507fa4eee790144846a
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewDelegateFactory.java
hromium/package.mk
|
| 45702509d4752478188935eaf442c549c2c220be |
29-Oct-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Remove direct dependencies on hidden APIs.
BUG:18152150
Change-Id: If2b6c43f322b4223460b1be6c633858476244756
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
hromium/java/com/android/webview/chromium/ResourceRewriter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
hromium/java/com/android/webview/chromium/WebViewDelegateFactory.java
|
| 74f7c5e10a05ee88a50c869c980d48fe7f60e22b |
07-Nov-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: If2d109afc30cc6c9f7c89b245153c755e663ffc2
Auto-generated-cl: translation import
hromium/listing/res/values-my-rMM/strings.xml
|
| edcfb0f0e74b0cbbd025397ecec6a80cb866854d |
06-Nov-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Remove unused method in CookieManager
Change-Id: I3d9d761d6d32eff392bfb568cef10657464ba117
hromium/java/com/android/webview/chromium/CookieManagerAdapter.java
|
| ec9ca7b51cbd22f546c92a86778dfa9a82207f07 |
06-Nov-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at db3f05efe0f9
This commit was generated by merge_to_master.py.
Change-Id: I7c0ed48fc7a60918a5a04e64b179104983f75964
|
| 446ce2c24d3a1670de478701ea970ceba323e543 |
04-Nov-2014 |
Ben Murdoch <benm@google.com> |
Add support for SmartClip interface in the glue layer.
Bug: 18222974
Change-Id: Ie39d49e9dfe90f20b6eb5d28009313781eac8e01
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/proguard.flags
|
| 81fb32c83e2964edaae128bf752c03c4bef8cd26 |
04-Nov-2014 |
Hui Shu <hush@google.com> |
Fix RequestDrawGL logic.
We're not supposed to request a blocking DrawGL with a not null canvas.
Just throw an exception in this case.
Change-Id: I452e781577ab1040d06acfcba1d03646bab00fa4
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
|
| 8a26cc6f7dd4d893790e7c4f13df901845ab045d |
03-Nov-2014 |
Ignacio Solla <igsolla@google.com> |
Merge "[WebView] Remove dependencies on DebugFlags." into m39
|
| 4eb3b4bdb57147426190c8fb42a7b5c33a0a2857 |
03-Nov-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Remove dependencies on DebugFlags.
BUG:18152150
Change-Id: Ifafa06a01db4a679b9777798f3bdeda0abc3021e
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 469cf4916bf7256904f572a149fe610f602ed967 |
31-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 9ee9488a: (-s ours) Import translations. DO NOT MERGE
* commit '9ee9488a63e7a65a124a9d9215a8074f123b844c':
Import translations. DO NOT MERGE
|
| 9665d9d05901196bbcf6f0de9dff5c2bc3d99750 |
28-Oct-2014 |
Ignacio Solla <igsolla@google.com> |
Cherry-pick: [WebView] Remove dependency on WEBVIEW_DATA_REDUCTION_PROXY.
BUG:18152150
Change-Id: Ie1f09273de1f18bdd587020cd77f914e727af9c9
(cherry picked from commit 0c24beba16b0d27ff66ebbd5d8757a60d87ecd67)
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
|
| b12c873f72ec666570321ac817e2eae1e01e1ab7 |
31-Oct-2014 |
Ignacio Solla <igsolla@google.com> |
Merge "[WebView] Remove dependency on WEBVIEW_DATA_REDUCTION_PROXY." into master-chromium
|
| bf95f761ba3d2dee0ee98b7204d289f35c4f478d |
29-Oct-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Remove dependency on Build.IS_DEBUGGABLE.
BUG:18152150
Change-Id: If9c8e28f6dd737ae0f677afc89ef5136a8e2268b
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 9ee9488a63e7a65a124a9d9215a8074f123b844c |
30-Oct-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I72dccad6851ff79f72b79af3f31e02e65a968a82
Auto-generated-cl: translation import
hromium/res/values-af/strings.xml
hromium/res/values-am/strings.xml
hromium/res/values-ar/strings.xml
hromium/res/values-bg/strings.xml
hromium/res/values-bn-rBD/strings.xml
hromium/res/values-ca/strings.xml
hromium/res/values-cs/strings.xml
hromium/res/values-da/strings.xml
hromium/res/values-de/strings.xml
hromium/res/values-el/strings.xml
hromium/res/values-en-rGB/strings.xml
hromium/res/values-en-rIN/strings.xml
hromium/res/values-es-rUS/strings.xml
hromium/res/values-es/strings.xml
hromium/res/values-et-rEE/strings.xml
hromium/res/values-eu-rES/strings.xml
hromium/res/values-fa/strings.xml
hromium/res/values-fi/strings.xml
hromium/res/values-fr-rCA/strings.xml
hromium/res/values-fr/strings.xml
hromium/res/values-gl-rES/strings.xml
hromium/res/values-hi/strings.xml
hromium/res/values-hr/strings.xml
hromium/res/values-hu/strings.xml
hromium/res/values-hy-rAM/strings.xml
hromium/res/values-in/strings.xml
hromium/res/values-is-rIS/strings.xml
hromium/res/values-it/strings.xml
hromium/res/values-iw/strings.xml
hromium/res/values-ja/strings.xml
hromium/res/values-ka-rGE/strings.xml
hromium/res/values-kk-rKZ/strings.xml
hromium/res/values-km-rKH/strings.xml
hromium/res/values-kn-rIN/strings.xml
hromium/res/values-ko/strings.xml
hromium/res/values-ky-rKG/strings.xml
hromium/res/values-lo-rLA/strings.xml
hromium/res/values-lt/strings.xml
hromium/res/values-lv/strings.xml
hromium/res/values-mk-rMK/strings.xml
hromium/res/values-ml-rIN/strings.xml
hromium/res/values-mn-rMN/strings.xml
hromium/res/values-mr-rIN/strings.xml
hromium/res/values-ms-rMY/strings.xml
hromium/res/values-my-rMM/strings.xml
hromium/res/values-nb/strings.xml
hromium/res/values-ne-rNP/strings.xml
hromium/res/values-nl/strings.xml
hromium/res/values-pl/strings.xml
hromium/res/values-pt-rPT/strings.xml
hromium/res/values-pt/strings.xml
hromium/res/values-ro/strings.xml
hromium/res/values-ru/strings.xml
hromium/res/values-si-rLK/strings.xml
hromium/res/values-sk/strings.xml
hromium/res/values-sl/strings.xml
hromium/res/values-sr/strings.xml
hromium/res/values-sv/strings.xml
hromium/res/values-sw/strings.xml
hromium/res/values-ta-rIN/strings.xml
hromium/res/values-te-rIN/strings.xml
hromium/res/values-th/strings.xml
hromium/res/values-tl/strings.xml
hromium/res/values-tr/strings.xml
hromium/res/values-uk/strings.xml
hromium/res/values-ur-rPK/strings.xml
hromium/res/values-uz-rUZ/strings.xml
hromium/res/values-vi/strings.xml
hromium/res/values-zh-rCN/strings.xml
hromium/res/values-zh-rHK/strings.xml
hromium/res/values-zh-rTW/strings.xml
hromium/res/values-zu/strings.xml
|
| 538dc44fafcde6bc4fe2f76872ca0682d5ce63c1 |
29-Oct-2014 |
Torne (Richard Coles) <torne@google.com> |
am 4bb8eed6: Revert "Wrap one more Context"
* commit '4bb8eed6b5ac959eeaa05183342d6bcdb3630ba7':
Revert "Wrap one more Context"
|
| 9ca4f33e3a20e100af0390af4035382f7caa47eb |
29-Oct-2014 |
Torne (Richard Coles) <torne@google.com> |
am 3180c1cc: resolved conflicts for merge of 5a706141 to stage-aosp-master
* commit '3180c1cc68d4dd757705b0f1d89b97d5d3095536':
Remove the default text encoding resource.
Wrap one more Context
|
| 4bb8eed6b5ac959eeaa05183342d6bcdb3630ba7 |
29-Oct-2014 |
Torne (Richard Coles) <torne@google.com> |
Revert "Wrap one more Context"
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.
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 620317df09cbb4425b366ad48f7a86e9016a53d4 |
29-Oct-2014 |
Ignacio Solla <igsolla@google.com> |
Merge "[WebView] Remove dependency on FileUtils." into m39
|
| 3180c1cc68d4dd757705b0f1d89b97d5d3095536 |
29-Oct-2014 |
Torne (Richard Coles) <torne@google.com> |
resolved conflicts for merge of 5a706141 to stage-aosp-master
Change-Id: I1d4eb2b0bd794085cae12ae24ec47bcd89b159a4
|
| 5112943866a77868d1987617ed1320e73e2a9ce4 |
28-Oct-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Remove dependency on FileUtils.
We implement our own version of deleteContents to
avoid depending on FileUtils, a hidden Android API.
BUG:18152150
Change-Id: I8607e36827bacc38a80a35f65c13f39f561551a0
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 0c24beba16b0d27ff66ebbd5d8757a60d87ecd67 |
28-Oct-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Remove dependency on WEBVIEW_DATA_REDUCTION_PROXY.
BUG:18152150
Change-Id: Ie1f09273de1f18bdd587020cd77f914e727af9c9
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
|
| a77ae8970e35025840112942522e4521716c5422 |
28-Oct-2014 |
Ben Murdoch <benm@google.com> |
Always add the path to the WebView assets.
Bug: 18133926
Change-Id: I33ae4101fd6865df057e365b6f33aef0ef9fd272
(cherry picked from commit ddbcc0351201dc71b48252573b37da33deba1a83)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 8a2779d553a06af1dc903c98071ef4db300b177d |
28-Oct-2014 |
Ben Murdoch <benm@google.com> |
Always add the path to the WebView assets.
Bug: 18133926
Change-Id: I33ae4101fd6865df057e365b6f33aef0ef9fd272
(cherry picked from commit ddbcc0351201dc71b48252573b37da33deba1a83)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| ddbcc0351201dc71b48252573b37da33deba1a83 |
28-Oct-2014 |
Ben Murdoch <benm@google.com> |
Always add the path to the WebView assets.
Bug: 18133926
Change-Id: I33ae4101fd6865df057e365b6f33aef0ef9fd272
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| a329f6b47075066d779fe3b020d971cd66a3bf5f |
27-Oct-2014 |
Primiano Tucci <primiano@google.com> |
Enable minimalistic crash handler for WebView.
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
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 5a7061410936430adc5fa54aacf166efa217dcbd |
27-Oct-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge chromium-dev up to 7d62eab"
|
| a54ab0ff25cba326b535c57ee710f5b39760c0be |
27-Oct-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge chromium-dev up to 7d62eab
|
| b60534d5e551871dc3724de4ed1da98b2cc5bee3 |
27-Oct-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at 614f7b807940
This commit was generated by merge_to_master.py.
Change-Id: Ieb34abff7c3789e7b41ef995d9b65c9d9932dc7f
|
| 512dab0c0bc1590abc7032b262ccd33619eb0e9a |
27-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
am a837930e: am 53dc1aa9: Match removal of config_webSettingsDefaultTextEncoding.
* commit 'a837930e98b397df6dcb5da2164d441f247d723c':
Match removal of config_webSettingsDefaultTextEncoding.
|
| ba3f200c4021682057c693648165f2d55f48ddbc |
27-Oct-2014 |
Ben Murdoch <benm@google.com> |
am b762bbe6: am 0c6c259a: Merge "Use overridden resources." into lmp-dev
* commit 'b762bbe612c1f13c272a66941df702b6d4f7927f':
Use overridden resources.
|
| 248d0477b27ef31220ecd9a736bab75fd8f5e9b2 |
25-Oct-2014 |
Selim Gurun <sgurun@google.com> |
Merge "Remove DRP manager code" into m39
|
| 011b28ccadb6e853829f895b5613fe9478062dcd |
24-Oct-2014 |
Selim Gurun <sgurun@google.com> |
Remove DRP manager code
Remove DRP manager code from M39. We will reintroduce the code to
proper branch once the test setup is ready.
Bug: 17998706
Change-Id: I83f2aabd9bf94eae1ee774a831e1a131717e24e0
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 9f3473ac53192eca3e10c9a1dd3614dea48ea8a7 |
23-Oct-2014 |
Ben Murdoch <benm@google.com> |
Fix reflection for detecting fullscreen API support.
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
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 89b33e2103cee15b08a31a48b379b846bc690891 |
20-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
Fix typo in WebViewChromium.onScrollChanged
Change-Id: Id265d12cb981673f404440d808c9d8f51185c89b
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| c9efa59ec739930308d3a40d831b7295d0a7eeee |
22-Oct-2014 |
Ben Murdoch <benm@google.com> |
Update WebView package version to 40.
Change-Id: Ib49fb2c9f13f210e47d1466a3357333452976885
hromium/version.mk
|
| 7de37c3f548a37f896fc0f1711b012f8cef334f7 |
22-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Hook up WebView.onScrollChanged" into master-chromium
|
| f730607b461c2e789fda9bb9b05386a53ecb4338 |
03-Sep-2014 |
Hui Shu <hush@google.com> |
Suport initializing DRP from cmd line switches.
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)
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
|
| 6aee10621665db8bb90ec476e9a09b608fbcabe5 |
21-Oct-2014 |
Torne (Richard Coles) <torne@google.com> |
Don't build the platform libraries in a tapas build.
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
hromium/package.mk
|
| b92ed3043a8c1d9c2c068a31b14c5373576d02d2 |
20-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
Hook up WebView.onScrollChanged
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
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 40756ca3f6d203284ba5f655694ec0b0e1ff8537 |
15-Oct-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I2ff82931922b8ad50ee034b2d0cce11447ae1ee8
Auto-generated-cl: translation import
hromium/listing/res/values-it/strings.xml
hromium/listing/res/values-ka-rGE/strings.xml
hromium/listing/res/values-sw/strings.xml
hromium/listing/res/values-zh-rHK/strings.xml
hromium/listing/res/values-zh-rTW/strings.xml
|
| bfcff7200dd1986b8ab61565e7f598410e3304fb |
15-Oct-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ia0efac7449b689c0dfdea4f50bf1c534ff153eed
Auto-generated-cl: translation import
hromium/listing/res/values-bn-rBD/strings.xml
hromium/listing/res/values-eu-rES/strings.xml
hromium/listing/res/values-gl-rES/strings.xml
hromium/listing/res/values-is-rIS/strings.xml
hromium/listing/res/values-it/strings.xml
hromium/listing/res/values-ka-rGE/strings.xml
hromium/listing/res/values-kk-rKZ/strings.xml
hromium/listing/res/values-kn-rIN/strings.xml
hromium/listing/res/values-ky-rKG/strings.xml
hromium/listing/res/values-mk-rMK/strings.xml
hromium/listing/res/values-ml-rIN/strings.xml
hromium/listing/res/values-mr-rIN/strings.xml
hromium/listing/res/values-my-rMM/strings.xml
hromium/listing/res/values-ne-rNP/strings.xml
hromium/listing/res/values-si-rLK/strings.xml
hromium/listing/res/values-sw/strings.xml
hromium/listing/res/values-ta-rIN/strings.xml
hromium/listing/res/values-te-rIN/strings.xml
hromium/listing/res/values-ur-rPK/strings.xml
hromium/listing/res/values-uz-rUZ/strings.xml
hromium/listing/res/values-zh-rHK/strings.xml
hromium/listing/res/values-zh-rTW/strings.xml
|
| 8735fb890a3a7b16f4014a4da7736939f5e34891 |
14-Oct-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge glue layer from master.
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.
|
| 15fda1d3fb8d694d7064ebfea7dba42e6131bfd1 |
14-Oct-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge glue layer from master-chromium.
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.
|
| 6e1c4b73734f318061496c80853684e316c2d20d |
13-Oct-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I38768ec914f77e586b586bde7654c1b8b0fd9ebb
Auto-generated-cl: translation import
hromium/listing/res/values-af/strings.xml
hromium/listing/res/values-am/strings.xml
hromium/listing/res/values-ar/strings.xml
hromium/listing/res/values-bg/strings.xml
hromium/listing/res/values-ca/strings.xml
hromium/listing/res/values-cs/strings.xml
hromium/listing/res/values-da/strings.xml
hromium/listing/res/values-de/strings.xml
hromium/listing/res/values-el/strings.xml
hromium/listing/res/values-en-rGB/strings.xml
hromium/listing/res/values-en-rIN/strings.xml
hromium/listing/res/values-es-rUS/strings.xml
hromium/listing/res/values-es/strings.xml
hromium/listing/res/values-et-rEE/strings.xml
hromium/listing/res/values-fa/strings.xml
hromium/listing/res/values-fi/strings.xml
hromium/listing/res/values-fr-rCA/strings.xml
hromium/listing/res/values-fr/strings.xml
hromium/listing/res/values-hi/strings.xml
hromium/listing/res/values-hr/strings.xml
hromium/listing/res/values-hu/strings.xml
hromium/listing/res/values-hy-rAM/strings.xml
hromium/listing/res/values-in/strings.xml
hromium/listing/res/values-it/strings.xml
hromium/listing/res/values-iw/strings.xml
hromium/listing/res/values-ja/strings.xml
hromium/listing/res/values-ka-rGE/strings.xml
hromium/listing/res/values-km-rKH/strings.xml
hromium/listing/res/values-ko/strings.xml
hromium/listing/res/values-lo-rLA/strings.xml
hromium/listing/res/values-lt/strings.xml
hromium/listing/res/values-lv/strings.xml
hromium/listing/res/values-mn-rMN/strings.xml
hromium/listing/res/values-ms-rMY/strings.xml
hromium/listing/res/values-nb/strings.xml
hromium/listing/res/values-nl/strings.xml
hromium/listing/res/values-pl/strings.xml
hromium/listing/res/values-pt-rPT/strings.xml
hromium/listing/res/values-pt/strings.xml
hromium/listing/res/values-ro/strings.xml
hromium/listing/res/values-ru/strings.xml
hromium/listing/res/values-sk/strings.xml
hromium/listing/res/values-sl/strings.xml
hromium/listing/res/values-sr/strings.xml
hromium/listing/res/values-sv/strings.xml
hromium/listing/res/values-sw/strings.xml
hromium/listing/res/values-th/strings.xml
hromium/listing/res/values-tl/strings.xml
hromium/listing/res/values-tr/strings.xml
hromium/listing/res/values-uk/strings.xml
hromium/listing/res/values-vi/strings.xml
hromium/listing/res/values-zh-rCN/strings.xml
hromium/listing/res/values-zh-rHK/strings.xml
hromium/listing/res/values-zh-rTW/strings.xml
hromium/listing/res/values-zu/strings.xml
|
| 6fb047a878a348b9fe333631fb68f23a384099c7 |
10-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
Match removal of config_webSettingsDefaultTextEncoding.
This is to match http://ag/565166 which removes the resource.
Change-Id: Id064af59410ac5d031af0c26817a5a15ea320906
(cherry picked from commit 53dc1aa95198e9cf7020ec848f3b27cbee50b35e)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| a837930e98b397df6dcb5da2164d441f247d723c |
13-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
am 53dc1aa9: Match removal of config_webSettingsDefaultTextEncoding.
* commit '53dc1aa95198e9cf7020ec848f3b27cbee50b35e':
Match removal of config_webSettingsDefaultTextEncoding.
|
| 0acf378591b1e0f2c5ce29a6423723776fe2909e |
10-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
Match removal of config_webSettingsDefaultTextEncoding.
This is to match http://ag/565166 which removes the resource.
Change-Id: Id064af59410ac5d031af0c26817a5a15ea320906
(cherry picked from commit 53dc1aa95198e9cf7020ec848f3b27cbee50b35e)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 9ba9bb83eb4f11281bb62118b347561b9c7e3231 |
10-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
Match removal of config_webSettingsDefaultTextEncoding.
This is to match http://ag/565166 which removes the resource.
Change-Id: Id064af59410ac5d031af0c26817a5a15ea320906
(cherry picked from commit 53dc1aa95198e9cf7020ec848f3b27cbee50b35e)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| e494d2acb563ed232164c819857b341286be7c6e |
10-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
Match removal of config_webSettingsDefaultTextEncoding.
This is to match http://ag/565166 which removes the resource.
Change-Id: Id064af59410ac5d031af0c26817a5a15ea320906
(cherry picked from commit 53dc1aa95198e9cf7020ec848f3b27cbee50b35e)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 7d62eab4ca242beacac4471c002e998ef5c218b8 |
10-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Remove the default text encoding resource." into chromium-dev
|
| 2de594d51a8134b7063dbdc365c68a8b752373b0 |
10-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
Remove the default text encoding resource.
Change-Id: I4ffd050576056e8bc61ff5a544890730a132ee38
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/res/values/strings.xml
|
| 53dc1aa95198e9cf7020ec848f3b27cbee50b35e |
10-Oct-2014 |
Marcin Kosiba <mkosiba@google.com> |
Match removal of config_webSettingsDefaultTextEncoding.
This is to match http://ag/565166 which removes the resource.
Change-Id: Id064af59410ac5d031af0c26817a5a15ea320906
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 1381c9cf54df4520bd3369053c3012cd1c809760 |
08-Oct-2014 |
Ben Murdoch <benm@google.com> |
Add strings for Play Store text.
We need to trigger translation.
Bug: 17031560
Change-Id: I17041ed27b109f42926918ace8c5d25318c6e140
hromium/listing/res/values/strings.xml
|
| b762bbe612c1f13c272a66941df702b6d4f7927f |
06-Oct-2014 |
Ben Murdoch <benm@google.com> |
am 0c6c259a: Merge "Use overridden resources." into lmp-dev
* commit '0c6c259ab3445e03276d3013c4a7daefb26002bc':
Use overridden resources.
|
| 61afed696a71ff0a288916a9319461cd880375e2 |
06-Oct-2014 |
Ben Murdoch <benm@google.com> |
Use overridden resources.
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)
hromium/package.mk
|
| 0c6c259ab3445e03276d3013c4a7daefb26002bc |
06-Oct-2014 |
Ben Murdoch <benm@google.com> |
Merge "Use overridden resources." into lmp-dev
|
| d6a17bc6ba1bc12e43f180397abacb8c1cd194ec |
06-Oct-2014 |
Ben Murdoch <benm@google.com> |
Use overridden resources.
Updates the WebView build rule to take into account any
overridden resources.
Bug: 16902981
Change-Id: Ie8dea10fc093379afeff37a6e7b9c972370d5ad5
hromium/package.mk
|
| 80ea4ead5bdf2a86aa63f70c6afeebbd5c0ec6d6 |
18-Sep-2014 |
Torne (Richard Coles) <torne@google.com> |
Cherry-pick: Fix resource rewriting in apps with other shared libs.
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
hromium/java/com/android/webview/chromium/ResourceRewriter.java
|
| 39781a2ada7233e0427844f4b7eef39170696bc5 |
03-Oct-2014 |
Primiano Tucci <primiano@google.com> |
Reset the state of lmp-mr1-dev-plus-aosp to match lmp-dev-plus-aosp
Both track master in the chromium_org projects and a similar version
of frameworks/base.
|
| 6bdee98cc82d2b90c962dc1c645e13e0a4c8b802 |
02-Oct-2014 |
Andreas Gampe <agampe@google.com> |
am f6966000: Webview: Remove dexpreopt flag
* commit 'f696600067c3110f2a595646fa2a983621055957':
Webview: Remove dexpreopt flag
|
| 2747b94ef61495bee7321f15225dd10b43ed5b11 |
02-Oct-2014 |
Primiano Tucci <primiano@google.com> |
resolved conflicts for merge of 5cdf0214 to lmp-dev-plus-aosp
|
| 916516f6c5ae45abe767cd734a878135d2f637dd |
02-Oct-2014 |
Primiano Tucci <primiano@google.com> |
Merge -s ours (skip) commit a1b0248 into lmp-dev-plus-aosp
* commit 'a1b0248c80f239e2f6476b9f395b27d0ba1eb3cd':
Wrap all of the WebView Contexts
|
| f40b944e2237d5e8dfb6a230caaa6a45274c95a4 |
02-Oct-2014 |
Primiano Tucci <primiano@google.com> |
Merge commit 60e4952d into lmp-dev-plus-aosp
* commit '60e4952d02f2bfa3f0705043b792c01f79ffbfa6':
WebViewChromiumFactoryProvider should import ResourceExtractor fromorg.chromium.base
Conflicts:
chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
Change-Id: I27005fac1142f979ad2b9f7e155bd7c0cacb5b66
|
| 996374df3db174b0b96eebf6adaa60fee7234c34 |
02-Oct-2014 |
Primiano Tucci <primiano@google.com> |
Merge commit 8dc9a9d1 into lmp-dev-plus-aosp
* commit '8dc9a9d1217f84a7f9b0554f22a826394eabc856':
Update some content classes to content_public
|
| 9bfd830274083d397e25aa3290499d7fe9ed8ed2 |
02-Oct-2014 |
Primiano Tucci <primiano@google.com> |
Merge -s ours (skip) commit 04cc2fa into lmp-dev-plus-aosp
* commit '04cc2fafb1103e5d9d9947e899ce4bb285b00b52':
Don't declare WebView as a library.
|
| 5cdf02141e137e7094b3f7220571e5a53a7706f0 |
02-Oct-2014 |
Primiano Tucci <primiano@google.com> |
Merge "Merge chromium-dev @ a1b0248 into aosp/master."
|
| 0c913299e7c9fde0b23cab4cd22b3ad61de50897 |
02-Oct-2014 |
Primiano Tucci <primiano@google.com> |
Merge chromium-dev @ a1b0248 into aosp/master.
This is to match the push of the chromium M39 branch point (267aeeb8d85c)
into the chromium_org projects.
Change-Id: Ica595e265eea939f2254f009e0e4b7f4ef4336f3
|
| f696600067c3110f2a595646fa2a983621055957 |
02-Oct-2014 |
Andreas Gampe <agampe@google.com> |
Webview: Remove dexpreopt flag
The bug has been closed a while ago.
Bug: 17772057
Change-Id: Ia940a7ae507b1479e3e01bd8dc2b5c3d27bbbff6
hromium/package.mk
|
| b02dda8d67ccbe3aba24992b9b5a8687cb86d6a0 |
02-Oct-2014 |
Hui Shu <hush@google.com> |
am b20977d3: Remove WebView DRP Setting from Developer Settings
* commit 'b20977d38851443e0b2997576e8623a7a998b2fb':
Remove WebView DRP Setting from Developer Settings
|
| b20977d38851443e0b2997576e8623a7a998b2fb |
01-Oct-2014 |
Hui Shu <hush@google.com> |
Remove WebView DRP Setting from Developer Settings
BUG: 17730990
Change-Id: I78309f1bbec35e22093524d18fcecc0de47b8e57
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 22fec495f2e36255d15ff35301ad96d5f7e35d20 |
30-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Merge master-chromium into master at 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: I1126b4412fc30084b9345f7d0a6f307e49a4feb9
|
| 6ec46f2bd3243d042d9641d7f87863bc20f8c745 |
29-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Wrap one more Context" into chromium-dev
|
| f0c97c192953010508e2c97991c67243ec3ee05e |
29-Sep-2014 |
Hector Dearman <hjd@google.com> |
Wrap one more Context
We need to wrap this context so that when we request the
ic_media_video_poster resource it gets picked up.
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 84e387193b55f94d61a9544ccfbe3c79e5e23f25 |
28-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-chromium
|
| 442a0a9cce5457cb5534b4b1dd3917d05b36ba2e |
26-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Merge "Merge scripts: rename merge_to_master.py -> merge_to_android.py" into master-chromium
|
| 139902dadec57a454dbada767e6497d588ed6120 |
26-Sep-2014 |
Hui Shu <hush@google.com> |
am 8192f716: Merge "Suport initializing DRP from cmd line switches." into lmp-dev
* commit '8192f7167f561cd7a4c5c629ffdd1260a6749a55':
Suport initializing DRP from cmd line switches.
|
| 8192f7167f561cd7a4c5c629ffdd1260a6749a55 |
26-Sep-2014 |
Hui Shu <hush@google.com> |
Merge "Suport initializing DRP from cmd line switches." into lmp-dev
|
| e41c9c1d9c3bf72381f8e0acd62bd17346bf1d7e |
03-Sep-2014 |
Hui Shu <hush@google.com> |
Suport initializing DRP from cmd line switches.
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: I028159656eb55270afb7ff7e793aba6e82794d99
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
|
| d7b0b1b361c4cc745274a6e754b0ef2d57c73c4b |
25-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Merge scripts: rename merge_to_master.py -> merge_to_android.py
- 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
hromium/tools/merge_from_chromium.py
hromium/tools/merge_to_android.py
hromium/tools/merge_to_master.py
|
| 2dead572d0f537ee0f2923727886f052c6ec2c11 |
25-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Wrap all of the WebView Contexts" into chromium-dev
|
| a1b0248c80f239e2f6476b9f395b27d0ba1eb3cd |
19-Sep-2014 |
Hector Dearman <hjd@google.com> |
Wrap all of the WebView Contexts
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: Ic5a928f34c16cc86de331d39ce5eb534b2602907
hromium/java/com/android/webview/chromium/ResourcesContextWrapperFactory.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 627cd52a5fc2b1efa72f2a4480cbc42bcf4da0ef |
25-Sep-2014 |
Ben Murdoch <benm@google.com> |
am 85e03c0a: WebView does not require a touch screen.
* commit '85e03c0a49a3cde16fa723bb90dc64868fbe3886':
WebView does not require a touch screen.
|
| 006da527f203d087081d5b9f9b60813271f8f4b5 |
25-Sep-2014 |
Ben Murdoch <benm@google.com> |
WebView does not require a touch screen.
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)
hromium/AndroidManifest.xml
|
| 49de05b3272be3c08147aa99b94e42ce4750d18e |
25-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Idf33c6a22e51acce295061a5549c295620747ec7
Auto-generated-cl: translation import
hromium/res/values-ca/strings.xml
hromium/res/values-hi/strings.xml
|
| 85e03c0a49a3cde16fa723bb90dc64868fbe3886 |
25-Sep-2014 |
Ben Murdoch <benm@google.com> |
WebView does not require a touch screen.
Ensure devices that don't have a touchscreen are not prevented
from getting a WebView update.
Bug: 16902981
Change-Id: I423c5c3cdff549b2ecfee532ada820545b0d1c5d
hromium/AndroidManifest.xml
|
| f9b947672c4b266df5b64dec0c9465c7f7bf215e |
24-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Add startup time tests to the WebViewShell" into master-chromium
|
| 3c1733e5798747813fe0e812cc02cb6ea1cea335 |
12-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Increase char limit for private browsing warning.
BUG: 16955473
(cherry picked from commit 79ca909e4230d7f95103791a9d4b41e3650db6c3)
Change-Id: I86a22b644f718f1028e8d642414ea60037bb83e6
(cherry picked from commit 8c02b6dc0ceb95154436021c9b8e9206da576992)
hromium/res/values/strings.xml
|
| 9e0d9ef46e124f0676d25989badb723b78fddbd6 |
09-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Add startup time tests to the WebViewShell
BUG: 16870075
Change-Id: I3f5221accdf2e3ca9a05b1c030eb8d74a2ec12e2
hromium/tools/WebViewShell/AndroidManifest.xml
hromium/tools/WebViewShell/res/values/strings.xml
hromium/tools/WebViewShell/run_startup_time_test.sh
hromium/tools/WebViewShell/src/com/android/webview/chromium/shell/StartupTimeActivity.java
|
| 950c447e62ecb8aa7eb212f85076a384aa924627 |
22-Sep-2014 |
Ben Murdoch <benm@google.com> |
Merge "Don't use reflection to rewrite the WebView resources." into master-chromium
|
| 500ebd68d830525f40ef1c12f9b4decff978ca74 |
19-Sep-2014 |
Ben Murdoch <benm@google.com> |
am 80bf8d5e: Merge "Update WebView manifest to target/minSDK 21." into lmp-dev
* commit '80bf8d5e3d799c7680d45ef214c8b91097794ccf':
Update WebView manifest to target/minSDK 21.
|
| 4c7f0ec0b47f10bbe7538866dca8950db0d28993 |
18-Sep-2014 |
Ben Murdoch <benm@google.com> |
Update WebView manifest to target/minSDK 21.
Bug: 16902981
Change-Id: I44594b62e94b034662b30f9e43a65946224c3152
(cherry picked from commit 8473b38625fa761e77c4b247e688b28755723dd9)
(cherry picked from commit bb12c1a334f9bdcbe8cdda3cd2efac850f82ae17)
hromium/AndroidManifest.xml
|
| 80bf8d5e3d799c7680d45ef214c8b91097794ccf |
19-Sep-2014 |
Ben Murdoch <benm@google.com> |
Merge "Update WebView manifest to target/minSDK 21." into lmp-dev
|
| 83dc52fe3eece77a9d042df265582963853b84c2 |
19-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture." into master-chromium
|
| 8473b38625fa761e77c4b247e688b28755723dd9 |
18-Sep-2014 |
Ben Murdoch <benm@google.com> |
Update WebView manifest to target/minSDK 21.
Bug: 16902981
Change-Id: I44594b62e94b034662b30f9e43a65946224c3152
hromium/AndroidManifest.xml
|
| afe44e87c563c17ce1e44306fe7047613865cebe |
11-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Don't use reflection to rewrite the WebView resources.
Bug: 16870075
Change-Id: Ie65a3a277ecb3c55622d5bab5916833768b1f21b
(cherry picked from commit a17d86e955b57c52637ccb8c46b01a71425d76b8)
(cherry picked from commit 2dfa59a347a15f1226811fda15a64e56d162f30c)
hromium/java/com/android/webview/chromium/ResourceRewriter.java
|
| 7936aa0cccd0a40aff28e645bd891922903dc88d |
18-Sep-2014 |
Torne (Richard Coles) <torne@google.com> |
am fd23af21: Fix resource rewriting in apps with other shared libs.
* commit 'fd23af21150a4a8b499d1303de657f716ac0bf1e':
Fix resource rewriting in apps with other shared libs.
|
| c4da9b7d1b82e905cfb36809f58e13557b56b8a4 |
10-Sep-2014 |
Ben Murdoch <benm@google.com> |
Remove check for styleable resources in WebView ResourceRewriter.
We know that we don't have any stylable resources in the WebView,
so we can eliminate the check in our ResourceRewriter; this removes
a costly repeated call to Class.getSimpleName().
Bug: 16870075
Change-Id: I48d1e581bc3bc89013b910d2b46cf480f1e9dcfc
(cherry picked from commit 91c538cbe7e746f1a972b463f3497a56addf579c)
(cherry picked from commit deb7453daf56a2d4cf99be2d9bf0e2d97ba6fecc)
hromium/java/com/android/webview/chromium/ResourceRewriter.java
|
| fd23af21150a4a8b499d1303de657f716ac0bf1e |
18-Sep-2014 |
Torne (Richard Coles) <torne@google.com> |
Fix resource rewriting in apps with other shared libs.
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
hromium/java/com/android/webview/chromium/ResourceRewriter.java
|
| a65663b5dba733416e4acf4417be230584435dc2 |
17-Sep-2014 |
Ben Murdoch <benm@google.com> |
Use drawables instead of mipmap for WebView icon.
The WebView doesn't have a need for mip-map icons, so use drawable
instead which allows us to strip the unused densities.
Bug: 17540943
Change-Id: I9960abc383efc2b0e744f80507c81cf7165ebbfa
(cherry picked from commit b1100a8d8e3bf2eb4e29bf11bb8da1677bd99b12)
hromium/AndroidManifest.xml
hromium/res/drawable-hdpi/icon_webview.png
hromium/res/drawable-mdpi/icon_webview.png
hromium/res/drawable-xhdpi/icon_webview.png
hromium/res/drawable-xxhdpi/icon_webview.png
hromium/res/mipmap-hdpi/icon_webview.png
hromium/res/mipmap-mdpi/icon_webview.png
hromium/res/mipmap-xhdpi/icon_webview.png
hromium/res/mipmap-xxhdpi/icon_webview.png
|
| d02af1c3904ae5558f8a5cc6c31829b3d74ecfef |
17-Sep-2014 |
Ben Murdoch <benm@google.com> |
am b1100a8d: Use drawables instead of mipmap for WebView icon.
* commit 'b1100a8d8e3bf2eb4e29bf11bb8da1677bd99b12':
Use drawables instead of mipmap for WebView icon.
|
| b1100a8d8e3bf2eb4e29bf11bb8da1677bd99b12 |
17-Sep-2014 |
Ben Murdoch <benm@google.com> |
Use drawables instead of mipmap for WebView icon.
The WebView doesn't have a need for mip-map icons, so use drawable
instead which allows us to strip the unused densities.
Bug: 17540943
Change-Id: I9960abc383efc2b0e744f80507c81cf7165ebbfa
hromium/AndroidManifest.xml
hromium/res/drawable-hdpi/icon_webview.png
hromium/res/drawable-mdpi/icon_webview.png
hromium/res/drawable-xhdpi/icon_webview.png
hromium/res/drawable-xxhdpi/icon_webview.png
hromium/res/mipmap-hdpi/icon_webview.png
hromium/res/mipmap-mdpi/icon_webview.png
hromium/res/mipmap-xhdpi/icon_webview.png
hromium/res/mipmap-xxhdpi/icon_webview.png
|
| 5d016d9a6abb8d713bc094662190721a8b2d95ae |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I262cbec9f490a39b0a5133ab39daee7150d070f6
Auto-generated-cl: translation import
hromium/res/values-bn-rBD/strings.xml
hromium/res/values-ca/strings.xml
hromium/res/values-eu-rES/strings.xml
hromium/res/values-gl-rES/strings.xml
hromium/res/values-hi/strings.xml
hromium/res/values-is-rIS/strings.xml
hromium/res/values-kk-rKZ/strings.xml
hromium/res/values-kn-rIN/strings.xml
hromium/res/values-ky-rKG/strings.xml
hromium/res/values-mk-rMK/strings.xml
hromium/res/values-ml-rIN/strings.xml
hromium/res/values-mr-rIN/strings.xml
hromium/res/values-my-rMM/strings.xml
hromium/res/values-ne-rNP/strings.xml
hromium/res/values-si-rLK/strings.xml
hromium/res/values-ta-rIN/strings.xml
hromium/res/values-te-rIN/strings.xml
hromium/res/values-ur-rPK/strings.xml
hromium/res/values-uz-rUZ/strings.xml
|
| e7088bc41cfbeb3eca02b1347c61cb21e37203b4 |
13-Sep-2014 |
Ying Wang <wangying@google.com> |
Disable dex-preopt.
The build system doesn't support building odex for both archs in
multilib build; Also the preloaded apk is expected to be replaced by the
one from Play Store.
Bug: 17409149
Change-Id: Ic86e47cc10d9147a16c815a6ed4d7f3ad2600f6b
(cherry picked from commit a8cbb40a27922961e439f8f0e0c919b689b48ab3)
hromium/package.mk
|
| 0113e744f224d10a0a6ec6d170696e768dfe3b6f |
15-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am df873b4a: (-s ours) Import translations. DO NOT MERGE
* commit 'df873b4a8a7ea416e9bf53712633355cc9f1e39d':
Import translations. DO NOT MERGE
|
| b17c11610c13d561203adfbf0d10e59734e52efb |
15-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am adcbfb74: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'adcbfb74a5460fd1bdc133f94615d8e79ba1377b':
Import translations. DO NOT MERGE
|
| df873b4a8a7ea416e9bf53712633355cc9f1e39d |
15-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I3ef7f0db4ecbb1a0460e108de765cea1c51a7d0b
Auto-generated-cl: translation import
hromium/res/values-ca/strings.xml
hromium/res/values-hi/strings.xml
|
| adcbfb74a5460fd1bdc133f94615d8e79ba1377b |
15-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into lmp-dev
|
| 9aa2f10bed64be30186275d3f874e7ed1c5a5458 |
14-Sep-2014 |
Ying Wang <wangying@google.com> |
am a8cbb40a: Disable dex-preopt.
* commit 'a8cbb40a27922961e439f8f0e0c919b689b48ab3':
Disable dex-preopt.
|
| a8cbb40a27922961e439f8f0e0c919b689b48ab3 |
13-Sep-2014 |
Ying Wang <wangying@google.com> |
Disable dex-preopt.
The build system doesn't support building odex for both archs in
multilib build; Also the preloaded apk is expected to be replaced by the
one from Play Store.
Bug: 17409149
Change-Id: Ic86e47cc10d9147a16c815a6ed4d7f3ad2600f6b
hromium/package.mk
|
| 1a4c166477298cf24d4cb5276449457cfea98c2d |
12-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
am fae9ed9a: Merge "Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev
* commit 'fae9ed9acdc780102b60fcc4269662174f4aa3a3':
Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
|
| 8e6f4d6a3f1d5e0252e7a63c397d3b2dbeabfed9 |
12-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
am a17d86e9: Don\'t use reflection to rewrite the WebView resources.
* commit 'a17d86e955b57c52637ccb8c46b01a71425d76b8':
Don't use reflection to rewrite the WebView resources.
|
| fae9ed9acdc780102b60fcc4269662174f4aa3a3 |
12-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev
|
| a63a43a08e447d69f7472d13b97cd402064f683a |
05-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
This is to match frameworks/base API changes.
BUG: 17253647
Change-Id: Id88a7f0652da2dc2994dd4025cee77e8103fa6f5
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| a17d86e955b57c52637ccb8c46b01a71425d76b8 |
11-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Don't use reflection to rewrite the WebView resources.
Bug: 16870075
Change-Id: Ie65a3a277ecb3c55622d5bab5916833768b1f21b
hromium/java/com/android/webview/chromium/ResourceRewriter.java
|
| aa36c6b5770974fae04acef747292eaafa7aa6c4 |
12-Sep-2014 |
Vivek Galatage <vivek.vg@samsung.com> |
WebViewChromiumFactoryProvider should import ResourceExtractor fromorg.chromium.base
Chromium repository CL, https://codereview.chromium.org/548023002 will migrate
ResourceExtractor.java inside org.chromium.base package.
The same should be reflected while importing ResourceExtractor in
WebViewChromiumFactoryProvider.java
Change-Id: Iced2182763d6e0769003c3bb096465ca8bbf68ac
(cherry picked from commit 03af49abac867afc9ace9324cf65079c7706496c)
Conflicts:
chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 60e4952d02f2bfa3f0705043b792c01f79ffbfa6 |
12-Sep-2014 |
Bart Sears <bsears@google.com> |
Merge "WebViewChromiumFactoryProvider should import ResourceExtractor fromorg.chromium.base" into chromium-dev
|
| 03af49abac867afc9ace9324cf65079c7706496c |
12-Sep-2014 |
Vivek Galatage <vivek.vg@samsung.com> |
WebViewChromiumFactoryProvider should import ResourceExtractor fromorg.chromium.base
Chromium repository CL, https://codereview.chromium.org/548023002 will migrate
ResourceExtractor.java inside org.chromium.base package.
The same should be reflected while importing ResourceExtractor in
WebViewChromiumFactoryProvider.java
Change-Id: Iced2182763d6e0769003c3bb096465ca8bbf68ac
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 3b3a02d119127f3a4cc7d121db4d74a674e5526e |
11-Sep-2014 |
Ben Murdoch <benm@google.com> |
am 4510b8d1: Merge "Remove check for styleable resources in WebView ResourceRewriter." into lmp-dev
* commit '4510b8d1bcdcfefaba80056e9e1d963c52f5234a':
Remove check for styleable resources in WebView ResourceRewriter.
|
| 4510b8d1bcdcfefaba80056e9e1d963c52f5234a |
11-Sep-2014 |
Ben Murdoch <benm@google.com> |
Merge "Remove check for styleable resources in WebView ResourceRewriter." into lmp-dev
|
| 91c538cbe7e746f1a972b463f3497a56addf579c |
10-Sep-2014 |
Ben Murdoch <benm@google.com> |
Remove check for styleable resources in WebView ResourceRewriter.
We know that we don't have any stylable resources in the WebView,
so we can eliminate the check in our ResourceRewriter; this removes
a costly repeated call to Class.getSimpleName().
Bug: 16870075
Change-Id: I48d1e581bc3bc89013b910d2b46cf480f1e9dcfc
hromium/java/com/android/webview/chromium/ResourceRewriter.java
|
| 0d3c16f8843de1c10a42d43a9fe2add8021af102 |
10-Sep-2014 |
Tao Bai <michaelbai@google.com> |
am 35716689: Implement FileChooserParams.createIntent and parseResult
* commit '357166898b3e67a1d5772345659ab7d29c7fa65e':
Implement FileChooserParams.createIntent and parseResult
|
| 36206a5214eb24ab619db0046d0dcba9be240c63 |
02-Sep-2014 |
Tao Bai <michaelbai@google.com> |
Implement FileChooserParams.createIntent and parseResult
BUG:17253647, 16624450
Change-Id: Ief3861fafabf2799f1d3575b30e2ceddbbb0f0d9
hromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java
hromium/java/com/android/webview/chromium/UploadHelperImpl.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| bc32c8b48888837f0482645b3a93aaa7fa813f8e |
02-Sep-2014 |
Tao Bai <michaelbai@google.com> |
Implement FileChooserParams.createIntent and parseResult
BUG:17253647, 16624450
Change-Id: Ief3861fafabf2799f1d3575b30e2ceddbbb0f0d9
hromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java
hromium/java/com/android/webview/chromium/UploadHelperImpl.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| f2e9853ae82a5b792ddf1af7c7d8924e9cb8c9b4 |
10-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Fix LASTCHANGE in merge_from_chromium.py when merging a release.
The previous changes to merge_from_chromium caused the script to
crash when generating LASTCHANGE for a release.
This fixes the crash by using the SHA1 of the upstream merge
parent to generate LASTCHANGE.
Change-Id: I34ff309400135bb09a91e7e32a9eb1aea1e8c310
hromium/tools/merge_from_chromium.py
|
| 70e496d940c22bf07cd2c5634e1819276ddac416 |
01-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Update the merge_to_master.py script for Git.
Changes the merge_to_master.py script to deal with the Chromium's
switch to Git.
Furhermore, this change introduces pedantic checks when merging a given
master-chromium snapshot (using a repo.prop file), verifying that the
projects SHAs in the archive match the SHAs in the repo.prop.
Shouldn't this happen, it analyzes the history of the mismatching
projects and prints out a detailed error message. In case of a mismatch,
the merge can be forced using the --force option.
Change-Id: I8909d064709921220afbed1cc55cbcc7c48ececa
(cherry picked from commit 18e8e49dbb79d50be03314b30f997cfa8561c347)
hromium/tools/merge_common.py
hromium/tools/merge_from_chromium.py
hromium/tools/merge_to_master.py
|
| 357166898b3e67a1d5772345659ab7d29c7fa65e |
02-Sep-2014 |
Tao Bai <michaelbai@google.com> |
Implement FileChooserParams.createIntent and parseResult
BUG:17253647, 16624450
Change-Id: Ief3861fafabf2799f1d3575b30e2ceddbbb0f0d9
hromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java
hromium/java/com/android/webview/chromium/UploadHelperImpl.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 82c4666db142d02aef0a52250134aebd26e905ec |
06-Sep-2014 |
Ben Murdoch <benm@google.com> |
Merge "Update some content classes to content_public" into master-chromium
|
| eb387421d4987e7ee2b4ea871f2f51e89cf72f18 |
05-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
am 98f9a279: Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
* commit '98f9a279824c46479f89fbad2a900ef648e5f579':
Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
|
| 556ee2ee901252baba7a701c693b456bd799d433 |
05-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
This is to match frameworks/base API changes.
BUG: 17253647
Change-Id: Ica8c1afcef634d170951bac4c2b5c519794c57a4
(cherry picked from commit 98f9a279824c46479f89fbad2a900ef648e5f579)
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 76805379e7649a25b9fb27b992c3909717d6cc41 |
05-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
This is to match frameworks/base API changes.
BUG: 17253647
Change-Id: Ica8c1afcef634d170951bac4c2b5c519794c57a4
(cherry picked from commit 98f9a279824c46479f89fbad2a900ef648e5f579)
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| b709ef5b46f5ef3d33dd9aefe125fd2ec6ba0680 |
05-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
This is to match frameworks/base API changes.
BUG: 17253647
Change-Id: Id88a7f0652da2dc2994dd4025cee77e8103fa6f5
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 98f9a279824c46479f89fbad2a900ef648e5f579 |
05-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
This is to match frameworks/base API changes.
BUG: 17253647
Change-Id: Ica8c1afcef634d170951bac4c2b5c519794c57a4
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| e41e1345223db88c81501a96abc726ba44a4af6d |
04-Sep-2014 |
Selim Gurun <sgurun@google.com> |
am 5b026de6: Remove the plumbing for optOutDataReductionProxy API
* commit '5b026de657a1e072549622323a7350af3afc5a9e':
Remove the plumbing for optOutDataReductionProxy API
|
| 08405508c87986b13e10dcc33bee2ce3312f5b58 |
04-Sep-2014 |
Richard Coles <torne@google.com> |
Revert "Revert "Add libjpeg_turbo to merge list.""
This reverts commit b77c162ab29152d6a4d81be3edd1f650602172f4. License issue is now fixed.
Change-Id: I543e1fdb4709cd020673b74c4214147eecacba77
hromium/tools/merge_common.py
|
| b77c162ab29152d6a4d81be3edd1f650602172f4 |
04-Sep-2014 |
Richard Coles <torne@google.com> |
Revert "Add libjpeg_turbo to merge list."
License is not marked as Android compatible.
This reverts commit 7dcc1a97013a6700f794747157798737ff03a28e.
Change-Id: Iae457f85ed552e9ceb48bf33df25b6d3955ef6b8
hromium/tools/merge_common.py
|
| 7dcc1a97013a6700f794747157798737ff03a28e |
04-Sep-2014 |
Torne (Richard Coles) <torne@google.com> |
Add libjpeg_turbo to merge list.
To allow us to stop depending on the system libjpeg, start merging
chromium's libjpeg_turbo.
Change-Id: Idb1e211b99e0be23185e6598912905956145cd66
hromium/tools/merge_common.py
|
| 44d477c110a2b300057592682d7d9b9ced19fc98 |
03-Sep-2014 |
Selim Gurun <sgurun@google.com> |
Remove the plumbing for optOutDataReductionProxy API
Bug: 17253647
Change-Id: Ic722cd96bf8bfb895aa812a1181b1e0870ce0a1f
(cherry picked from commit 5b026de657a1e072549622323a7350af3afc5a9e)
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 318568c4b5933ce429c402d076bf65da69775706 |
03-Sep-2014 |
Bo Liu <boliu@google.com> |
Update some content classes to content_public
Corresponds to chromium https://codereview.chromium.org/406023002/
Patch authored by ajith.v@samsung.com
Change-Id: I6da4b2afc54c8d6491726e1d6abeeeb2b83ca9db
hromium/java/com/android/webview/chromium/WebBackForwardListChromium.java
hromium/java/com/android/webview/chromium/WebHistoryItemChromium.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 8dc9a9d1217f84a7f9b0554f22a826394eabc856 |
04-Sep-2014 |
Bart Sears <bsears@google.com> |
Merge "Update some content classes to content_public" into chromium-dev
|
| 7afad6eccb2e0f8b491b0c9da160ed6a328522d3 |
03-Sep-2014 |
Selim Gurun <sgurun@google.com> |
Remove the plumbing for optOutDataReductionProxy API
Bug: 17253647
Change-Id: Ic722cd96bf8bfb895aa812a1181b1e0870ce0a1f
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| dd42431b901d53c0b902499a3626151c84619c39 |
03-Sep-2014 |
Selim Gurun <sgurun@google.com> |
Remove the plumbing for optOutDataReductionProxy API
Bug: 17253647
Change-Id: Ic722cd96bf8bfb895aa812a1181b1e0870ce0a1f
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| e73e669ac73b2ddc042e380cd784ba8bd39ebb95 |
03-Sep-2014 |
Bo Liu <boliu@google.com> |
Update some content classes to content_public
Corresponds to chromium https://codereview.chromium.org/406023002/
Patch authored by ajith.v@samsung.com
Change-Id: I6da4b2afc54c8d6491726e1d6abeeeb2b83ca9db
hromium/java/com/android/webview/chromium/WebBackForwardListChromium.java
hromium/java/com/android/webview/chromium/WebHistoryItemChromium.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 5b026de657a1e072549622323a7350af3afc5a9e |
03-Sep-2014 |
Selim Gurun <sgurun@google.com> |
Remove the plumbing for optOutDataReductionProxy API
Bug: 17253647
Change-Id: Ic722cd96bf8bfb895aa812a1181b1e0870ce0a1f
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| db0b20b745010516979a79b1404bf74c4cadca97 |
03-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ib5e45c34f56b2711b91a617c5b86b64bf429fa60
Auto-generated-cl: translation import
hromium/res/values-af/strings.xml
hromium/res/values-am/strings.xml
hromium/res/values-ar/strings.xml
hromium/res/values-bg/strings.xml
hromium/res/values-bn-rBD/strings.xml
hromium/res/values-ca/strings.xml
hromium/res/values-cs/strings.xml
hromium/res/values-da/strings.xml
hromium/res/values-de/strings.xml
hromium/res/values-el/strings.xml
hromium/res/values-en-rGB/strings.xml
hromium/res/values-en-rIN/strings.xml
hromium/res/values-es-rUS/strings.xml
hromium/res/values-es/strings.xml
hromium/res/values-et-rEE/strings.xml
hromium/res/values-eu-rES/strings.xml
hromium/res/values-fa/strings.xml
hromium/res/values-fi/strings.xml
hromium/res/values-fr-rCA/strings.xml
hromium/res/values-fr/strings.xml
hromium/res/values-gl-rES/strings.xml
hromium/res/values-hi/strings.xml
hromium/res/values-hr/strings.xml
hromium/res/values-hu/strings.xml
hromium/res/values-hy-rAM/strings.xml
hromium/res/values-in/strings.xml
hromium/res/values-is-rIS/strings.xml
hromium/res/values-it/strings.xml
hromium/res/values-iw/strings.xml
hromium/res/values-ja/strings.xml
hromium/res/values-ka-rGE/strings.xml
hromium/res/values-kk-rKZ/strings.xml
hromium/res/values-km-rKH/strings.xml
hromium/res/values-kn-rIN/strings.xml
hromium/res/values-ko/strings.xml
hromium/res/values-ky-rKG/strings.xml
hromium/res/values-lo-rLA/strings.xml
hromium/res/values-lt/strings.xml
hromium/res/values-lv/strings.xml
hromium/res/values-mk-rMK/strings.xml
hromium/res/values-ml-rIN/strings.xml
hromium/res/values-mn-rMN/strings.xml
hromium/res/values-mr-rIN/strings.xml
hromium/res/values-ms-rMY/strings.xml
hromium/res/values-my-rMM/strings.xml
hromium/res/values-nb/strings.xml
hromium/res/values-ne-rNP/strings.xml
hromium/res/values-nl/strings.xml
hromium/res/values-pl/strings.xml
hromium/res/values-pt-rPT/strings.xml
hromium/res/values-pt/strings.xml
hromium/res/values-ro/strings.xml
hromium/res/values-ru/strings.xml
hromium/res/values-si-rLK/strings.xml
hromium/res/values-sk/strings.xml
hromium/res/values-sl/strings.xml
hromium/res/values-sr/strings.xml
hromium/res/values-sv/strings.xml
hromium/res/values-sw/strings.xml
hromium/res/values-ta-rIN/strings.xml
hromium/res/values-te-rIN/strings.xml
hromium/res/values-th/strings.xml
hromium/res/values-tl/strings.xml
hromium/res/values-tr/strings.xml
hromium/res/values-uk/strings.xml
hromium/res/values-ur-rPK/strings.xml
hromium/res/values-uz-rUZ/strings.xml
hromium/res/values-vi/strings.xml
hromium/res/values-zh-rCN/strings.xml
hromium/res/values-zh-rHK/strings.xml
hromium/res/values-zh-rTW/strings.xml
hromium/res/values-zu/strings.xml
|
| 18e8e49dbb79d50be03314b30f997cfa8561c347 |
01-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Update the merge_to_master.py script for Git.
Changes the merge_to_master.py script to deal with the Chromium's
switch to Git.
Furhermore, this change introduces pedantic checks when merging a given
master-chromium snapshot (using a repo.prop file), verifying that the
projects SHAs in the archive match the SHAs in the repo.prop.
Shouldn't this happen, it analyzes the history of the mismatching
projects and prints out a detailed error message. In case of a mismatch,
the merge can be forced using the --force option.
Change-Id: I8909d064709921220afbed1cc55cbcc7c48ececa
hromium/tools/merge_common.py
hromium/tools/merge_from_chromium.py
hromium/tools/merge_to_master.py
|
| 30808fe04a756152331a5196b64ca857de714ab1 |
02-Sep-2014 |
Torne (Richard Coles) <torne@google.com> |
Skip commits up to 76399f9 from AOSP.
Merge up to 76399f9 with -s ours. The commits here are either
cherrypicks of L changes or were only required to keep AOSP compiling
against K, so they can all be discarded.
Bug: 17315591
|
| a71fdd6cb2e928085caa4433cbde15daf9ef8109 |
02-Sep-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Make init command line happen early"
Resolved conflicts for merge of 0a42eb2 into lmp-dev-plus-aosp.
Bug: 17315591
Change-Id: I976a3a8437ae2a5214a1a91ef2dd2c34b38b58e5
|
| 98fae68cbd9329026953fa1a0cbb6bbaa220b668 |
02-Sep-2014 |
Torne (Richard Coles) <torne@google.com> |
Skip commits up to b20a4cb from AOSP.
Merge up to b20a4cb with -s ours. The commits here are either
cherrypicks of L changes or were only required to keep AOSP compiling
against K, so they can be discarded.
Bug: 17315591
|
| 78e79ef7576a620fe6f19da5a6327ca8ef2c53f5 |
02-Sep-2014 |
Torne (Richard Coles) <torne@google.com> |
Skip commits up to 2846d3c from AOSP.
Merge up to 2846d3c with -s ours. The commits here are either
cherrypicks of L changes or were only required to keep AOSP compiling
against K, so they can all be discarded.
Bug: 17315591
|
| d59fae725b4274251238a5b88a63add56b9ec21a |
02-Sep-2014 |
Torne (Richard Coles) <torne@google.com> |
Update from lmp-dev.
Update the branch from the current lmp-dev in preparation for
reactivating automergers.
Bug: 17315591
|
| 04cc2fafb1103e5d9d9947e899ce4bb285b00b52 |
01-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Don't declare WebView as a library." into chromium-dev
|
| 29ddcdeff3ea9b1ed86cf726af0de5dac40db7e2 |
05-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Don't declare WebView as a library.
We don't need to declare WebView as a library as we add its resources to
the asset manager dynamically rather than through a <uses-library> tag
in an application manifest. This also removes the need for it to be a
privileged application.
Bug: 11505352
Change-Id: Ief2f7a72a1068f51edf8842bd1d1c77dad7b23ca
(cherry picked from commit f3f92fd925e1a70e93e07850b8d5a8d0b5328e08)
hromium/Android.mk
hromium/AndroidManifest.xml
hromium/CleanSpec.mk
|
| 76399f9cd23a85c1789f720bfa523a9cdc8efc2b |
01-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Don't declare WebView as a library."
|
| f3f92fd925e1a70e93e07850b8d5a8d0b5328e08 |
05-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Don't declare WebView as a library.
We don't need to declare WebView as a library as we add its resources to
the asset manager dynamically rather than through a <uses-library> tag
in an application manifest. This also removes the need for it to be a
privileged application.
Bug: 11505352
Change-Id: Ief2f7a72a1068f51edf8842bd1d1c77dad7b23ca
hromium/Android.mk
hromium/AndroidManifest.xml
hromium/CleanSpec.mk
|
| b1a19f5cf4c75d8cbb01b740b6f0e9216d8a38f3 |
01-Sep-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Merge chromium-dev up to 9d15314"
|
| 26a06d159074323f26320430edafc5494e909482 |
21-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Disable building the APK when a prebuilt is in use.
If the product is configured to use a prebuilt webview APK, don't
attempt to build it from source to avoid a duplicate definition.
Bug: 16870861
Change-Id: I689cda55ef75c843bca2aa020df1b4cefd8821dc
(cherry picked from commit c182da21c498c2b3f143e9b775f89a7aeb9be6ce)
hromium/Android.mk
|
| 3688d4e395b6ce345514f15304b9c670ed1ab875 |
28-Aug-2014 |
Ben Murdoch <benm@google.com> |
Cherry pick "StrictMode warning reading command line file."
Cherry pick I659d8b42459bfecc299374b774405e952a74bf2d to
master-chromium.
Change-Id: If30edb8c324dada8ed99da400a5f9c5fab89f938
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| b1cbea915d72ba2195220db4de79e289a9cbebc4 |
28-Aug-2014 |
Ben Murdoch <benm@google.com> |
Suppress StrictMode warning reading command line file.
The command line file is only ever read on debuggable builds, so
it doesn't really matter if we trigger strict mode warnings to do it.
To avoid the log spam, disable strict mode around the file read.
Bug:17313418
Change-Id: I659d8b42459bfecc299374b774405e952a74bf2d
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 9a8a2e3bf4f64a7f8e967d43ae6b37f0c8275cce |
28-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r291560
This commit was generated by merge_to_master.py.
Change-Id: I9b0d613d38eda89eafb8e1f70037f7d1326aae90
|
| 5226c5df01b85e8944b20c1462c035b4b9dbcd46 |
28-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Merge "Update API name to comply with changes to API" into lmp-dev
|
| 547c79b0621ef5879d01998b8eaa8914a8ef4f13 |
28-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Update API name to comply with changes to API
Bug: 17253647
API council requested a change to an API name. This is the
plumbing side of the change.
Change-Id: I12e85c36df9a96c27855d01afddeae586d57d1c1
hromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java
|
| df782651436e0f03d2972a3421bfefff7caa6bf1 |
28-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Update API name to comply with changes to API
Bug: 17253647
API council requested a change to an API name. This is the
plumbing side of the change.
Change-Id: I12e85c36df9a96c27855d01afddeae586d57d1c1
hromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java
|
| 1288f69b0e1a837e5236f4019b906d5daf43454a |
28-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Update API name to comply with changes to API
Bug: 17253647
API council requested a change to an API name. This is the
plumbing side of the change.
Change-Id: I12e85c36df9a96c27855d01afddeae586d57d1c1
hromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java
|
| d32d8217d4cfa748b0d1a1cbe22d0127d02cf272 |
27-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Bump chromium version to 39." into master-chromium
|
| 780848208e45519ee9e6d465bbfaf8e85088f72d |
27-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Bump chromium version to 39.
Update version makefile to reflect chromium version.
Change-Id: I84c7aacc6dd78206d6437f4574f90df6f5a7c274
hromium/version.mk
|
| c0525825bff50f535186b5224d33a00f049db8bd |
27-Aug-2014 |
Ben Murdoch <benm@google.com> |
Update WebView APK name.
Bug: 16902981
Change-Id: I96fa2d35dabb64025f3b2c25565f08efe793c194
(cherry picked from commit 874c81b8dd2ba7c0e661a96e4fc683f2b8ac97b2)
hromium/AndroidManifest.xml
|
| 874c81b8dd2ba7c0e661a96e4fc683f2b8ac97b2 |
27-Aug-2014 |
Ben Murdoch <benm@google.com> |
Update WebView APK name.
Bug: 16902981
Change-Id: I96fa2d35dabb64025f3b2c25565f08efe793c194
hromium/AndroidManifest.xml
|
| 835aeb90a376699f177d2da20ab83387b578ebc6 |
27-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Remove openssl from merged projects list.
OpenSSL has been replaced by boringssl upstream and no longer exists in
DEPS.
Change-Id: Idb3ad563ead2a48b98196359a65bde9fa52da90e
hromium/tools/merge_common.py
|
| 753233e1666d4a8f69a4fae4345f9590f19589ef |
25-Aug-2014 |
Primiano Tucci <primiano@google.com> |
Update merge_from_chromium.py after Chromium Git migration.
Chromium has switched to Git. SVN is not the source of truth anymore.
The following change removes --svn support from merge_from_chromium.py
and makes it understand git.
Also, this is removing the --lkgr option, as LKGR is being deprecated
in chromium.
Change-Id: I879e9cda2cee313f1e2409a1a85b173db59efd8c
hromium/tools/merge_from_chromium.py
|
| 3a0ab2ff4cba5c8bff1dde47e3a921f6bb22b334 |
26-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Disable building the APK when a prebuilt is in use." into lmp-dev
|
| d7df4f8174db75f2cf0712802b9eaea9b172d18b |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-chromium
|
| 19870035fc874a4f3ff8e4a42ba530fda73a7c17 |
22-Aug-2014 |
Ignacio Solla <igsolla@google.com> |
Cherry-pick: Remove debug logging.
Cherry pick of https://googleplex-android-review.git.corp.google.com/#/c/531078
BUG:16778823
Change-Id: I92c5b64d6f2347bedfb9959b4d2f90d1db8f394b
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 8d38e29f1a37b910fa3eafc0f0fc801d1fa491c3 |
22-Aug-2014 |
Ignacio Solla <igsolla@google.com> |
Remove debug logging.
BUG:16778823
Change-Id: I92c5b64d6f2347bedfb9959b4d2f90d1db8f394b
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 9d66ae46cd803eff9f0f4d3a0a1e87a65168ecfd |
22-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge chromium-dev up to 9d15314
|
| 9d1531430cf12ca2144fffd5e1fed797b2960c00 |
22-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Make init command line happen early" into chromium-dev
|
| 8c71319ce72eb19a69937661ef5a15842041f1f0 |
22-Aug-2014 |
Allen Hair <allenhair@google.com> |
Merge "Update WebViewFlingTest to use new UiAutomator API." into lmp-dev
|
| b20a4cbbdf1dca48b2b6e33b676fa7a568809a2c |
21-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Don't use android.internal.R for resources." into chromium-dev
|
| 3f3b5f89800da76239f98f0ae0b17be158c2d4bf |
21-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "AOSP-only changes to support the WebView loading from an APK." into chromium-dev
|
| 9d92423ed626bef052859a92639fe22bccdc2355 |
21-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Generate symlinks to libwebviewchromium.so in /system/priv-app" into chromium-dev
|
| 7bb8bff8d11b21f94fec5d40fd1001d0eb08461d |
21-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Generate resources before running aapt." into chromium-dev
|
| 855360f74fe6be5656835d9720819fdf2c9c5f7f |
21-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Include pak files in the WebView apk." into chromium-dev
|
| 4598b8f165a850fd7f8c6afaece6ed50abb75ad5 |
21-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Move WebView resources to separate APK" into chromium-dev
|
| de0b55454d967b5320cf2fa20e0ce70e4d95a4f2 |
21-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Add com.android.webview to the package whitelist." into chromium-dev
|
| d167209eaa67ade677c8c56f09ec8136ad4d4670 |
21-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Make the WebView Java library into an APK." into chromium-dev
|
| cfadfad37cb8a435831012fc39d72cf0b7e72e36 |
21-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Don't use android.internal.R for resources.
We don't want to use framework internal resources in the WebView
APK.
Change-Id: Id3c8a89a73c40902442e871033b7277ae4601fe4
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/res/raw/webviewchromium_loaderror.html
hromium/res/raw/webviewchromium_nodomain.html
hromium/res/values/strings.xml
|
| fd409578f49999aff51b1b5e1e989001c90cb5bc |
04-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
AOSP-only changes to support the WebView loading from an APK.
Change-Id: If4404d21802d6fd5a7b9d76238b4bed75fbafd32
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/res/values/config.xml
|
| 0a00dfcca7b4e460693b9f13d25bced52a7d6092 |
25-Jul-2014 |
Primiano Tucci <primiano@google.com> |
Generate symlinks to libwebviewchromium.so in /system/priv-app
This change declares libwebviewchromium to be treated as a JNI lib
for the webviewchromium.apk. By doing this, the build system will
create symlinks from /system/app-priv/webviewchromium/lib/...
(which is the path returned by the package manager) to the actual
libraries in /system/lib*.
Furthermore this change also declares the apk to be a multilib
target, so that both libraries get symlinked on multi-arch devices.
BUG:16403706
Change-Id: Ib02191eddf8262b2b23c3c32d07e77b33759285d
hromium/Android.mk
|
| b825b8152a399550b992d70909f45e7d8ceb230a |
31-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Generate resources before running aapt.
This adds the dependency needed to generate resources before running
AAPT on them.
Change-Id: I43787cb6c883a2b57c19b1348b684264c3b3bc0a
hromium/Android.mk
|
| 82398795061179bdee663d7403fd7f5c7e0adee8 |
24-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Include pak files in the WebView apk.
This change makes the webviewchromium.apk include the Chromium
native resource .pak files. The main reason for the complexity
of the change is the fact that the .pak files are generated by
the build system and therefore need to be copied to the target
folder before the AAPT invocation.
BUG=11505352
Change-Id: I4cca827212898460dca3d4c4c16f2e3ec5b6efc6
hromium/Android.mk
|
| c182da21c498c2b3f143e9b775f89a7aeb9be6ce |
21-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Disable building the APK when a prebuilt is in use.
If the product is configured to use a prebuilt webview APK, don't
attempt to build it from source to avoid a duplicate definition.
Bug: 16870861
Change-Id: I689cda55ef75c843bca2aa020df1b4cefd8821dc
hromium/Android.mk
|
| 9466847557bf121558aaf7908e8858feba4d2667 |
21-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Enable wrap_contents quirk for apps targetting pre-L SDK." into master-chromium
|
| 07b1e4e65d435e156ef389d45f0a2be1ff35a09c |
15-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Enable wrap_contents quirk for apps targetting pre-L SDK.
We have simplified wrap contents semantics for both pre-L and L+ apps,
this change hooks up toggling between pre-L and post-L semantics.
BUG: 17157608
Change-Id: I2ee3a287aed709f46d033e3d70661f3df7363192
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 386cea259790193b4c885f783c2b5d7ae435f283 |
21-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Enable wrap_contents quirk for apps targetting pre-L SDK." into lmp-dev
|
| d54876d59ed3426334afc4d85ff9153dfdef9f2f |
12-May-2014 |
Marcin Kosiba <mkosiba@google.com> |
Move WebView resources to separate APK
BUG: 11505352
Change-Id: I1f601605943738dd207a6ba267063c00527565de
hromium/Android.mk
hromium/AndroidManifest.xml
hromium/chromium.mk
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_button_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_border.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/layout-land/webviewchromium_date_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_advanced_component.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_title.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_suggestion.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_dropdown_text.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_multi_field_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_two_field_date_picker.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml
hromium/overlay/frameworks/base/core/res/res/menu/webviewchromium_select_action_menu.xml
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az-rAZ/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne-rNP/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si-rLK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values/attrs.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/colors.xml
hromium/overlay/frameworks/base/core/res/res/values/config.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
hromium/overlay/frameworks/base/core/res/res/values/values.xml
hromium/proguard.flags
hromium/res/drawable-hdpi/ic_media_video_poster.png
hromium/res/drawable-ldpi/ic_media_video_poster.png
hromium/res/drawable-mdpi/ic_media_video_poster.png
hromium/res/drawable-xhdpi/ic_media_video_poster.png
hromium/res/values-af/strings.xml
hromium/res/values-am/strings.xml
hromium/res/values-ar/strings.xml
hromium/res/values-az-rAZ/strings.xml
hromium/res/values-az/strings.xml
hromium/res/values-bg/strings.xml
hromium/res/values-ca/strings.xml
hromium/res/values-cs/strings.xml
hromium/res/values-da/strings.xml
hromium/res/values-de/strings.xml
hromium/res/values-el/strings.xml
hromium/res/values-en-rGB/strings.xml
hromium/res/values-en-rIN/strings.xml
hromium/res/values-es-rUS/strings.xml
hromium/res/values-es/strings.xml
hromium/res/values-et-rEE/strings.xml
hromium/res/values-fa/strings.xml
hromium/res/values-fi/strings.xml
hromium/res/values-fr-rCA/strings.xml
hromium/res/values-fr/strings.xml
hromium/res/values-hi/strings.xml
hromium/res/values-hr/strings.xml
hromium/res/values-hu/strings.xml
hromium/res/values-hy-rAM/strings.xml
hromium/res/values-in/strings.xml
hromium/res/values-it/strings.xml
hromium/res/values-iw/strings.xml
hromium/res/values-ja/strings.xml
hromium/res/values-ka-rGE/strings.xml
hromium/res/values-km-rKH/strings.xml
hromium/res/values-ko/strings.xml
hromium/res/values-lo-rLA/strings.xml
hromium/res/values-lt/strings.xml
hromium/res/values-lv/strings.xml
hromium/res/values-mn-rMN/strings.xml
hromium/res/values-ms-rMY/strings.xml
hromium/res/values-nb/strings.xml
hromium/res/values-ne-rNP/strings.xml
hromium/res/values-ne/strings.xml
hromium/res/values-nl/strings.xml
hromium/res/values-pl/strings.xml
hromium/res/values-pt-rPT/strings.xml
hromium/res/values-pt/strings.xml
hromium/res/values-ro/strings.xml
hromium/res/values-ru/strings.xml
hromium/res/values-si-rLK/strings.xml
hromium/res/values-si/strings.xml
hromium/res/values-sk/strings.xml
hromium/res/values-sl/strings.xml
hromium/res/values-sr/strings.xml
hromium/res/values-sv/strings.xml
hromium/res/values-sw/strings.xml
hromium/res/values-th/strings.xml
hromium/res/values-tl/strings.xml
hromium/res/values-tr/strings.xml
hromium/res/values-uk/strings.xml
hromium/res/values-vi/strings.xml
hromium/res/values-zh-rCN/strings.xml
hromium/res/values-zh-rHK/strings.xml
hromium/res/values-zh-rTW/strings.xml
hromium/res/values-zu/strings.xml
hromium/res/values/strings.xml
|
| 62cac143c8c94f4eab0c8c16864bd78cd6475023 |
29-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Add com.android.webview to the package whitelist.
Change-Id: Iaefe1ea31e3e23cc6ae94899103ad9600af8b022
hromium/jar_package_whitelist.txt
|
| ab83716e2c067655ab6c985e31ca6e6152db5009 |
17-Jul-2014 |
Torne (Richard Coles) <torne@google.com> |
Make the WebView Java library into an APK.
Package the WebView Java code as an APK instead of a JAR. Mark this as a
multiarch app so that dexopt will be run for both architectures on a
multiarch device. Add a CleanSpec to delete the old JAR.
Bug: 16329371
Change-Id: Ic09958e965b9163ac6b597df7005dd4a05de7a56
(cherry picked from commit 9674dff549ad8358b4439abcb6cf8f86cd11b307)
hromium/Android.mk
hromium/AndroidManifest.xml
hromium/CleanSpec.mk
|
| 94bf55cd616620b90fdf4be9a528fdd2b3058942 |
21-Aug-2014 |
Ben Murdoch <benm@google.com> |
WebView fix for devices running <LRW48.
googlefood is currently running 45I and so will not be able to run
the latest APK we built. Add a patch for the issue, and will repsin
APKs to push out.
Bug: 17172566
Change-Id: Ic4d4fb2f677951d1143a97c27cf4bd9541f2d5fa
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 2283d9e848d4bd4ad815d8a76dc31b30811b7fdd |
15-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Enable wrap_contents quirk for apps targetting pre-L SDK.
We have simplified wrap contents semantics for both pre-L and L+ apps,
this change hooks up toggling between pre-L and post-L semantics.
BUG: 17157608
Change-Id: I2ee3a287aed709f46d033e3d70661f3df7363192
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| c287310ea4204c907e76593e2b0d6a874c88c813 |
19-Aug-2014 |
Allen Hair <allenhair@google.com> |
Update WebViewFlingTest to use new UiAutomator API.
Change-Id: I932fc013c923c502082a9cb81fabe130bdf8c928
hromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java
|
| 663169af86c274e325223c5c77c62bca8da90ffb |
19-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r290040
This commit was generated by merge_to_master.py.
Change-Id: I2a0424ed6c699e87e82af243c384e56796017f77
|
| 1f580ee6cf1c6db66a5af61c5c920279620c3df0 |
18-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I3e646bbe056f2e149db831f381ef1237fe76cddf
Auto-generated-cl: translation import
hromium/res/values-af/strings.xml
hromium/res/values-am/strings.xml
hromium/res/values-ar/strings.xml
hromium/res/values-bg/strings.xml
hromium/res/values-ca/strings.xml
hromium/res/values-cs/strings.xml
hromium/res/values-da/strings.xml
hromium/res/values-de/strings.xml
hromium/res/values-el/strings.xml
hromium/res/values-en-rGB/strings.xml
hromium/res/values-en-rIN/strings.xml
hromium/res/values-es-rUS/strings.xml
hromium/res/values-es/strings.xml
hromium/res/values-et-rEE/strings.xml
hromium/res/values-fa/strings.xml
hromium/res/values-fi/strings.xml
hromium/res/values-fr-rCA/strings.xml
hromium/res/values-fr/strings.xml
hromium/res/values-hi/strings.xml
hromium/res/values-hr/strings.xml
hromium/res/values-hu/strings.xml
hromium/res/values-hy-rAM/strings.xml
hromium/res/values-in/strings.xml
hromium/res/values-it/strings.xml
hromium/res/values-iw/strings.xml
hromium/res/values-ja/strings.xml
hromium/res/values-ka-rGE/strings.xml
hromium/res/values-km-rKH/strings.xml
hromium/res/values-ko/strings.xml
hromium/res/values-lo-rLA/strings.xml
hromium/res/values-lt/strings.xml
hromium/res/values-lv/strings.xml
hromium/res/values-mn-rMN/strings.xml
hromium/res/values-ms-rMY/strings.xml
hromium/res/values-nb/strings.xml
hromium/res/values-nl/strings.xml
hromium/res/values-pl/strings.xml
hromium/res/values-pt-rPT/strings.xml
hromium/res/values-pt/strings.xml
hromium/res/values-ro/strings.xml
hromium/res/values-ru/strings.xml
hromium/res/values-sk/strings.xml
hromium/res/values-sl/strings.xml
hromium/res/values-sr/strings.xml
hromium/res/values-sv/strings.xml
hromium/res/values-sw/strings.xml
hromium/res/values-th/strings.xml
hromium/res/values-tl/strings.xml
hromium/res/values-tr/strings.xml
hromium/res/values-uk/strings.xml
hromium/res/values-vi/strings.xml
hromium/res/values-zh-rCN/strings.xml
hromium/res/values-zh-rHK/strings.xml
hromium/res/values-zh-rTW/strings.xml
hromium/res/values-zu/strings.xml
|
| 05835b0b6de8ed124b23d18159267efc475bd8f1 |
14-Aug-2014 |
Martin Kosiba <mkosiba@google.com> |
Finish zoomBy API hookup.
BUG: 13399510
(cherry picked from commit e497b03334a877ad60cb0d82578287fea11be46d)
Change-Id: Ic1a75f10778af562d1a5485c8f1a4bed7edba2ee
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 1cec52f6adfb1a0d2210a326684e88ad042d5dd1 |
15-Aug-2014 |
Martin Kosiba <mkosiba@google.com> |
Merge "Finish zoomBy API hookup." into lmp-dev
|
| 074f227d175b9e70783dc939555ee89005642977 |
14-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Do not read DRP key from GServices
Bug: 12492817
In L-preview, we temporarily used GServices to read DRP key. remove
this mechanism and embed the key into the apk.
Change-Id: Id94ac1348e615a8fa5a21c9e4a5bd43399821e46
hromium/Android.mk
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/package.mk
hromium/proguard.flags
|
| d893424e7dbe4595dd5b61ab9697930691f1b017 |
14-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Do not read DRP key from GServices
Bug: 12492817
In L-preview, we temporarily used GServices to read DRP key. remove
this mechanism and embed the key into the apk.
Change-Id: Id94ac1348e615a8fa5a21c9e4a5bd43399821e46
hromium/Android.mk
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/package.mk
hromium/proguard.flags
|
| e497b03334a877ad60cb0d82578287fea11be46d |
14-Aug-2014 |
Martin Kosiba <mkosiba@google.com> |
Finish zoomBy API hookup.
BUG: 13399510
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| fa3440fce5cb7e02cbf5531f09398acf70f786b5 |
15-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Merge "Do not read DRP key from GServices" into lmp-dev
|
| 64059ae334ba27d77e4f31e4a70d2e8df7ea618e |
14-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Do not read DRP key from GServices
Bug: 12492817
In L-preview, we temporarily used GServices to read DRP key. remove
this mechanism and embed the key into the apk.
Change-Id: Id94ac1348e615a8fa5a21c9e4a5bd43399821e46
hromium/Android.mk
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/package.mk
hromium/proguard.flags
|
| 798eef952efe49826b17dcf9f3bf27e4731188cf |
14-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Delete profile data if the WebView is downgraded.
If the WebView package has been downgraded since the previous time we
were used in this application, it may not be safe to load data from the
old profile as Chromium doesn't support this. Detect the downgrade by
saving the version code of the package in a shared preference and
deleting the profile files if it's lower.
Bug: 16724751
Change-Id: I832dccadee1f27f8bf480a21200be584949755f0
(cherry picked from commit 7377fc0716b475f1063e0bea963cc6baecf4560c)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 462a80eeb54228445a3601b6aef6a3484cbf2615 |
13-Aug-2014 |
Bo Liu <boliu@google.com> |
Fix merge_from_chromium.py script to work with new buildspec repo
New repo at
https://chrome-internal.googlesource.com/chrome/tools/buildspec
The updated script will work with 37.0.2062.70 in the 37.0.2062 branch.
Change-Id: I298f66e15bbf98ea9d83fc7e4b67efb9b19e0d4c
(cherry picked from commit 37b38e94b68b98cc79e412f53e38efe69bfaca27)
hromium/tools/merge_from_chromium.py
|
| 0a42eb247eb896be1737d87fe51c0fb6b0f20b21 |
14-Aug-2014 |
Hector Dearman <hjd@google.com> |
Make init command line happen early
This should happen early so that the command line is ready
by the time Chromium is switching the command line
over at the end of loadLibrary. This also fixes the problem
with the CookieManager setup path where it would not get
the command line.
Bug: 12370587
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 7b7d30a245af5508acc1169699e4f7ab05af13b9 |
03-Jul-2014 |
Hector Dearman <hjd@google.com> |
Ensures the CookieManager receives command line
Sets the command line flags correctly even if the CookieManager
is started first by moving the initialisation to before the load
step.
Change-Id: I48a49fe31e79c10e497d0d2b6a7ce6c15a9ed593
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 4ad366c663de934ed292e813505f8c71aeadb649 |
13-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Add a trace event for AwBrowserProcess.loadLibrary.
Add a system trace event for the call to AwBrowserProcess.loadLibrary so
we can easily measure how much it contributes to the WebView startup
time.
Bug: 16870075
Change-Id: Ic729726f1c3f5f2d689ba83858422c33dd4877df
(cherry picked from commit 8caf0181e3e9ed2441dd29e4e0c494248689103a)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 73e77f9db2815cf820a6753e2d532557cfc5b9a2 |
06-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Generate version data for the WebView package.
Generate a version name and version code for the WebView package from
various build data.
Bug: 16870073
Change-Id: I403395fdc2772955e23f694f25c5b7e58ca61a13
hromium/package.mk
hromium/version.mk
|
| da2e0ddb625889c52fd89f25f0c2178c27b4a15c |
31-Jul-2014 |
Ignacio Solla <igsolla@google.com> |
[WebView] Notify Chromium whether the app supports fullscreen.
This change will only be landed after the upstream change is
merged into master-chromium:
https://codereview.chromium.org/425343002/
BUG= http://crbug.com/389496
Change-Id: I21249868581b02bd8fd558ee7c23993df22ea181
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 6a10068513c1d9264bac368629deb28a123a4e4e |
14-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Delete profile data if the WebView is downgraded." into lmp-dev
|
| 7377fc0716b475f1063e0bea963cc6baecf4560c |
14-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Delete profile data if the WebView is downgraded.
If the WebView package has been downgraded since the previous time we
were used in this application, it may not be safe to load data from the
old profile as Chromium doesn't support this. Detect the downgrade by
saving the version code of the package in a shared preference and
deleting the profile files if it's lower.
Bug: 16724751
Change-Id: I832dccadee1f27f8bf480a21200be584949755f0
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 630307b435b7ee2129234e989dd6cb908d142fad |
11-Aug-2014 |
Bo Liu <boliu@google.com> |
Add version to public structs
BUG: 16824451
Change-Id: I0bf1c06e120a48bf2f5c07e00ca0583ea1c891bb
(cherry picked from commit df44c7670d1fa36fffb614ce04bf16ba25ef65d0)
hromium/plat_support/draw_gl_functor.cpp
hromium/plat_support/graphics_utils.cpp
|
| febe875574b0942dbc1642a02c6fb95f5ac86fdd |
29-Jul-2014 |
Bo Liu <boliu@google.com> |
Set native pointers before initialization
initPlatSupportLibrary sets up the function table chromium code uses to
access private native APIs. This should really happen before chromium
code initialization.
BUG: 16550863
Change-Id: I2abeb26dce3d94734ba5a6134bd07d0e3225e57d
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 8caf0181e3e9ed2441dd29e4e0c494248689103a |
13-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Add a trace event for AwBrowserProcess.loadLibrary.
Add a system trace event for the call to AwBrowserProcess.loadLibrary so
we can easily measure how much it contributes to the WebView startup
time.
Bug: 16870075
Change-Id: Ic729726f1c3f5f2d689ba83858422c33dd4877df
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 48d6cbb2b8877383eaf7357beb57230983d19e7d |
06-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Generate version data for the WebView package.
Generate a version name and version code for the WebView package from
various build data.
Bug: 16870073
Change-Id: I403395fdc2772955e23f694f25c5b7e58ca61a13
hromium/package.mk
hromium/version.mk
|
| dba1a3656c868a1b14d9a33860510ec3e0f5027a |
14-Aug-2014 |
Bo Liu <boliu@google.com> |
Merge "Fix merge_from_chromium.py script to work with new buildspec repo" into lmp-dev
|
| 129af035eca08cb129609beaea01e8727e29614d |
14-Aug-2014 |
Ignacio Solla <igsolla@google.com> |
Merge "Cherry-pick: [WebView] Notify Chromium whether the app supports fullscreen." into lmp-dev
|
| 775c2461686183cecf658c813e7e9bfb02906c34 |
31-Jul-2014 |
Ignacio Solla <igsolla@google.com> |
Cherry-pick: [WebView] Notify Chromium whether the app supports fullscreen.
NOTE: this cherry-pick will only be landed after
https://googleplex-android-review.git.corp.google.com/#/c/523982/
BUG=17007901
--------------------------------------------------------
[WebView] Notify Chromium whether the app supports fullscreen.
This change will only be landed after the upstream change is
merged into master-chromium:
https://codereview.chromium.org/425343002/
BUG= http://crbug.com/389496
Change-Id: I21249868581b02bd8fd558ee7c23993df22ea181
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 37b38e94b68b98cc79e412f53e38efe69bfaca27 |
13-Aug-2014 |
Bo Liu <boliu@google.com> |
Fix merge_from_chromium.py script to work with new buildspec repo
New repo at
https://chrome-internal.googlesource.com/chrome/tools/buildspec
The updated script will work with 37.0.2062.70 in the 37.0.2062 branch.
Change-Id: I298f66e15bbf98ea9d83fc7e4b67efb9b19e0d4c
hromium/tools/merge_from_chromium.py
|
| 3b9194e749ef2415a36c159bcb60a8bd7e6579a8 |
12-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge one more needed packaging change.
Merge "Set target and min sdk level for webview package".
|
| d966db94f525a4abc1e363ea6cb28799b714318b |
08-Aug-2014 |
Ben Murdoch <benm@google.com> |
Set target and min sdk level for webview package
Bug: 16902981
Since current L level is not yet set to 21, we need to set
our target and min sdk level to 20 to be able to upload our
package to PlayStore. We will update the level to 21
once the new level is set.
Change-Id: I31125c893e714d9eb41dc2b7d16bce700f056d41
(cherry picked from commit 6beb32a5aa03941431169ce7581273611f0c6862)
hromium/AndroidManifest.xml
hromium/package.mk
|
| e4e02d06d6c2c793b83621e78ab619f545e2eb69 |
12-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r288042
This commit was generated by merge_to_master.py.
Change-Id: Ieb9d554869edcde6049126194860eee183556462
|
| 2846d3c1b3bb2cc2f7ac1600df7b16a665c2c93e |
12-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge up to 707d93c from chromium-dev."
|
| a06a5d8a7e07adebd06e165d3e4b7e82707f5b78 |
12-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge up to 707d93c from chromium-dev.
|
| baab9e9936110b81a8f9f40c9f2e340c7ddb6ab8 |
12-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Increase char limit for private browsing warning." into lmp-dev
|
| 79ca909e4230d7f95103791a9d4b41e3650db6c3 |
12-Aug-2014 |
Marcin Kosiba <mkosiba@google.com> |
Increase char limit for private browsing warning.
BUG: 16955473
hromium/res/values/strings.xml
|
| 99995a1f197ae0c341e17215d515ecc670c60cd6 |
11-Aug-2014 |
Bo Liu <boliu@google.com> |
Merge "Add version to public structs" into master-chromium
|
| df44c7670d1fa36fffb614ce04bf16ba25ef65d0 |
11-Aug-2014 |
Bo Liu <boliu@google.com> |
Add version to public structs
BUG: 16824451
Change-Id: I0bf1c06e120a48bf2f5c07e00ca0583ea1c891bb
hromium/plat_support/draw_gl_functor.cpp
hromium/plat_support/graphics_utils.cpp
|
| e8a9ddd389a0313fee43c0df877b5cfe9d1ca445 |
07-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Start reading drp setting from GoogleSetting
Bug: 12492817
We are now moving the setting from developer preview to play services.
This is the first step to doing this. Next we will move most logic
to upstream.
Change-Id: I367d6d0519ac5e1d50f83ca8b11d35d183bc9747
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| d85dec29f2224431b43dec693e34d32062441cb4 |
07-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Start reading drp setting from GoogleSetting
Bug: 12492817
We are now moving the setting from developer preview to play services.
This is the first step to doing this. Next we will move most logic
to upstream.
Change-Id: I367d6d0519ac5e1d50f83ca8b11d35d183bc9747
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| f99773fa946d1aa4751da325c3114dfb060a5c46 |
11-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Merge "Start reading drp setting from GoogleSetting" into lmp-dev
|
| 527e42504f0b418492e56871b9539501feda90e6 |
07-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Start reading drp setting from GoogleSetting
Bug: 12492817
We are now moving the setting from developer preview to play services.
This is the first step to doing this. Next we will move most logic
to upstream.
Change-Id: I367d6d0519ac5e1d50f83ca8b11d35d183bc9747
hromium/java/com/android/webview/chromium/DataReductionProxyManager.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| c88f9f2a620903ee94e29a70d3334f2318afc4f8 |
09-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Revert version code to 1
Bug: 16870861
Revert webview version code back to 1.
Change-Id: I92168dc7e0da3b66ed429054624910973a35574c
hromium/package.mk
|
| 6beb32a5aa03941431169ce7581273611f0c6862 |
08-Aug-2014 |
Ben Murdoch <benm@google.com> |
Set target and min sdk level for webview package
Bug: 16902981
Since current L level is not yet set to 21, we need to set
our target and min sdk level to 20 to be able to upload our
package to PlayStore. We will update the level to 21
once the new level is set.
Change-Id: I31125c893e714d9eb41dc2b7d16bce700f056d41
hromium/AndroidManifest.xml
hromium/package.mk
|
| 7a7bc4426f602f0bcd0de9a32fd91a4c61a38f19 |
09-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Merge "Revert "Bump WebView package version number."" into lmp-dev
|
| 58b971cbc8a387f154a8c5eee117ac17c0bdd333 |
09-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Revert "Bump WebView package version number."
This reverts commit 485f248569d72398862360ff135718ea5dfe2d49.
Change-Id: I8f1c7fea6ba8e3f9c4117ef40ef48372452a3544
hromium/package.mk
|
| e81a7138540e8f0b1005b1074b94f492ce0483d6 |
09-Aug-2014 |
Selim Gurun <sgurun@google.com> |
Merge "Bump WebView package version number." into lmp-dev
|
| 485f248569d72398862360ff135718ea5dfe2d49 |
08-Aug-2014 |
Ben Murdoch <benm@google.com> |
Bump WebView package version number.
Bug: 16870073
Change-Id: If06487788c035d183bd9ecac4ad46ca7c496b770
hromium/package.mk
|
| 8d63f24fe5d1b4bea9674818c3d77e6018972e4b |
06-Aug-2014 |
Bo Liu <boliu@google.com> |
Change function table assignment to allow new fields
Write the function table assignment statements to allow new fields to be
added without modifying code here. Had to make the static structs
non-const.
Change-Id: I10d38caa9817f3835c4cf0e6e9418998a5452d10
(cherry picked from commit 4cb347aeb733d199418472de549c24a31d3e7477)
hromium/plat_support/graphics_utils.cpp
|
| 4cb347aeb733d199418472de549c24a31d3e7477 |
06-Aug-2014 |
Bo Liu <boliu@google.com> |
Change function table assignment to allow new fields
Write the function table assignment statements to allow new fields to be
added without modifying code here. Had to make the static structs
non-const.
Change-Id: I10d38caa9817f3835c4cf0e6e9418998a5452d10
hromium/plat_support/graphics_utils.cpp
|
| cbaa791850e8a0f9a8a1cfc9c88aaecbd580d3ec |
06-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Fix makefile parsing when chromium_org isn't checked out.
Some branches don't have external/chromium_org checked out but do
include frameworks/webview to get the null WebView implementation. Fix
the makefile so that it doesn't try to include the nonexistent
resources_config.mk in this case.
Change-Id: I573128973a92093da8ac0ce0c5cfa6df6af5255b
(cherry picked from commit bb890910abf889a84662365821bfcfa699e917f4)
hromium/package.mk
|
| bb890910abf889a84662365821bfcfa699e917f4 |
06-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Fix makefile parsing when chromium_org isn't checked out.
Some branches don't have external/chromium_org checked out but do
include frameworks/webview to get the null WebView implementation. Fix
the makefile so that it doesn't try to include the nonexistent
resources_config.mk in this case.
Change-Id: I573128973a92093da8ac0ce0c5cfa6df6af5255b
hromium/package.mk
|
| fea43618b7dc6f95e2d5426972f33f5c2c52315a |
05-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Don't declare WebView as a library.
We don't need to declare WebView as a library as we add its resources to
the asset manager dynamically rather than through a <uses-library> tag
in an application manifest. This also removes the need for it to be a
privileged application.
Bug: 11505352
Change-Id: I504af9dc120739368169653d71072251b907a41f
(cherry picked from commit bd8a80488b151ceee823eb8f06419a1991d53b8f)
hromium/AndroidManifest.xml
hromium/CleanSpec.mk
hromium/package.mk
|
| bd8a80488b151ceee823eb8f06419a1991d53b8f |
05-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Don't declare WebView as a library.
We don't need to declare WebView as a library as we add its resources to
the asset manager dynamically rather than through a <uses-library> tag
in an application manifest. This also removes the need for it to be a
privileged application.
Bug: 11505352
Change-Id: I504af9dc120739368169653d71072251b907a41f
hromium/AndroidManifest.xml
hromium/CleanSpec.mk
hromium/package.mk
|
| aa277f94f25f0d0eefb10d4e820ee574068f6515 |
05-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Split package creation into separate makefile.
To allow the package to be overridden, define it in its own makefile and
include it from Android.mk.
Bug: 16329371
Change-Id: I6a3d77ceb65649b6305b64972634862ca9cbd4d4
hromium/Android.mk
hromium/package.mk
|
| 25492080582b0b89ac6d7b183a302965222e348c |
30-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Revert "Support a prebuilt WebView."
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
hromium/Android.mk
|
| eba27ea772d707165fe953911f03707514485a40 |
05-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Split package creation into separate makefile.
To allow the package to be overridden, define it in its own makefile and
include it from Android.mk.
Bug: 16329371
Change-Id: I6a3d77ceb65649b6305b64972634862ca9cbd4d4
hromium/Android.mk
hromium/package.mk
|
| 707d93ceba55f52771e749b223fbfc010c9a025e |
06-Aug-2014 |
Ben Murdoch <benm@android.com> |
Merge "Change function table assignment to allow new fields" into chromium-dev
|
| 44132d361a57cfd2c35704f2455e9629061172ad |
06-Aug-2014 |
Bo Liu <boliu@google.com> |
Change function table assignment to allow new fields
Write the function table assignment statements to allow new fields to be
added without modifying code here. Had to make the static structs
non-const.
Change-Id: I10d38caa9817f3835c4cf0e6e9418998a5452d10
hromium/plat_support/graphics_utils.cpp
|
| 5543b07d5362cb59a258d861fb1631c2b6987e67 |
05-Aug-2014 |
Ben Murdoch <benm@google.com> |
Merge "Prepare WebView library APK." into master-chromium
|
| 51fff92784c3837f6be6344bb25621f129959de6 |
04-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Rename the WebView package.
Rename the WebView package from "webviewchromium" to "webview", removing
the dummy webview package which existed solely to depend on
webviewchromium. We no longer require this layer of abstraction and it
makes it impossible to inherit from webviewchromium correctly.
Bug: 16329371
Change-Id: I1437c7cacb867b2f2d10842a1b9c10aa5c4791e2
ndroid.mk
hromium/Android.mk
hromium/CleanSpec.mk
|
| 27c92b2474d4ac705528ad1eecf321d0de452997 |
04-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Fix typo in cleanspec.
Misspelled add-clean-step.
Change-Id: I6c341dfc6bac1dbfbc6970e421d6a54c1303cc90
hromium/CleanSpec.mk
|
| 1bea6c4ad83843f8a2b5db7130663df292903fb0 |
04-Aug-2014 |
Ben Murdoch <benm@google.com> |
Prepare WebView library APK.
- Add an icon
- set initial version number
- target SDK 21 (L).
Change-Id: Ifa6724d2e4d5bb9b126e46bcf06eb9aac38e03be
(cherry picked from commit 7b3588b50e075e91bc39e3f2438376b20697b205)
hromium/Android.mk
hromium/AndroidManifest.xml
hromium/res/mipmap-hdpi/icon_webview.png
hromium/res/mipmap-mdpi/icon_webview.png
hromium/res/mipmap-xhdpi/icon_webview.png
hromium/res/mipmap-xxhdpi/icon_webview.png
|
| fd122dc5d54ff2f3180c701b05a9c522119dd628 |
04-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Rename the WebView package." into lmp-dev
|
| 9eacb4b8702e571ef7d60d21e85ce2a83d1ffd88 |
04-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Rename the WebView package.
Rename the WebView package from "webviewchromium" to "webview", removing
the dummy webview package which existed solely to depend on
webviewchromium. We no longer require this layer of abstraction and it
makes it impossible to inherit from webviewchromium correctly.
Bug: 16329371
Change-Id: I1437c7cacb867b2f2d10842a1b9c10aa5c4791e2
ndroid.mk
hromium/Android.mk
hromium/CleanSpec.mk
|
| 7b3588b50e075e91bc39e3f2438376b20697b205 |
04-Aug-2014 |
Ben Murdoch <benm@google.com> |
Prepare WebView library APK.
- Add an icon
- set initial version number
- target SDK 21 (L).
Change-Id: Ifa6724d2e4d5bb9b126e46bcf06eb9aac38e03be
hromium/Android.mk
hromium/AndroidManifest.xml
hromium/res/mipmap-hdpi/icon_webview.png
hromium/res/mipmap-mdpi/icon_webview.png
hromium/res/mipmap-xhdpi/icon_webview.png
hromium/res/mipmap-xxhdpi/icon_webview.png
|
| d809f78f63ed9ce8498ac940dd13959ab38013cd |
01-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Clean old webview jar/pak files.
The java code and pak files are no longer needed as they are now
included in a WebView APK instead. Delete them from the system image to
reclaim space and prevent confusion.
Bug: 16723226
Change-Id: Ia6a8752fd3cc44032efd39c21fec02c49be9c8af
(cherry picked from commit 4345d9049ccaf51e6ef5716592fea5267e2d33ea)
hromium/CleanSpec.mk
|
| 4345d9049ccaf51e6ef5716592fea5267e2d33ea |
01-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Clean old webview jar/pak files.
The java code and pak files are no longer needed as they are now
included in a WebView APK instead. Delete them from the system image to
reclaim space and prevent confusion.
Bug: 16723226
Change-Id: Ia6a8752fd3cc44032efd39c21fec02c49be9c8af
hromium/CleanSpec.mk
|
| c8613c235eb1795d6df603dae6e06b710db07525 |
25-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
CHerry pick Update framework resource references.
This moves us over to use the newly-exposed public framework resource
IDs.
(cherry picked from commit e0ef2965a44761b31eeae5868811262d566a8641)
Original Change-Id: Ice316b497e6a2c0156aa803e3bdab0c59c11e1df
Bug: 16723226
Change-Id: I84a49ada6ddc199379ec1522dce5f5ff8a3f1d94
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 3d4e9d0641849cdfc351d6d3bee193b9f8507657 |
31-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Cherry pick Generate resources before running aapt.
This adds the dependency needed to generate resources before running
AAPT on them.
Original Change-Id: I43787cb6c883a2b57c19b1348b684264c3b3bc0a
Bug: 16723226
Change-Id: I3d03e76518a14fbd65fd866615d89155fa5fe8a7
hromium/Android.mk
|
| e48bcd63f05c6f42888fc6958ab565bbc0e37a26 |
24-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
CHerry pick Include pak files in the WebView apk.
This change makes the webviewchromium.apk include the Chromium
native resource .pak files. The main reason for the complexity
of the change is the fact that the .pak files are generated by
the build system and therefore need to be copied to the target
folder before the AAPT invocation.
Original BUG=11505352
Original Change-Id: I42029f4bc11684962f01a7746fa0d34589962838
Bug: 16723226
Change-Id: Ie01a26e79f469b74b7c841ff8e4057b50d2308d8
hromium/Android.mk
|
| 6c8ad27afb6b6b79f2c7dad6d767b057bf91a979 |
28-Jul-2014 |
Ben Murdoch <benm@google.com> |
Cherry pick Use size for address space reservation.
Rather than stat'ing the native library from native code,
use a size passed in from Java.
Original Bug: 16403706
Original Change-Id: I07ad5a774623c1899eb50474d999a2b1447783f0
Bug: 16723226
Change-Id: I55ac0469cc7cd96bae27903f0641edf539da6e13
hromium/loader/loader.cpp
|
| aa23fbc2a399a98fddf5e664263b234496a1d1dd |
29-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Cherry pick Add com.android.webview to the package whitelist.
Original Change-Id: Iaefe1ea31e3e23cc6ae94899103ad9600af8b022
Bug: 16723226
Change-Id: I8456de92a81ae7e8e870c207c9286417136f4bf2
hromium/jar_package_whitelist.txt
|
| d872dc00cb6d5044e01df0a5756d527ae4810f70 |
29-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Cherry Pick Add missing back paren back in.
Previous change took out a paren by accident. Adding it back in.
Original Change-Id: I0a25356ae394508337f875a478586f4ed99ef3da
Bug: 16723226
Change-Id: Ib36a03ba5f1e93816c515ff5e4716aea76745616
hromium/Android.mk
|
| 86218cd889c29680d505e1559711061c5a42a930 |
29-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Cherry Pick Generate R class for the glue layer.
This makes AAPT generate the R class for the glue layer namespace.
This is needed because we removed the line from the upstream
resources_config.mk file.
Original Change-Id: I3229ebdf92e062a402efc2a3863bfc393651e9fa
Bug: 16723226
Change-Id: Ibf1009b0b1e1093dcccd20f6cfbc81f2525d869f
hromium/Android.mk
|
| a8ac5679247b16cb84262218ab819ee6c467d7ac |
25-Jul-2014 |
Primiano Tucci <primiano@google.com> |
Cherry Pick Generate symlinks to libwebviewchromium.so in /system/priv-app
This change declares libwebviewchromium to be treated as a JNI lib
for the webviewchromium.apk. By doing this, the build system will
create symlinks from /system/app-priv/webviewchromium/lib/...
(which is the path returned by the package manager) to the actual
libraries in /system/lib*.
Furthermore this change also declares the apk to be a multilib
target, so that both libraries get symlinked on multi-arch devices.
Original BUG:16403706
Original Change-Id: Ib02191eddf8262b2b23c3c32d07e77b33759285d
Conflicts:
chromium/Android.mk
Bug: 16723226
Change-Id: Ib420a18d14a9464f92d1e05c290b0e10225f5985
hromium/Android.mk
|
| d57498426ec1a29605cc96e7a421098ac3c16cf2 |
12-May-2014 |
Marcin Kosiba <mkosiba@google.com> |
Cherry pick Move WebView resources to separate APK
Original BUG: 11505352
Original Change-Id: I1f601605943738dd207a6ba267063c00527565de
Conflicts:
chromium/java/com/android/webview/chromium/ResourceProvider.java
chromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
Bug: 16723226
Change-Id: I5d95009503965904c26155ade36a0eee62b3affe
hromium/Android.mk
hromium/chromium.mk
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/java/com/android/webview/chromium/ResourceRewriter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_button_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_border.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/layout-land/webviewchromium_date_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_advanced_component.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_title.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_suggestion.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_dropdown_text.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_multi_field_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_two_field_date_picker.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml
hromium/overlay/frameworks/base/core/res/res/menu/webviewchromium_select_action_menu.xml
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az-rAZ/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne-rNP/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si-rLK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values/attrs.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/colors.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
hromium/overlay/frameworks/base/core/res/res/values/values.xml
hromium/proguard.flags
hromium/res/drawable-hdpi/ic_media_video_poster.png
hromium/res/drawable-ldpi/ic_media_video_poster.png
hromium/res/drawable-mdpi/ic_media_video_poster.png
hromium/res/drawable-xhdpi/ic_media_video_poster.png
hromium/res/values-af/strings.xml
hromium/res/values-am/strings.xml
hromium/res/values-ar/strings.xml
hromium/res/values-az-rAZ/strings.xml
hromium/res/values-az/strings.xml
hromium/res/values-bg/strings.xml
hromium/res/values-ca/strings.xml
hromium/res/values-cs/strings.xml
hromium/res/values-da/strings.xml
hromium/res/values-de/strings.xml
hromium/res/values-el/strings.xml
hromium/res/values-en-rGB/strings.xml
hromium/res/values-en-rIN/strings.xml
hromium/res/values-es-rUS/strings.xml
hromium/res/values-es/strings.xml
hromium/res/values-et-rEE/strings.xml
hromium/res/values-fa/strings.xml
hromium/res/values-fi/strings.xml
hromium/res/values-fr-rCA/strings.xml
hromium/res/values-fr/strings.xml
hromium/res/values-hi/strings.xml
hromium/res/values-hr/strings.xml
hromium/res/values-hu/strings.xml
hromium/res/values-hy-rAM/strings.xml
hromium/res/values-in/strings.xml
hromium/res/values-it/strings.xml
hromium/res/values-iw/strings.xml
hromium/res/values-ja/strings.xml
hromium/res/values-ka-rGE/strings.xml
hromium/res/values-km-rKH/strings.xml
hromium/res/values-ko/strings.xml
hromium/res/values-lo-rLA/strings.xml
hromium/res/values-lt/strings.xml
hromium/res/values-lv/strings.xml
hromium/res/values-mn-rMN/strings.xml
hromium/res/values-ms-rMY/strings.xml
hromium/res/values-nb/strings.xml
hromium/res/values-ne-rNP/strings.xml
hromium/res/values-ne/strings.xml
hromium/res/values-nl/strings.xml
hromium/res/values-pl/strings.xml
hromium/res/values-pt-rPT/strings.xml
hromium/res/values-pt/strings.xml
hromium/res/values-ro/strings.xml
hromium/res/values-ru/strings.xml
hromium/res/values-si-rLK/strings.xml
hromium/res/values-si/strings.xml
hromium/res/values-sk/strings.xml
hromium/res/values-sl/strings.xml
hromium/res/values-sr/strings.xml
hromium/res/values-sv/strings.xml
hromium/res/values-sw/strings.xml
hromium/res/values-th/strings.xml
hromium/res/values-tl/strings.xml
hromium/res/values-tr/strings.xml
hromium/res/values-uk/strings.xml
hromium/res/values-vi/strings.xml
hromium/res/values-zh-rCN/strings.xml
hromium/res/values-zh-rHK/strings.xml
hromium/res/values-zh-rTW/strings.xml
hromium/res/values-zu/strings.xml
hromium/res/values/strings.xml
|
| 4aba3044c76d9cb462c4f6c73d2974893b621c58 |
17-Jul-2014 |
Torne (Richard Coles) <torne@google.com> |
Cherry pickMake the WebView Java library into an APK.
Package the WebView Java code as an APK instead of a JAR. Mark this as a
multiarch app so that dexopt will be run for both architectures on a
multiarch device. Add a CleanSpec to delete the old JAR.
Original Bug: 16329371
Original Change-Id: Ic09958e965b9163ac6b597df7005dd4a05de7a56
Bug: 16723226
Change-Id: I1055313b9f20e71fae87c6ec4493aeb3fba40afb
hromium/Android.mk
hromium/AndroidManifest.xml
hromium/CleanSpec.mk
|
| a763f3deb8c0c6d2226f225af3035411318a8fc1 |
31-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Generate resources before running aapt.
This adds the dependency needed to generate resources before running
AAPT on them.
Change-Id: I43787cb6c883a2b57c19b1348b684264c3b3bc0a
hromium/Android.mk
|
| 768b60a6cf57b57389fc045351becf05e2ebb3ec |
28-Jul-2014 |
Ben Murdoch <benm@google.com> |
Use size for address space reservation.
Rather than stat'ing the native library from native code,
use a size passed in from Java.
Bug: 16403706
Change-Id: I07ad5a774623c1899eb50474d999a2b1447783f0
hromium/loader/loader.cpp
|
| 57362d24c62ed20d35e590b9a3c05e0ff3c2c9f3 |
25-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Update framework resource references.
This moves us over to use the newly-exposed public framework resource
IDs.
(cherry picked from commit e0ef2965a44761b31eeae5868811262d566a8641)
Change-Id: Ice316b497e6a2c0156aa803e3bdab0c59c11e1df
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 3db202fea05e1d7476100bfa9523594a8cf52a25 |
29-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Update framework resource references.
This moves us over to use the newly-exposed framework resource IDs.
Change-Id: Icf432b871e45cd31d0331ee8f35b057b222b8d96
hromium/java/com/android/webview/chromium/ResourceProvider.java
|
| 91b5c141382559106792246adb41e68589b886f6 |
29-Jul-2014 |
Bo Liu <boliu@google.com> |
Merge "Add DrawGL kModeSync"
|
| 1911bfeac4b086749624d187a7b12b92b7576c1d |
28-Jul-2014 |
Bo Liu <boliu@google.com> |
Remove implementation of enableSlowWholeDocumentDraw
Master does not have the chromium side ready yet.
BUG: 16300353
Change-Id: I7ca23379b19e9378fac07e0fba64314c2a0437f1
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| d71dc21fa8b302a85147a82ef0e05981a7614509 |
28-Jul-2014 |
Bo Liu <boliu@google.com> |
Merge "Add DrawGL kModeSync" into lmp-dev
|
| 2a534ae0d562cacc24d3f8cf092cf69726fff88d |
28-Jul-2014 |
Bo Liu <boliu@google.com> |
Merge "Implement enableSlowWholeDocumentDraw" into lmp-dev
|
| 2fcb973204144f74477511be965207c0357e812d |
23-Jul-2014 |
Bo Liu <boliu@google.com> |
Implement enableSlowWholeDocumentDraw
Keep a static boolean in WebViewChromium to distinguish setting by API
call vs setting by targetSdkVersion. Call into chromium side in
initForReal.
BUG: 16300353
Change-Id: Ifd7cb4c27d4129575edaeeedf1464ca43c9f4c03
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 1d8422b084b634820042340a31e3e36051b8d9c6 |
24-Jul-2014 |
Bo Liu <boliu@google.com> |
Add DrawGL kModeSync
BUG: 16526750
Change-Id: Id724f8bd80b3a7442156bd0fba379a5b9af72208
hromium/plat_support/draw_gl_functor.cpp
|
| 6d94bbea51bb29c769f712bba64a746dd36e509b |
12-May-2014 |
Marcin Kosiba <mkosiba@google.com> |
Move WebView resources to separate APK
BUG: 11505352
Change-Id: I1f601605943738dd207a6ba267063c00527565de
hromium/Android.mk
hromium/chromium.mk
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/java/com/android/webview/chromium/ResourceRewriter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_button_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_border.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/layout-land/webviewchromium_date_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_advanced_component.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_title.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_suggestion.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_dropdown_text.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_multi_field_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_two_field_date_picker.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml
hromium/overlay/frameworks/base/core/res/res/menu/webviewchromium_select_action_menu.xml
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az-rAZ/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne-rNP/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si-rLK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values/attrs.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/colors.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
hromium/overlay/frameworks/base/core/res/res/values/values.xml
hromium/proguard.flags
hromium/res/drawable-hdpi/ic_media_video_poster.png
hromium/res/drawable-ldpi/ic_media_video_poster.png
hromium/res/drawable-mdpi/ic_media_video_poster.png
hromium/res/drawable-xhdpi/ic_media_video_poster.png
hromium/res/values-af/strings.xml
hromium/res/values-am/strings.xml
hromium/res/values-ar/strings.xml
hromium/res/values-az-rAZ/strings.xml
hromium/res/values-az/strings.xml
hromium/res/values-bg/strings.xml
hromium/res/values-ca/strings.xml
hromium/res/values-cs/strings.xml
hromium/res/values-da/strings.xml
hromium/res/values-de/strings.xml
hromium/res/values-el/strings.xml
hromium/res/values-en-rGB/strings.xml
hromium/res/values-en-rIN/strings.xml
hromium/res/values-es-rUS/strings.xml
hromium/res/values-es/strings.xml
hromium/res/values-et-rEE/strings.xml
hromium/res/values-fa/strings.xml
hromium/res/values-fi/strings.xml
hromium/res/values-fr-rCA/strings.xml
hromium/res/values-fr/strings.xml
hromium/res/values-hi/strings.xml
hromium/res/values-hr/strings.xml
hromium/res/values-hu/strings.xml
hromium/res/values-hy-rAM/strings.xml
hromium/res/values-in/strings.xml
hromium/res/values-it/strings.xml
hromium/res/values-iw/strings.xml
hromium/res/values-ja/strings.xml
hromium/res/values-ka-rGE/strings.xml
hromium/res/values-km-rKH/strings.xml
hromium/res/values-ko/strings.xml
hromium/res/values-lo-rLA/strings.xml
hromium/res/values-lt/strings.xml
hromium/res/values-lv/strings.xml
hromium/res/values-mn-rMN/strings.xml
hromium/res/values-ms-rMY/strings.xml
hromium/res/values-nb/strings.xml
hromium/res/values-ne-rNP/strings.xml
hromium/res/values-ne/strings.xml
hromium/res/values-nl/strings.xml
hromium/res/values-pl/strings.xml
hromium/res/values-pt-rPT/strings.xml
hromium/res/values-pt/strings.xml
hromium/res/values-ro/strings.xml
hromium/res/values-ru/strings.xml
hromium/res/values-si-rLK/strings.xml
hromium/res/values-si/strings.xml
hromium/res/values-sk/strings.xml
hromium/res/values-sl/strings.xml
hromium/res/values-sr/strings.xml
hromium/res/values-sv/strings.xml
hromium/res/values-sw/strings.xml
hromium/res/values-th/strings.xml
hromium/res/values-tl/strings.xml
hromium/res/values-tr/strings.xml
hromium/res/values-uk/strings.xml
hromium/res/values-vi/strings.xml
hromium/res/values-zh-rCN/strings.xml
hromium/res/values-zh-rHK/strings.xml
hromium/res/values-zh-rTW/strings.xml
hromium/res/values-zu/strings.xml
hromium/res/values/strings.xml
|
| 520588aa3ea2e21e101da9ae89998ea04fafb182 |
31-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Include pak files in the WebView apk." into master-chromium
|
| fd060d61d4185f716cd83e6eb6dc382ff7fb9bc7 |
24-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Include pak files in the WebView apk.
This change makes the webviewchromium.apk include the Chromium
native resource .pak files. The main reason for the complexity
of the change is the fact that the .pak files are generated by
the build system and therefore need to be copied to the target
folder before the AAPT invocation.
BUG=11505352
Change-Id: I42029f4bc11684962f01a7746fa0d34589962838
hromium/Android.mk
|
| 0c9aa5d2ee9b511fcca2f3f36cf6834461471520 |
28-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Remove resources overlay file.
It's empty, so we can remove it.
Change-Id: Id18c6dc74077bb24ddcbc23cf68748b9805eb519
hromium/chromium.mk
|
| 92cd53c25558b573638eca065a984ebd900d355a |
28-Jul-2014 |
Bo Liu <boliu@google.com> |
Merge "Implement enableSlowWholeDocumentDraw"
|
| e8721f7b8c40f21585a57cc2cd66dcbf1dc9fd93 |
23-Jul-2014 |
Bo Liu <boliu@google.com> |
Implement enableSlowWholeDocumentDraw
Keep a static boolean in WebViewChromium to distinguish setting by API
call vs setting by targetSdkVersion. Call into chromium side in
initForReal.
BUG: 16300353
Change-Id: Ifd7cb4c27d4129575edaeeedf1464ca43c9f4c03
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 32b527bb3d6a02baf7a4eeb9cf9e7f75d1fd3ae1 |
24-Jul-2014 |
Bo Liu <boliu@google.com> |
Add DrawGL kModeSync
BUG: 16526750
Change-Id: Id724f8bd80b3a7442156bd0fba379a5b9af72208
hromium/plat_support/draw_gl_functor.cpp
|
| 072038a7d3accabd48cd20d50202cb65c9bcee3b |
24-Jul-2014 |
Selim Gurun <sgurun@google.com> |
The plumbing for API changes
Bug: 16403458
Do the plumbing changes necessary to address the API changes that are
requested by the API council. This includes adding a helper
to offload most file upload functionality to webview.
Change-Id: I425bc47099f4d78c03ac510e53963c3dbeefbc85
hromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java
hromium/java/com/android/webview/chromium/UploadHelperImpl.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 10d3d571b6d65d8621fc9a4729ae4c04c270a08d |
24-Jul-2014 |
Selim Gurun <sgurun@google.com> |
The plumbing for API changes
Bug: 16403458
Do the plumbing changes necessary to address the API changes that are
requested by the API council. This includes adding a helper
to offload most file upload functionality to webview.
Change-Id: I425bc47099f4d78c03ac510e53963c3dbeefbc85
hromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java
hromium/java/com/android/webview/chromium/UploadHelperImpl.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| b9f22758bf6718873e2cd269a5bdeeaf5aed3bc3 |
30-Jul-2014 |
Ben Murdoch <benm@google.com> |
Merge "Use size for address space reservation." into master-chromium
|
| 5cb1bc4fabdd9d08806bd9f3d9c92f872144d276 |
30-Jul-2014 |
Bo Liu <boliu@google.com> |
Set native pointers before initialization
initPlatSupportLibrary sets up the function table chromium code uses to
access private native APIs. This should really happen before chromium
code initialization.
Change-Id: I393808370a50e3eac2ca4d9847e6aa9ccc6703a5
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 30adf24ba557a82bd01e02f791e36049861ace95 |
28-Jul-2014 |
Ben Murdoch <benm@google.com> |
Use size for address space reservation.
Rather than stat'ing the native library from native code,
use a size passed in from Java.
Bug: 16403706
Change-Id: I07ad5a774623c1899eb50474d999a2b1447783f0
hromium/loader/loader.cpp
|
| 0ab4151372c2f3717e4629dbf3265a7a043ad6dd |
29-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Add missing back paren back in.
Previous change took out a paren by accident. Adding it back in.
Change-Id: I0a25356ae394508337f875a478586f4ed99ef3da
hromium/Android.mk
|
| 608f48cac3eb20fe520bbc6feb515f68ab3b6ad2 |
29-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Generate R class for the glue layer.
This makes AAPT generate the R class for the glue layer namespace.
This is needed because we removed the line from the upstream
resources_config.mk file.
Change-Id: I3229ebdf92e062a402efc2a3863bfc393651e9fa
hromium/Android.mk
|
| 445e21d47cb400de87dfcae15f3354c471637f71 |
29-Jul-2014 |
Bo Liu <boliu@google.com> |
Merge "Add DrawGL kModeSync" into master-chromium
|
| 5946ee9deb44f66965e1adec70feb6ded495ae67 |
24-Jul-2014 |
Bo Liu <boliu@google.com> |
Add DrawGL kModeSync
BUG: 16526750
Change-Id: Id724f8bd80b3a7442156bd0fba379a5b9af72208
hromium/plat_support/draw_gl_functor.cpp
|
| 33bb839a60acd1b5ab2d2acebf147d40baf5556b |
28-Jul-2014 |
Bo Liu <boliu@google.com> |
Merge "Implement enableSlowWholeDocumentDraw" into master-chromium
|
| 086910f44494b4677dc0f5d66045b0d55743e5fb |
23-Jul-2014 |
Bo Liu <boliu@google.com> |
Implement enableSlowWholeDocumentDraw
Keep a static boolean in WebViewChromium to distinguish setting by API
call vs setting by targetSdkVersion. Call into chromium side in
initForReal.
BUG: 16300353
Change-Id: Ifd7cb4c27d4129575edaeeedf1464ca43c9f4c03
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 615ce19d9cb561bbd8e03fc976fb4c5dac572459 |
28-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Move WebView resources to separate APK" into master-chromium
|
| d1bb4af04ce42858f7777767efaabba79d7f0a8b |
28-Jul-2014 |
Ben Murdoch <benm@google.com> |
Add boringssl to automerger script.
Bug: 16357554
Change-Id: I0eaadb010c42424cefa8f2f07f5a89cdf086f540
hromium/tools/merge_common.py
|
| 0657a5e0b853cb639b1b5a5a195125f9d6221a11 |
12-May-2014 |
Marcin Kosiba <mkosiba@google.com> |
Move WebView resources to separate APK
BUG: 11505352
Change-Id: I1f601605943738dd207a6ba267063c00527565de
hromium/Android.mk
hromium/chromium.mk
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/java/com/android/webview/chromium/ResourceRewriter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_button_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_border.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/layout-land/webviewchromium_date_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_advanced_component.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_title.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_suggestion.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_dropdown_text.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_multi_field_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_two_field_date_picker.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml
hromium/overlay/frameworks/base/core/res/res/menu/webviewchromium_select_action_menu.xml
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az-rAZ/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne-rNP/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si-rLK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values/attrs.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/colors.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
hromium/overlay/frameworks/base/core/res/res/values/values.xml
hromium/proguard.flags
hromium/res/drawable-hdpi/ic_media_video_poster.png
hromium/res/drawable-ldpi/ic_media_video_poster.png
hromium/res/drawable-mdpi/ic_media_video_poster.png
hromium/res/drawable-xhdpi/ic_media_video_poster.png
hromium/res/values-af/strings.xml
hromium/res/values-am/strings.xml
hromium/res/values-ar/strings.xml
hromium/res/values-az-rAZ/strings.xml
hromium/res/values-az/strings.xml
hromium/res/values-bg/strings.xml
hromium/res/values-ca/strings.xml
hromium/res/values-cs/strings.xml
hromium/res/values-da/strings.xml
hromium/res/values-de/strings.xml
hromium/res/values-el/strings.xml
hromium/res/values-en-rGB/strings.xml
hromium/res/values-en-rIN/strings.xml
hromium/res/values-es-rUS/strings.xml
hromium/res/values-es/strings.xml
hromium/res/values-et-rEE/strings.xml
hromium/res/values-fa/strings.xml
hromium/res/values-fi/strings.xml
hromium/res/values-fr-rCA/strings.xml
hromium/res/values-fr/strings.xml
hromium/res/values-hi/strings.xml
hromium/res/values-hr/strings.xml
hromium/res/values-hu/strings.xml
hromium/res/values-hy-rAM/strings.xml
hromium/res/values-in/strings.xml
hromium/res/values-it/strings.xml
hromium/res/values-iw/strings.xml
hromium/res/values-ja/strings.xml
hromium/res/values-ka-rGE/strings.xml
hromium/res/values-km-rKH/strings.xml
hromium/res/values-ko/strings.xml
hromium/res/values-lo-rLA/strings.xml
hromium/res/values-lt/strings.xml
hromium/res/values-lv/strings.xml
hromium/res/values-mn-rMN/strings.xml
hromium/res/values-ms-rMY/strings.xml
hromium/res/values-nb/strings.xml
hromium/res/values-ne-rNP/strings.xml
hromium/res/values-ne/strings.xml
hromium/res/values-nl/strings.xml
hromium/res/values-pl/strings.xml
hromium/res/values-pt-rPT/strings.xml
hromium/res/values-pt/strings.xml
hromium/res/values-ro/strings.xml
hromium/res/values-ru/strings.xml
hromium/res/values-si-rLK/strings.xml
hromium/res/values-si/strings.xml
hromium/res/values-sk/strings.xml
hromium/res/values-sl/strings.xml
hromium/res/values-sr/strings.xml
hromium/res/values-sv/strings.xml
hromium/res/values-sw/strings.xml
hromium/res/values-th/strings.xml
hromium/res/values-tl/strings.xml
hromium/res/values-tr/strings.xml
hromium/res/values-uk/strings.xml
hromium/res/values-vi/strings.xml
hromium/res/values-zh-rCN/strings.xml
hromium/res/values-zh-rHK/strings.xml
hromium/res/values-zh-rTW/strings.xml
hromium/res/values-zu/strings.xml
hromium/res/values/strings.xml
|
| 8e97d006ca9d9ccf17428980786953b2cac3c933 |
24-Jul-2014 |
Selim Gurun <sgurun@google.com> |
The plumbing for API changes
Bug: 16403458
Do the plumbing changes necessary to address the API changes that are
requested by the API council. This includes adding a helper
to offload most file upload functionality to webview.
Change-Id: I425bc47099f4d78c03ac510e53963c3dbeefbc85
hromium/java/com/android/webview/chromium/FileChooserParamsAdapter.java
hromium/java/com/android/webview/chromium/UploadHelperImpl.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 75c9ef4dd2ab500e53c73740fe469015b80553fe |
28-Jul-2014 |
Primiano Tucci <primiano@google.com> |
Merge "Generate symlinks to libwebviewchromium.so in /system/priv-app"
|
| 9d86204f2628278ea264d6cb5d458c95f113c39c |
25-Jul-2014 |
Primiano Tucci <primiano@google.com> |
Generate symlinks to libwebviewchromium.so in /system/priv-app
This change declares libwebviewchromium to be treated as a JNI lib
for the webviewchromium.apk. By doing this, the build system will
create symlinks from /system/app-priv/webviewchromium/lib/...
(which is the path returned by the package manager) to the actual
libraries in /system/lib*.
Furthermore this change also declares the apk to be a multilib
target, so that both libraries get symlinked on multi-arch devices.
BUG:16403706
Change-Id: Ib02191eddf8262b2b23c3c32d07e77b33759285d
hromium/Android.mk
|
| 8c097f93ab66bb9422e31eaa772170d7c77770df |
29-Jul-2014 |
Ben Murdoch <benm@google.com> |
Merge "Generate symlinks to libwebviewchromium.so in /system/priv-app" into master-chromium
|
| e0ef2965a44761b31eeae5868811262d566a8641 |
25-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Update framework resource references.
This moves us over to use the newly-exposed public framework resource
IDs.
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 3fd18d4f961022926b62f67b5e48919873290075 |
29-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Add com.android.webview to the package whitelist.
Change-Id: Iaefe1ea31e3e23cc6ae94899103ad9600af8b022
hromium/jar_package_whitelist.txt
|
| 3398e2ae778c12cb94d7b4c11ab5e4c322f07c2e |
25-Jul-2014 |
Primiano Tucci <primiano@google.com> |
Generate symlinks to libwebviewchromium.so in /system/priv-app
This change declares libwebviewchromium to be treated as a JNI lib
for the webviewchromium.apk. By doing this, the build system will
create symlinks from /system/app-priv/webviewchromium/lib/...
(which is the path returned by the package manager) to the actual
libraries in /system/lib*.
Furthermore this change also declares the apk to be a multilib
target, so that both libraries get symlinked on multi-arch devices.
BUG:16403706
Change-Id: Ib02191eddf8262b2b23c3c32d07e77b33759285d
hromium/Android.mk
|
| fdac2296aea0bf5b6d32f6ab38f04879ed1ecc0e |
17-Jul-2014 |
Tao Bai <michaelbai@google.com> |
Corresponding permission API change in WebView glue layer.
BUG: 15432556
Change-Id: I3e8666003a2cccd825138ba30669928bbd0ba40d
(cherry picked from commit acdfdb70506d6ae71eaa9230f34eece2cae2c0a2)
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| c0bac61af98d8597256114c3366cd23051ed2674 |
17-Jul-2014 |
Tao Bai <michaelbai@google.com> |
Corresponding permission API change in WebView glue layer.
BUG: 15432556
Change-Id: I3e8666003a2cccd825138ba30669928bbd0ba40d
(cherry picked from commit acdfdb70506d6ae71eaa9230f34eece2cae2c0a2)
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 6ed700e171cb2ee3303c08a1db2abc0e56fd307a |
24-Jul-2014 |
Ben Murdoch <benm@android.com> |
Merge "Force software draws in AOSP"
|
| b6b92513c9923a1cc55fd999edba4e943241e4dc |
24-Jul-2014 |
Ben Murdoch <benm@android.com> |
Merge "Force software draws in AOSP" into chromium-dev
|
| 6aa7c3e4173041341e6027fb43456969ecfd97fd |
16-May-2014 |
Torne (Richard Coles) <torne@google.com> |
Add loader library to handle relro sharing.
Create a small native library that just contains the JNI code for
WebViewFactory, to enable loading of the full WebView native library
using android_dlopen_ext.
Bug: 13005501
Change-Id: I9608431a66868124f1c1ac618b2c24e2f2608631
(cherry picked from commit bf558c3c576bc709b38886e986010df3b61291bd)
hromium/Android.mk
hromium/loader/loader.cpp
|
| acdfdb70506d6ae71eaa9230f34eece2cae2c0a2 |
17-Jul-2014 |
Tao Bai <michaelbai@google.com> |
Corresponding permission API change in WebView glue layer.
BUG: 15432556
Change-Id: I3e8666003a2cccd825138ba30669928bbd0ba40d
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| ffda7fe9063aed99e8da32003d61ba21de356f43 |
22-Jul-2014 |
Bo Liu <boliu@google.com> |
Force software draws in AOSP
Hardware acceleration in chromium m37+ no longer works with android
Kitkat, so force disable hardware acceleration. This is for AOSP only
until L is open sourced.
Change-Id: I95ad29492d868fd5a9772fce085b2a0302bf2388
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 69091706a567c709cf29e2a8be323da56f636ced |
22-Jul-2014 |
Bo Liu <boliu@google.com> |
Force software draws in AOSP
Hardware acceleration in chromium m37+ no longer works with android
Kitkat, so force disable hardware acceleration. This is for AOSP only
until L is open sourced.
Change-Id: I95ad29492d868fd5a9772fce085b2a0302bf2388
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| bba0dd1761016a241b4ae8e9319c044c64f779ce |
17-Jul-2014 |
Torne (Richard Coles) <torne@google.com> |
Make the WebView Java library into an APK.
Package the WebView Java code as an APK instead of a JAR. Mark this as a
multiarch app so that dexopt will be run for both architectures on a
multiarch device. Add a CleanSpec to delete the old JAR.
Bug: 16329371
Change-Id: Ic09958e965b9163ac6b597df7005dd4a05de7a56
(cherry picked from commit 9674dff549ad8358b4439abcb6cf8f86cd11b307)
hromium/Android.mk
hromium/AndroidManifest.xml
hromium/CleanSpec.mk
|
| 34cd86b5dc8729154087a5ea75a0c90c1ac25ac6 |
21-Jul-2014 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r284076
This commit was generated by merge_to_master.py.
Change-Id: I671bf54e40958d21a2ac5ad7da849b5a6834fe95
|
| 79d2ee8c0e4d0d8dfdd53deefe889147ba6d1048 |
03-Jul-2014 |
Ben Murdoch <benm@google.com> |
Plumb temporary view detach calls through WebViewChromium.
See Change-Id: I92ba2f44359643fee63f30b9c35b1ae4183e4245
Bug: 14313621
Change-Id: Ib7d6957c804d4abfded9b8e20860ee06ae4086c3
(cherry picked from commit d49bfc0d304a58e1308bc77b1dfd6877a6d26690)
(cherry picked from commit abf2feb5889ef407712333e9ef68444893725863)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| d14982c9599357cde47a13c1584adfdc59b6a97f |
02-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Add zoomBy API plumbing
This adds the plumbing necessary for the zoomBy API so that it's
possible to land the frameworks/base change that actually adds the
new API to the WebView.
BUG: 13399510
Change-Id: I15924235e6deb25eff68638f174b6cd158b3d902
(cherry picked from commit 79625af35a664f87a5a9361c782137f8bfc99496)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 9674dff549ad8358b4439abcb6cf8f86cd11b307 |
17-Jul-2014 |
Torne (Richard Coles) <torne@google.com> |
Make the WebView Java library into an APK.
Package the WebView Java code as an APK instead of a JAR. Mark this as a
multiarch app so that dexopt will be run for both architectures on a
multiarch device. Add a CleanSpec to delete the old JAR.
Bug: 16329371
Change-Id: Ic09958e965b9163ac6b597df7005dd4a05de7a56
hromium/Android.mk
hromium/AndroidManifest.xml
hromium/CleanSpec.mk
|
| d8e3c030784d1b4782f0f31ba69e368bb78ae4c1 |
02-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Add zoomBy API plumbing
This adds the plumbing necessary for the zoomBy API so that it's
possible to land the frameworks/base change that actually adds the
new API to the WebView.
BUG: 13399510
Change-Id: I15924235e6deb25eff68638f174b6cd158b3d902
(cherry picked from commit 79625af35a664f87a5a9361c782137f8bfc99496)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 929a219d3406dfc60a34eb9e7a9524ee6937c9a6 |
21-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Merge remote-tracking branch 'aosp/master' into merge_into_crdev" into chromium-dev
|
| 1430cd2f42c3c10967538f97a8ec1851f713fb88 |
21-Jul-2014 |
Marcin Kosiba <mkosiba@android.com> |
Merge remote-tracking branch 'aosp/master' into merge_into_crdev
Change-Id: I62b621cd73e6a328221d078b948f99cd6e58f327
|
| 79625af35a664f87a5a9361c782137f8bfc99496 |
02-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Add zoomBy API plumbing
This adds the plumbing necessary for the zoomBy API so that it's
possible to land the frameworks/base change that actually adds the
new API to the WebView.
BUG: 13399510
Change-Id: I15924235e6deb25eff68638f174b6cd158b3d902
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 4054cf14197579550220ccb28ee43d63f3df3937 |
16-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Work around AwWebResourceResponse not supporting null headers.
This is a temporary workaround till we get the proper fix in upstream.
The AwWebResourceResponse constructor causes an NPE if a null headers
map is passed in.
BUG: 16332774
Change-Id: If8f9cf50385c459cfb5920785a3f44ef1aa97673
(cherry picked from commit 39d58cba55c7eecfbd9aa3be78c5d0531e030147)
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| c5faabbe90f772416a710e94d790817a9c2523c5 |
16-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Add plumbing for new shouldInterceptRequest callback.
BUG: 7589347
Change-Id: Ib22bb5070c791712ad9f5ac4f964b1278bfe16de
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| fe2e7b6568e71aaa36ec686d2b9d100a97b6e783 |
16-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Work around AwWebResourceResponse not supporting null headers." into lmp-dev
|
| 39d58cba55c7eecfbd9aa3be78c5d0531e030147 |
16-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Work around AwWebResourceResponse not supporting null headers.
This is a temporary workaround till we get the proper fix in upstream.
The AwWebResourceResponse constructor causes an NPE if a null headers
map is passed in.
BUG: 16332774
Change-Id: If8f9cf50385c459cfb5920785a3f44ef1aa97673
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 6c34851f73636243d547042bbd2dbdad13c9b6af |
16-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Add plumbing for new shouldInterceptRequest callback.
BUG: 7589347
Change-Id: Ib22bb5070c791712ad9f5ac4f964b1278bfe16de
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| c341bd39d11088a6180ceea80aac25be6b7bfbb5 |
16-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Add plumbing for new shouldInterceptRequest callback." into lmp-dev
|
| abf2feb5889ef407712333e9ef68444893725863 |
03-Jul-2014 |
Ben Murdoch <benm@google.com> |
Plumb temporary view detach calls through WebViewChromium.
See Change-Id: I92ba2f44359643fee63f30b9c35b1ae4183e4245
Bug: 14313621
Change-Id: Ib7d6957c804d4abfded9b8e20860ee06ae4086c3
(cherry picked from commit d49bfc0d304a58e1308bc77b1dfd6877a6d26690)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 5d798498ebb77365ea20f974f79c3dae23cd76fe |
15-Jul-2014 |
Ben Murdoch <benm@google.com> |
Merge "Plumb temporary view detach calls through WebViewChromium." into master-chromium
|
| e64f201d176ba5fdf8d7a884ef104c311a78013f |
11-Jul-2014 |
Torne (Richard Coles) <torne@google.com> |
am f250ae82: (-s ours) Merge "Merge up to 33b9fe6 from chromium-dev."
* commit 'f250ae82bb2fb6c8b5c37da99266475dbd95c269':
Update WebViewChromium to match http://crrev.com/274153002
|
| c2b11cede6c721a609ce84a4bc461981c7554bab |
09-Jul-2014 |
Selim Gurun <sgurun@google.com> |
The plumbing to disable data reduction proxy
Bug: 16011253
Implement the plumbing to opt out from using data reduction proxy. Apps
can only opt-out, only users are allowed to opt-in.
Change-Id: Ic5e04fb52303db66c89819b6a83dda473db85b52
(cherry picked from commit 586bf9dff1ab17a76f9deb4781beae99d0cff9ef)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 586bf9dff1ab17a76f9deb4781beae99d0cff9ef |
09-Jul-2014 |
Selim Gurun <sgurun@google.com> |
The plumbing to disable data reduction proxy
Bug: 16011253
Implement the plumbing to opt out from using data reduction proxy. Apps
can only opt-out, only users are allowed to opt-in.
Change-Id: Ic5e04fb52303db66c89819b6a83dda473db85b52
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 5dfb0b18b1e1c948cc8619b213d8bf528ec17055 |
09-Jul-2014 |
Selim Gurun <sgurun@google.com> |
The plumbing to disable data reduction proxy
Bug: 16011253
Implement the plumbing to opt out from using data reduction proxy. Apps
can only opt-out, only users are allowed to opt-in.
Change-Id: Ic5e04fb52303db66c89819b6a83dda473db85b52
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| ddabdb614303e5aba56573cb05265c9abf62cd3a |
05-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ia9b08cd7b28661c55bdc6b728c67ab90acc885d6
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
|
| d49bfc0d304a58e1308bc77b1dfd6877a6d26690 |
03-Jul-2014 |
Ben Murdoch <benm@google.com> |
Plumb temporary view detach calls through WebViewChromium.
See Change-Id: I92ba2f44359643fee63f30b9c35b1ae4183e4245
Bug: 14313621
Change-Id: Ib7d6957c804d4abfded9b8e20860ee06ae4086c3
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 683bfb4ddf7a22467637111b488563f2ce405173 |
07-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Fix WebView crash on startup due to missing resource."
|
| 2529fc6ba81f15915487a48100125c5c8f3e53d0 |
04-Jul-2014 |
Marcin Kosiba <mkosiba@google.com> |
Fix WebView crash on startup due to missing resource.
BUG: 15986106
Change-Id: I684b6e37f5e7947474cc2938d48fc3761e811fc7
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/config.xml
|
| aeafafb7fda87d35a53c321d89da2df1a0143ecd |
02-Jul-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge changes landed in master after lmp-dev creation.
Merge the following two commits that were landed in master after we
created the lmp-dev branch:
Add loader library to handle relro sharing.
Add instrumentation-based WebViewFlingTest.
Change-Id: I706dbe428853be6a1fb6439c0d849736437556de
|
| 12364b125bed36f2c9cce1ffa856c0046b9b9058 |
01-Jul-2014 |
Ben Murdoch <benm@google.com> |
Implement WebViewChromium.preauthorizePermission.
Plumb the API from the framework into AwContents.
Bug: 16008767
Change-Id: Iac770b2481e36b3085dd14cd6d1b0c54f2279b69
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 881717f6822544e3a72c851efb4f3821a1afab91 |
02-Jul-2014 |
Ben Murdoch <benm@google.com> |
Merge "Implement WebViewChromium.preauthorizePermission." into lmp-dev
|
| a42d51663a48b70681268de9da8c3213fd7deebc |
01-Jul-2014 |
Ben Murdoch <benm@google.com> |
Implement WebViewChromium.preauthorizePermission.
Plumb the API from the framework into AwContents.
Bug: 16008767
Change-Id: Iac770b2481e36b3085dd14cd6d1b0c54f2279b69
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 070f9117e104d2e280094e963083b045b7100cd1 |
02-Jul-2014 |
Hector Dearman <hjd@google.com> |
Merge "Add Third Party Cookie API" into lmp-dev
|
| b5393534078ce48413389da3ebf0b08ae6d11372 |
05-Jun-2014 |
Hector Dearman <hjd@google.com> |
Add Third Party Cookie API
Connect the new third party WebView cookie APIs.
Bug: 11678084
Change-Id: Icf06644580df3ffd3e49f3e8f368a9db6c295184
(cherry picked from commit fe01064a1d0cdc9defb395ab39383b5e242c206a)
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/CookieManagerAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 348bbcae6ccd90593cf656288697d797d8445794 |
29-May-2014 |
Hector Dearman <hjd@google.com> |
Deprecate the Cookie Sync Manager
The CookieSyncManager is largely useless as the WebView
automatically syncs cookies every 30s (whether you like it
or not). The one method which needs to be saved is sync,
there is no other way to force a sync without this.
We move sync to the CookieManager and rename it to flush
for greater consistency.
Bug: 11060034
Change-Id: Ie5f0d559f18341205b270ee8cc6ba2a49b3df71d
hromium/java/com/android/webview/chromium/CookieManagerAdapter.java
|
| 2f3d80f7025d868b7a29e8c2aff9551b77080edc |
27-Jun-2014 |
Allen Hair <allenhair@google.com> |
Merge "Add instrumentation-based WebViewFlingTest."
|
| bf558c3c576bc709b38886e986010df3b61291bd |
16-May-2014 |
Torne (Richard Coles) <torne@google.com> |
Add loader library to handle relro sharing.
Create a small native library that just contains the JNI code for
WebViewFactory, to enable loading of the full WebView native library
using android_dlopen_ext.
Bug: 13005501
Change-Id: I9608431a66868124f1c1ac618b2c24e2f2608631
hromium/Android.mk
hromium/loader/loader.cpp
|
| 8aa18d340d109dc186b90088497022bcde8edff6 |
27-Jun-2014 |
Hector Dearman <hjd@google.com> |
Merge "Add Third Party Cookie API" into master-chromium
|
| fe01064a1d0cdc9defb395ab39383b5e242c206a |
05-Jun-2014 |
Hector Dearman <hjd@google.com> |
Add Third Party Cookie API
Connect the new third party WebView cookie APIs.
Bug: 11678084
Change-Id: Icf06644580df3ffd3e49f3e8f368a9db6c295184
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/CookieManagerAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 47f61d2406473b823814c457633d1d21a9af7efb |
25-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r278856.
|
| 470f1ad2149fe83ae80991d8657fdfaab28b2fdb |
24-Jun-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Match API changes from http://crrev.com/284123004" into master-chromium
|
| 0e96d56ccb5268ae285ac585d304878b8b76fe95 |
25-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge up to 2b4719f from chromium-dev."
|
| 260da26d594db0e3399e32bc12e6f904591e3c8a |
25-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge up to 2b4719f from chromium-dev.
|
| ac76b453f2ed70cb1d68e224138064d49cb1d457 |
24-Jun-2014 |
Hui Shu <hush@google.com> |
Do not use expect invokeFunctor to return a boolean.
BUG: 15513308
Change-Id: I3f160d66a315fe305a5923818186891f27149d0a
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
|
| d825b28af830f47c9adf803959a39d52c74638f8 |
24-Jun-2014 |
Hui Shu <hush@google.com> |
Do not use expect invokeFunctor to return a boolean.
BUG: 15513308
Change-Id: I3f160d66a315fe305a5923818186891f27149d0a
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
|
| 017554f2c30b84041e3e47a921fd94c80425699a |
23-Jun-2014 |
Marcin Kosiba <mkosiba@google.com> |
Match API changes from http://crrev.com/284123004
This updates the WebViewContentsClientAdapter to match the
AwContentsClient API changes in http://crrev.com/284123004.
Change-Id: Iab3a4f3f820de51ec9846a7c0300ceaa1eb6d80d
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 9fd439c8e92333ef096c69ce82ade82a4a147f31 |
20-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r278205
This commit was generated by merge_to_master.py.
Change-Id: I0e676e93232ad5e367a26ff6e09e548602fb5b33
|
| 72b5bdf2fe1c8f80aa7f72772641947cb9fe8c44 |
21-May-2014 |
Hector Dearman <hjd@google.com> |
Connect WebView Async Cookie APIs
Committed on the wrong branch and broke CTS on master-chromium.
Bug: 14379829
Change-Id: Id1a512285a20dabde2c2d1a2eeef544d86a4f5b9
(cherry picked from commit b0249c1723f37f18f25d35a0723eab6b324481b0)
hromium/java/com/android/webview/chromium/CookieManagerAdapter.java
|
| bedf4e4bc5d190729c1ee70e234a6c5cd2414df2 |
20-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge up to 6904764 from chromium-dev."
|
| d9cda1802d6209d4b76f3a57f2b0b663e5457837 |
20-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge up to 6904764 from chromium-dev.
Update to match external/chromium_org.
|
| 2b4719f12bac2f9f71d99567f09f46916903edf8 |
20-Jun-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Match API changes from http://crrev.com/284123004" into chromium-dev
|
| fa7d66b53030e96c0031cd7124215140d08f728c |
20-Jun-2014 |
Marcin Kosiba <mkosiba@android.com> |
Match API changes from http://crrev.com/284123004
This updates the WebViewContentsClientAdapter to match the
AwContentsClient API changes in http://crrev.com/284123004.
Change-Id: I5eefbd0bd09a40312a9dfe834ef5041f42d73798
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| fc03b1429c5e5d3c5ade6cb4ec813890ab3fe5a8 |
20-Jun-2014 |
Yuncheol Heo <ycheo@google.com> |
Merge "Fix the crash during initializing WebView." into master-chromium
|
| 998d67697ebc5fd0efcd6ed39531e556d788c50f |
20-Jun-2014 |
Yuncheol Heo <ycheo@google.com> |
Fix the crash during initializing WebView.
There are some cases that starts BrowserProcess without initializing
ResourceProvider. Currently the start-up routine of BrowerProcess
refers the key system configuration from ResourceProvider.
So the missing initialization causes the Exception.
Bug: 15767554
Change-Id: Ib2d846bb0cf45dadd69a49ff0e97bd04acb58d4e
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 1e293ae13e9c0190c3296fe5b83b466a5baa1d19 |
19-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| aaa607629104e0baac8692b4ba098d0942c7be35 |
19-Jun-2014 |
Yuncheol Heo <ycheo@google.com> |
Merge "Update resources to match http://crrev.com/333003003" into master-chromium
|
| 2abf9f022d36e29c63c6d0f529449de85596fc48 |
19-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Remove libaddressinput hook.
This hook has been deleted upstream and isn't needed any more.
Change-Id: Ide487739c6111ff38b09353781097b4c315dc162
hromium/tools/merge_from_chromium.py
|
| b0249c1723f37f18f25d35a0723eab6b324481b0 |
21-May-2014 |
Hector Dearman <hjd@google.com> |
Connect WebView Async Cookie APIs
Bug: 14379829
Change-Id: Id1a512285a20dabde2c2d1a2eeef544d86a4f5b9
hromium/java/com/android/webview/chromium/CookieManagerAdapter.java
|
| 34a8ec305a085807c44670e4e912f5e5e08b5f4d |
17-Jun-2014 |
Ignacio Solla <igsolla@google.com> |
Merge "Add plumbing for the new fullscreen video path." into master-chromium
|
| 6f63acf840e5b57e67a5c8b01e634431fbd35688 |
13-Jun-2014 |
Selim Gurun <sgurun@google.com> |
Update the plumbing to comply with client cert API changes.
Bug: 15432556
The API council has asked to update the client cert API. This change
is needed to bring the plumbing in line with the API change.
Change-Id: Ia7606c186a9344e1cbb9c2b40dff402717453c8e
(cherry picked from commit 06286fe4b7b23d2fe050b0f2fc8a5d68a7002537)
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 68c6ec72153760f2ee5c17c4f23ce23fc99dc335 |
13-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ie6e8feb6d52a8c6ea6564ea42d5e5f839f7ffe4b
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
|
| ee10ce40f813cf8946ca744e813e1237c350c70e |
12-Jun-2014 |
Yuncheol Heo <ycheo@google.com> |
Update resources to match http://crrev.com/333003003
This updates the resources to match the following Chromium change:
> aw: Support the platform specific key-systems.
>
> BUG=322395
Bug: 11759895
Change-Id: I27d5f499967f6db7b9ac4b9af325e3e90e50e60a
hromium/java/com/android/webview/chromium/ResourceProvider.java
|
| b47a2cdf01a6afe67966ba9b68aea42103c69330 |
23-May-2014 |
Ignacio Solla <igsolla@google.com> |
Add plumbing for the new fullscreen video path.
This is a cherry pick of
https://android-review.googlesource.com/#/c/97161
into master-chromium.
Required for some upstream changes - please see:
https://codereview.chromium.org/315973004/
Change-Id: If023b42b865c14a00e2be5bc3dc51b906e61d2c5
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 10d76f4f44215d22b05ef3c05e8d4410bbc0ee29 |
16-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge scripts: fix hook." into master-chromium
|
| 89eebfea3003dda71c0e8be246d7e5f529e3436b |
16-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: fix hook.
There's no 'src' directory in our checkout, so the hook wasn't found.
Fix it.
Change-Id: Ibc6b4ba1e6849bfd1bf67acc91fed75bdb06bc47
hromium/tools/merge_from_chromium.py
|
| 1a5c76109b5840dc84815fcc91b27148e6df11cc |
16-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: run the libaddressinput hook.
The libaddressinput hook from DEPS needs to be run to make our build
work; copy it to the merge script for now as we still haven't got a
better way to deal with hooks. Remove the old hook that downloaded gn
from google storage as this is not necessary at present and is unlikely
to be needed in future either.
Change-Id: I04facd61fba554fcfc0093ef8bc907474d6c1d07
hromium/tools/merge_from_chromium.py
|
| 1bcf220e8ca3cfeb937c8e6dcf8138ab5611e8fc |
13-Jun-2014 |
Martin Kosiba <mkosiba@google.com> |
Add libaddressinput to the merged project list.
Recent chromium revisions need this.
hromium/tools/merge_common.py
|
| 2176bfd50835911c98e1581eb40f089aa921b125 |
12-Jun-2014 |
Richard Coles <torne@google.com> |
Revert "Add libaddressinput to the merged project list."
This reverts commit 13e2ded0ee997ac247ce18be587125c149f9c4c9.
Change-Id: If3f87f147a26a6d552483f34e25a039a7f830598
hromium/tools/merge_common.py
|
| 13e2ded0ee997ac247ce18be587125c149f9c4c9 |
12-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Add libaddressinput to the merged project list.
Recent chromium revisions need this.
Change-Id: Ia6ce4dce65c3fe3d06275bfbb8faf68b881775f1
hromium/tools/merge_common.py
|
| 09b20c952da921a77cab89eb4f51a349258f4fd0 |
16-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge scripts: run the libaddressinput hook." into master-chromium
|
| 0039eda3e19cd0995aa62d2b856645813a6ff611 |
14-Jun-2014 |
Selim Gurun <sgurun@google.com> |
Prevent webview connections to freeze when DRP key is null
Bug: 15607413
When data reduction proxy is not provided the correct key, if fails to
failover to a non-proxy connection, and connections simply freeze. This
especially happens immediately after an update. Fix this by not enabling
DRP unless key is non-null.
Change-Id: I36dac5807ea7aaba6e2d0f9f7586de269868dc72
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| a83766bebe5b32a442a51b1f757abb943b2fec4b |
13-Jun-2014 |
Selim Gurun <sgurun@google.com> |
Update the plumbing to comply with client cert API changes.
Bug: 15432556
The API council has asked to update the client cert API. This change
is needed to bring the plumbing in line with the API change.
Change-Id: Ia7606c186a9344e1cbb9c2b40dff402717453c8e
(cherry picked from commit 06286fe4b7b23d2fe050b0f2fc8a5d68a7002537)
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 69b25746996411232add634fb6f3a8db7fad7713 |
12-Jun-2014 |
Primiano Tucci <primiano@google.com> |
Merge "Share Clank key propagation behavior on shouldOverrideKeyEvent" into master-chromium
|
| e37101b580615162e33ff59e7e8dac72427b00de |
07-Jun-2014 |
Selim Gurun <sgurun@google.com> |
Enable the plumbing for file chooser API
Bug: 6930981
For L+, we want to use the new showFileChooser API. However,
even though we never published a public API, we still want to
support the old openFileChooser API. This change enables the
support for the new API (the hidden API is already supported
in KKMR2+).
Change-Id: I1d191f3dc8c4a5d4e0470bb43937837b262a62f4
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 27c7b1bad70bc0cafc3ec77ef627c7c83eacb547 |
10-Jun-2014 |
Tao Bai <michaelbai@google.com> |
Merge "Keep weakref of permission requests sent to client." into master-chromium
|
| 69047640da7b4efa4b0de2cb2b9559fde5f31a21 |
16-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Update chromium-dev to current AOSP master." into chromium-dev
|
| 42a8e58e65b04d94e9100afbcea4e62afba9e0b9 |
16-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Update chromium-dev to current AOSP master.
The android_aosp chromium bot has been rolled to a newer AOSP version;
update chromium-dev to the current AOSP master to match so that we can
continue landing glue layer changes in chromium-dev.
Change-Id: I02be8a7c5875aa9d56a632219c0c0ae3aa683582
|
| 23e0ff609bf79971b3cdd6c2b522374565d539fc |
16-Jun-2014 |
Richard Coles <torne@google.com> |
Merge "Add plumbing for the new fullscreen video path." into chromium-dev
|
| 87eddcf5ff8d3cda4ae5cb655b5c1de725d0ff64 |
12-Jun-2014 |
Ignacio Solla <igsolla@google.com> |
Add plumbing for the new fullscreen video path.
Required for some upstream changes - please see:
https://codereview.chromium.org/315973004/
Change-Id: I68a701a8552b4af9fd393b917e768702a7ab2611
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 7862862f7fe1a0951c5721c3df5ccc101e10c86e |
09-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r275586
This commit was generated by merge_to_master.py.
Change-Id: Id08b473ff9d28c3b7b25a49c658a8dc540fbbf73
|
| f9d0142c7342586318f3af96445922c5ae2e1221 |
05-Jun-2014 |
Kristian Monsen <kristianm@google.com> |
Remove function no longer in the Statics interface
Change-Id: I47c47c44d4b5b6f4a4f366affa9d110de440ade5
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| c4ffdceea90a5b1c7c60cd0b4adcfaba4e589f0e |
05-Jun-2014 |
Kristian Monsen <kristianm@google.com> |
Remove function no longer in the Statics interface
Change-Id: I47c47c44d4b5b6f4a4f366affa9d110de440ade5
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| c3d558b55a255f032811635801003e342cc56597 |
05-Jun-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Make DrawGLFunctor work on 64-bit platforms."
|
| 0328c4ba3dab49c5ac7bbdc5460317629fa82e8a |
05-Jun-2014 |
Marcin Kosiba <mkosiba@google.com> |
Make DrawGLFunctor work on 64-bit platforms.
The change to disable the functor for 64-bit platforms was merged
from chromium-dev where it was necessary since chromium-dev is
pinned to a 32-bit only version of frameworks/base.
This restriction can be lifted in master where frameworks/base
supports 64-bit.
Change-Id: Ibb5b3327387c7e0c22174fa9ecd91b66cf29249d
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
|
| f250ae82bb2fb6c8b5c37da99266475dbd95c269 |
03-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge up to 33b9fe6 from chromium-dev."
|
| 10405584d8eb395f6f01fd9b574a18d811731e0d |
03-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r273901
This commit was generated by merge_to_master.py.
Change-Id: Icde41ca09f824110580a8fc746868ebfd65a120d
|
| 924278d1f98b209b04bd699494d269d363d1aaa4 |
02-Jun-2014 |
Primiano Tucci <primiano@google.com> |
Share Clank key propagation behavior on shouldOverrideKeyEvent
This change (together with crrev.com/308313004 upstream) unifies (with
Clank) the code which checks whether a key should propagated or not to
Blink and stops looking for isSystemKey. According to the latest
Android framework changes, we shouldn't rely on isSystemKey.
BUG: 14438911
Change-Id: I6dbcd99ebfc2072d6b1aae007737342de3f62b81
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| b4cbff7ba8874b0b494d4c55aede6823a532373e |
02-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge up to 33b9fe6 from chromium-dev.
Update to match external/chromium_org.
|
| 4d7d71641acfefe50facc0295faceb79ca723375 |
28-May-2014 |
Allen Hair <allenhair@google.com> |
Add instrumentation-based WebViewFlingTest.
Previous test used the legacy shell-based uiautomator and
janktesthelper. The shell-based libraries relied on some hacks to work
around the fact that they did not have access to a Context object, but
these hacks were prone to being flaky. The new versions of the libraries
rely on Instrumentation and avoid these hacks by using a Context instead.
Bug: 13471491
Change-Id: I6faff306e475bed38ccaca377f099fa40334b77c
hromium/tests/UbWebViewJankTests/Android.mk
hromium/tests/UbWebViewJankTests/AndroidManifest.xml
hromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java
|
| 22d5e39366bb0954baeaec633e33775335ff834d |
28-May-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I38cace5eee82a0bae41a0f1178b01ba04d69adba
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
|
| a3a611d937bc6d3e141e4e7b2e658e21a96c43ab |
27-May-2014 |
Bo Liu <boliu@google.com> |
Merge "Detach functor in destroy" into master-chromium
|
| 0ad2a671ad337bf738f618f8655c0fb930c3a58b |
24-May-2014 |
Torne (Richard Coles) <torne@google.com> |
Update merge project list for new skia.
Skia now just has a single DEPS entry instead of three; update project
list.
Change-Id: Ia09647279d09ec622d174ce710656223a1b2fb7d
hromium/tools/merge_common.py
|
| b3cf68918fea554c33516e9ed7a73a8b6f4e9301 |
24-May-2014 |
Bo Liu <boliu@google.com> |
Detach functor in destroy
Destroy now will synchronously tear down hardware and no longer require
onDetachedFromWindow to be called first. So detach functor before
destroying it.
BUG=15088380
Change-Id: I6acc27d0c1729e7e1dc0bf0c0916c80e1c8d0102
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
|
| 3018e5c2155630f434529d28e0aa08c95d0a1ffd |
22-May-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Update WebViewChromium to match http://crrev.com/274153002" into master-chromium
|
| b6e8dc172dcd850cf57321a9c574b184275c85fb |
19-May-2014 |
Tao Bai <michaelbai@google.com> |
Keep weakref of permission requests sent to client.
This make us give the same object has sent to client in OnPermissionRequestCanceled() method.
Perviously, overidden equals() method has issue if the developer us "==" to find the request.
Change-Id: Icd5d70c98a317baee02f92cb64ab7e4f3a6934dd
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| d40b25c7299872081268a6cc2b2eb121ff551455 |
20-May-2014 |
Marcin Kosiba <mkosiba@google.com> |
Update WebViewChromium to match http://crrev.com/274153002
Pass in the Context to the AwContents constructor.
Change-Id: I50ae6fde76facbe0a05c73bce469e35aa297f683
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 032cc50353034d405ba8c64d34925a7a854cecc5 |
19-May-2014 |
Selim Gurun <sgurun@google.com> |
Read the key for data reduction proxy
Bug: 12492817
Change-Id: I58523f033c8d13c569ae0dbbb7c483b193e914a7
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 91c6ac0144f41f1dc0a2d2f791037ca5a8fc3716 |
19-May-2014 |
Selim Gurun <sgurun@google.com> |
Merge "Listen to data reduction proxy setting changes" into master-chromium
|
| 88ac9a5610dedad6614a35ce2d7b110733ab7167 |
04-Apr-2014 |
Ben Murdoch <benm@google.com> |
Add NullWebViewFactoryProvider.
This is a WebView implementation that simply throws
UnsupportedOperationException for each entry point to
the WebView. Intended for devices that do not intend
to ship a WebView implementation.
Bug: 13438487
Change-Id: I6afa169fa31db82c45c0a507e265301e48ac79dc
(cherry picked from commit 4a3d672f44f1bc30aeed9cb53dfe34d6638a2ff8)
ullwebview/Android.mk
ullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java
ullwebview/proguard.flags
|
| 3cc50c8a8aa48850211f6724bba1d788c9f08180 |
16-May-2014 |
Torne (Richard Coles) <torne@google.com> |
automerger: always fetch the SHA1.
Some projects in chromium are now tracking branches other than master
even in trunk, so the default "git fetch" doesn't work for them. Always
fetch the specific SHA1. This requires git 1.8 or greater.
Change-Id: Ief417d4e61e06b26d491f09a384f86662e168803
hromium/tools/merge_from_chromium.py
|
| cbf77c0076124ea0ccb8a5f51adcd8e96c9ef3e4 |
16-May-2014 |
Yuncheol Heo <ycheo@google.com> |
Merge "Add plumbing for get/setVideoOverlayForEmbeddedEncryptedVideoEnabled()." into master-chromium
|
| d4b5cb0f034e5d0bd1edc2676ae910084f9e04d9 |
14-May-2014 |
Torne (Richard Coles) <torne@google.com> |
am 8c51e1a5: (-s ours) resolved conflicts for merge of cdfc7ac9 to klp-modular-dev-plus-aosp
* commit '8c51e1a5f3e9111fe005dc799091fa8fc2dd38f9':
Update resources to match http://crrev.com/231953003
|
| 8c51e1a5f3e9111fe005dc799091fa8fc2dd38f9 |
14-May-2014 |
Torne (Richard Coles) <torne@google.com> |
resolved conflicts for merge of cdfc7ac9 to klp-modular-dev-plus-aosp
Change-Id: I3c34b66df2ab79b92a45195e4f8d73dd2fc49776
|
| cdfc7ac990e9614b7a8cf80acbf80a31f0414ca9 |
14-May-2014 |
Richard Coles <torne@google.com> |
am c8befc46: Merge "Merge up to d36825 from chomium-dev"
* commit 'c8befc462bb58410909f182cec2755c4807e052d':
Update resources to match http://crrev.com/231953003
|
| c8befc462bb58410909f182cec2755c4807e052d |
14-May-2014 |
Richard Coles <torne@google.com> |
Merge "Merge up to d36825 from chomium-dev"
|
| f5b18e08a3111679f0637dd72a371def926dd055 |
14-May-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r269336
This commit was generated by merge_to_master.py.
Change-Id: If3e31893f6a9a7c314414a0330bc7b279dd85b91
|
| 750453815989696ae449df0e58556cd16ebe63c0 |
08-May-2014 |
Tao Bai <michaelbai@google.com> |
Plumb permission implementation.
BUG: 13699047
Change-Id: I84b699b75a14e9f323b364cf3d4aaa13aeab6c86
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 1adaeb50cc8345dbe10cf5a80463990442714afc |
12-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I3a548c41362283b18afe5a148cba237cb94b9a1d
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
|
| 33523f524ced75321c76accad57181edef9b4ff7 |
12-May-2014 |
Ben Murdoch <benm@google.com> |
Merge up to d36825 from chomium-dev
Merged to:
Update resources to match http://crrev.com/231953003
|
| 33b9fe62cb3e853223e66ada9ef176a2ca2eb839 |
09-May-2014 |
Ben Murdoch <benm@android.com> |
Merge "Update WebViewChromium to match http://crrev.com/274153002" into chromium-dev
|
| 9fd2c44707541e3b36e6781975f4cb8911376a8e |
09-May-2014 |
Marcin Kosiba <mkosiba@google.com> |
Update WebViewChromium to match http://crrev.com/274153002
Pass in the Context to the AwContents constructor.
Change-Id: I0fba588e6b998dc084836cf83c362f621caefa78
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| fcdab5cafeb022bca9f0815e171963908d030cbe |
09-May-2014 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Sanitize selector Intent when handling intent: scheme." into master-chromium
|
| 792352e52b0df504e9f16c1e3ccdc211922cf79e |
08-May-2014 |
Selim Gurun <sgurun@google.com> |
Listen to data reduction proxy setting changes
Bug: 12492817
Add a broadcastreceiver to listen to proxy settings changes. This is
part 1 of plumbing logic. We only pass an invalid test key to the
proxy. Getting the correct key will be part 2.
Change-Id: I1d5f19802b97c05ef295fe3acc58327b266757d1
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| c078d500f22171d14686cd109cb1c580ddeae83c |
07-May-2014 |
Selim Gurun <sgurun@google.com> |
am 2727e5ac: (-s ours) am 16907db3: am 238d071a: Merge "Merge up to 24c4a3d7 from chromium-dev."
* commit '2727e5acce918b8ced9392cc995bd292d7322ab0':
Add waitForCompletion to requestDrawGL
|
| 59bc1f8dd467e3d3dd530a8073e488b14d28b479 |
07-May-2014 |
Bo Liu <boliu@google.com> |
am d6ac0727: am 048721fc: (-s ours) Merge commit \'c09906e\' into stage-aosp-master
* commit 'd6ac0727d4067dba7495947242f55a1667fa6818':
|
| f13051311602fd703fa8d4bb629d5b4f13309be0 |
07-May-2014 |
Conley Owens <cco3@android.com> |
am f50fc6ed: am 6ceaf02e: (-s ours) Merge "Merge up to 2e8d713 from chromium-dev."
* commit 'f50fc6ed48baf6e46a853d4ad0e428bccf571dfb':
Fix JNI for jint to jlong conversion
Convert jint to jlong for native pointers in GLFunctionTable to support 64 b
Fix jni strings after converting to long
Convert points to long
Pass layer type to AwContents when WebView calls setLayerType
Make executeHardwareAction avaiable to AwContents
Update resources added in Chromium r253153
Fix the JarJar path selection mechanism.
Reflect library loader move to base.
Update resources to match changes in upstream Chromium.
Reflect print API changes
Make the AOSP + Chromium workflow simpler.
Switch ResourceProvider to use new setters from AwResources
Make the onScrollChange implementation a no-op.
Remove dependency on UniquePtr.
Don't strip ColorPicker resources referenced from XML.
Reflect move of CommandLine from content/ to base/
Stop using the test constructor.
Remove a not dangerous warning from skia header files
Tidy up WebViewChromiumFactoryProvider.
|
| 9e5cb60d2ab4ab71db69cb9a039d1507995ef3c5 |
07-May-2014 |
Torne (Richard Coles) <torne@google.com> |
am b2f38771: am b23880da: (-s ours) Merge "Restore accidentally removed translations."
* commit 'b2f387710fd040774a59c13abb69a9452734703e':
Restore accidentally removed translations.
|
| b78bdf0507c238c91f4b644e48062f13cadaec45 |
07-May-2014 |
Richard Coles <torne@google.com> |
am 3857d251: (-s ours) am 1df823e3: Merge "Revert "Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit.""
* commit '3857d251df354fd225453cc95488e7b2e24eea38':
Revert "Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit."
|
| 114e2e265c0b4dfd8cda45f90f06b9839284f06e |
07-May-2014 |
Richard Coles <torne@google.com> |
am 3b8e82a7: (-s ours) am 74954d76: Merge "Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit."
* commit '3b8e82a74d88d9b89107ab48b32d4fec3dad6f83':
Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit.
|
| 87e8f462d596d7e597338fb91fc2823664da256e |
07-May-2014 |
Elliott Hughes <enh@google.com> |
am cb4fe702: am fc00858f: (-s ours) Merge "Move to the canonical UniquePtr.h."
* commit 'cb4fe7021d876ad955eeff5b3f8b6614c6bf8943':
|
| 2727e5acce918b8ced9392cc995bd292d7322ab0 |
07-May-2014 |
Selim Gurun <sgurun@google.com> |
am 16907db3: am 238d071a: Merge "Merge up to 24c4a3d7 from chromium-dev."
* commit '16907db392eceb12893f4c221d60512efbd6ba05':
Add waitForCompletion to requestDrawGL
|
| d6ac0727d4067dba7495947242f55a1667fa6818 |
07-May-2014 |
Bo Liu <boliu@google.com> |
am 048721fc: (-s ours) Merge commit \'c09906e\' into stage-aosp-master
* commit '048721fc4ad2a981aa1936166726ad618f81d623':
|
| f50fc6ed48baf6e46a853d4ad0e428bccf571dfb |
07-May-2014 |
Conley Owens <cco3@android.com> |
am 6ceaf02e: (-s ours) Merge "Merge up to 2e8d713 from chromium-dev."
* commit '6ceaf02e3b127e76616b204a0f3a703a7eb858db':
Fix JNI for jint to jlong conversion
Convert jint to jlong for native pointers in GLFunctionTable to support 64 b
Fix jni strings after converting to long
Convert points to long
Pass layer type to AwContents when WebView calls setLayerType
Make executeHardwareAction avaiable to AwContents
Update resources added in Chromium r253153
Fix the JarJar path selection mechanism.
Reflect library loader move to base.
Update resources to match changes in upstream Chromium.
Reflect print API changes
Make the AOSP + Chromium workflow simpler.
Switch ResourceProvider to use new setters from AwResources
Make the onScrollChange implementation a no-op.
Remove dependency on UniquePtr.
Don't strip ColorPicker resources referenced from XML.
Reflect move of CommandLine from content/ to base/
Stop using the test constructor.
Remove a not dangerous warning from skia header files
Tidy up WebViewChromiumFactoryProvider.
|
| b2f387710fd040774a59c13abb69a9452734703e |
07-May-2014 |
Torne (Richard Coles) <torne@google.com> |
am b23880da: (-s ours) Merge "Restore accidentally removed translations."
* commit 'b23880dafe8d10882c6934f570a25e4106dba1d8':
Restore accidentally removed translations.
|
| 3857d251df354fd225453cc95488e7b2e24eea38 |
07-May-2014 |
Richard Coles <torne@google.com> |
am 1df823e3: Merge "Revert "Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit.""
* commit '1df823e3e3bf8cfce7d0912fd41e755809f2f5ca':
Revert "Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit."
|
| 3b8e82a74d88d9b89107ab48b32d4fec3dad6f83 |
07-May-2014 |
Richard Coles <torne@google.com> |
am 74954d76: Merge "Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit."
* commit '74954d763cbf88a644893853e8331b35ff1e2d9d':
Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit.
|
| cb4fe7021d876ad955eeff5b3f8b6614c6bf8943 |
07-May-2014 |
Elliott Hughes <enh@google.com> |
am fc00858f: (-s ours) Merge "Move to the canonical UniquePtr.h."
* commit 'fc00858f4cdc87b0e77be01ffd2cc9c8a70076b5':
Move to the canonical UniquePtr.h.
|
| 40dc0636706dd146d31f6d09882b5846ae7947eb |
07-May-2014 |
Marcin Kosiba <mkosiba@google.com> |
Sanitize selector Intent when handling intent: scheme.
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
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 301ae463d35a0bb490a7a9bd4721946a3d2df191 |
07-May-2014 |
Baligh Uddin <baligh@google.com> |
am df8dac61: (-s ours) am dd32cd7f: (-s ours) Import translations. DO NOT MERGE
* commit 'df8dac61727c02f04959826f95a91fe4ee02e115':
Import translations. DO NOT MERGE
|
| 94d6332989bd6758c78a66ed7e725019fdc75561 |
07-May-2014 |
Leon Scroggins <scroggo@google.com> |
Merge "Switch to new call to determine shape of clip."
|
| 50e2d5a658912d1fb12d070b8268948ce942d745 |
07-May-2014 |
Yuncheol Heo <ycheo@google.com> |
Add plumbing for get/setVideoOverlayForEmbeddedEncryptedVideoEnabled().
Bug: 14598993
Change-Id: Id0dcb129e816ad293e89dc2f2379b01153fc1f8e
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| df8dac61727c02f04959826f95a91fe4ee02e115 |
07-May-2014 |
Baligh Uddin <baligh@google.com> |
am dd32cd7f: (-s ours) Import translations. DO NOT MERGE
* commit 'dd32cd7f9d7b748e1fbadeded338bd9f76d8ee90':
Import translations. DO NOT MERGE
|
| 8d0550acfb50d92c47c1d32d8d3288bbf0a2a1df |
07-May-2014 |
Ben Murdoch <benm@google.com> |
am 1a3a953b: Add missing Chromium LICENSE file.
* commit '1a3a953bed67c073abc981bd4471600e5c696488':
Add missing Chromium LICENSE file.
|
| bde3355e71149897d3cd966fb893040f4ae4c6d8 |
07-May-2014 |
Torne (Richard Coles) <torne@google.com> |
am c09906e7: Revert "Support a prebuilt WebView."
* commit 'c09906e775b8e8ab1e3cd1c25080a4baa5724f80':
Revert "Support a prebuilt WebView."
|
| 5c61d94d2277c8b1f5389c0c57b273ce7d707733 |
07-May-2014 |
Bo Liu <boliu@google.com> |
am b3d255b8: (-s ours) Fix check when setLayerType is called in constructor
* commit 'b3d255b84ff3ae8c3924e349560cfdabdb312145':
Fix check when setLayerType is called in constructor
|
| f912ef3b4116479ae9c59f9131f7e2fe5fc0bd32 |
07-May-2014 |
Bo Liu <boliu@google.com> |
am 8b40943e: (-s ours) Plumb setLayerType to AwContents
* commit '8b40943e64e797e59b6dc037daab9b5c87d61242':
Plumb setLayerType to AwContents
|
| e841604a0e87664b009fe713167db941a41604b4 |
31-Mar-2014 |
Leon Scroggins <scroggo@google.com> |
Switch to new call to determine shape of clip.
SkCanvas::getTotalClip() has been removed. We only need to know
whether the clip is a rect, so call the new SkCanvas::isClipRect().
Depends on changes to frameworks/base and external/skia.
Change-Id: Ifd78028adeca2474d3f476f6f5e571c9a1c849bf
hromium/plat_support/graphics_utils.cpp
|
| 6ba4245a44a60df9b2c410bb9bd4ad4ed4bce3b5 |
05-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I603c1aeb5818f4f2bce80efdd2277653a1f6ff85
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
|
| 41a6fab23e47dfd5b050b8e6fd4ec5485c607b81 |
05-May-2014 |
Bo Liu <boliu@google.com> |
Remove unused executeHardwareAction
Also remove old overrides.
BUG: 13961296
Change-Id: I8a0045b0537fa23f29368d067424ad9f94981785
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| f3ed2a5ff03fa4e9451cb05e4e9c51d15207974f |
30-Apr-2014 |
Marcin Kosiba <mkosiba@google.com> |
Update resources to match http://crrev.com/231953003
This updates the resources to match the following Chromium change:
> Show Ash like <select> popup on Android tablets
>
> We should show Ash like <select> popups on Android tablets so the UI is closer
> to Chrome OS.
>
> The new popup will only apply to <select size=1> as <select multiple> will be
> shown as a listbox like the Desktop versions.
>
> BUG=314713
Change-Id: I325b4c1fabd2390c99c55c1a7e40b94e4de15234
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_autofill_text.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_dropdown_text.xml
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/colors.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
hromium/overlay/frameworks/base/core/res/res/values/values.xml
|
| 15ecd3c837f088579316ee419bcc5528ce215228 |
03-May-2014 |
Selim Gurun <sgurun@google.com> |
Implement plumbing for clearCLientCertPreferences callback.
Bug:12983007
Change-Id: Ibae1d0502779888ec2d2688d3049688ed0e0362b
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 99806d91dae24d5c5b793ad1c40a48e75acf53f3 |
02-May-2014 |
Selim Gurun <sgurun@google.com> |
Implement plumbing for clearCLientCertPreferences callback.
Change-Id: Ibae1d0502779888ec2d2688d3049688ed0e0362b
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 255308c49f410f47d027fce2393ae4c287ef94f2 |
11-Apr-2014 |
Ben Murdoch <benm@google.com> |
Default older apps to use MIXED_CONTENT_ALWAYS_ALLOW.
For compatibility with apps targeting an older SDK version, we
default the WebView's mixed content behavior to always allow it.
(For new apps, the default mode is to never allow).
Bug:13948531
Change-Id: I01ac05e375e449eb17d8b6512aed72611225e162
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| d36825d5b76e90f1ef4f54676cdf34b3bacd043b |
02-May-2014 |
Ben Murdoch <benm@android.com> |
Merge "Update resources to match http://crrev.com/231953003" into chromium-dev
|
| 16907db392eceb12893f4c221d60512efbd6ba05 |
02-May-2014 |
Selim Gurun <sgurun@google.com> |
am 238d071a: Merge "Merge up to 24c4a3d7 from chromium-dev."
* commit '238d071ac5396300cd4689c0fdd2e7cf357c83f8':
Add waitForCompletion to requestDrawGL
|
| 238d071ac5396300cd4689c0fdd2e7cf357c83f8 |
02-May-2014 |
Selim Gurun <sgurun@google.com> |
Merge "Merge up to 24c4a3d7 from chromium-dev."
|
| 482ea675538284d23f62094e9d2c587f31e38e96 |
02-May-2014 |
Bo Liu <boliu@google.com> |
Merge up to 24c4a3d7 from chromium-dev.
Merge up to this commit:
Merge "Add waitForCompletion to requestDrawGL" into chromium-dev
Change-Id: Ib7e4184e99b3156cc938c3c10c252e38fe4eea14
|
| 65548e241e7a42cd0190c1bf57b2c81c1bf4ad4c |
01-May-2014 |
Bo Liu <boliu@google.com> |
Merge master-chromium into master at r267519
This commit was generated by merge_to_master.py.
Change-Id: I42914159cac32423b1d8374366beef20b375e04a
|
| 2e71bd4437c52382da0fba5db94669d7b82c20ac |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I7fb6cc4a30c600930176a4c6dd95121a25ac2e9b
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
|
| 3272e74424a1bdc8fbaa6f9825be7b4a01398c14 |
30-Apr-2014 |
Ben Murdoch <benm@google.com> |
Add third_party/openmax_dl to merge list.
Change-Id: I27a9def2b9c5cadcbc3b6ed63dfd3ffdc9021d4d
hromium/tools/merge_common.py
|
| f984cb02cc8168f9b59719d90581985e4ef4a72d |
30-Apr-2014 |
Marcin Kosiba <mkosiba@google.com> |
Update resources to match http://crrev.com/231953003
This updates the resources to match the following Chromium change:
> Show Ash like <select> popup on Android tablets
>
> We should show Ash like <select> popups on Android tablets so the UI is closer
> to Chrome OS.
>
> The new popup will only apply to <select size=1> as <select multiple> will be
> shown as a listbox like the Desktop versions.
>
> BUG=314713
Change-Id: I325b4c1fabd2390c99c55c1a7e40b94e4de15234
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_dropdown_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_autofill_text.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_dropdown_text.xml
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/colors.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
hromium/overlay/frameworks/base/core/res/res/values/values.xml
|
| 24c4a3d70e8a2f1001e100ac78c0c1673c5710c3 |
30-Apr-2014 |
Bart Sears <bsears@google.com> |
Merge "Add waitForCompletion to requestDrawGL" into chromium-dev
|
| 5c5385f3e5f86c5183408e52f76f1bb7798cda9a |
28-Apr-2014 |
Bo Liu <boliu@google.com> |
Use invokeFunctor instead of attachFunctor
BUG: 13961296
Change-Id: I3fb6fde088ade1c239995131be326400366152a3
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/plat_support/draw_gl_functor.cpp
|
| 87c03790564987e5815182a0a9533fb3e01d308d |
28-Apr-2014 |
Bo Liu <boliu@google.com> |
Add waitForCompletion to requestDrawGL
Change-Id: Ie7fb8c05d1f36ac35c37856e434a81d502b93953
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| a4ff082306972f691e0b53ae30f1fa3203bd5189 |
26-Apr-2014 |
Selim Gurun <sgurun@google.com> |
Add final back
Fix the build.
Change-Id: Ie0d4dcb1bd718f4f10bd2b3842968951d5e01eb7
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 413084d3ad5ebedb497b42aa931bcce7caa36268 |
25-Apr-2014 |
Selim Gurun <sgurun@google.com> |
Remove redundant post.
The cl https://codereview.chromium.org/246513007/ posts the callbacks
on correct thread. Remove now redundant ones.
Change-Id: I67edfd08b0eeca249fac9c44558c1ce67638165b
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 048721fc4ad2a981aa1936166726ad618f81d623 |
25-Apr-2014 |
Bo Liu <boliu@google.com> |
Merge commit 'c09906e' into stage-aosp-master
Conflicts:
chromium/java/com/android/webview/chromium/ResourceProvider.java
chromium/java/com/android/webview/chromium/WebViewChromium.java
chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png
chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png
chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png
chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_multi_field_time_picker_dialog.xml
chromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
chromium/overlay/frameworks/base/core/res/res/values/dimens.xml
chromium/plat_support/graphics_utils.cpp
Change-Id: If6520c9bdcf5eacae0de52aa2181624a61b96798
|
| 16230c6b35273ed29cb3aa418140ce5dbfa25e9c |
25-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge "Add plumbing for super_onHoverEvent." into master-chromium
|
| 75d3676110655747e08f4e7d43f01a227c763e13 |
25-Apr-2014 |
Selim Gurun <sgurun@google.com> |
Fix master-gpl
Remove @override to have master-gpl compiling.
Change-Id: Id26db50169978255b0fd5bf92f9c049cbfc31547
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 06b29e22754df5cc9c951dc94f60541b4e1a6221 |
14-Apr-2014 |
Selim Gurun <sgurun@google.com> |
Add the plumbing for webview client certs functionality
Bug:12983007
Change-Id: I97ff1716d9b618f7484c7336c2167da358b8c16d
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| efcc6bc183b13d5dbe3535f23b59e875f89af75f |
14-Apr-2014 |
Selim Gurun <sgurun@google.com> |
Add the plumbing for webview client certs functionality
Bug:12983007
Change-Id: I97ff1716d9b618f7484c7336c2167da358b8c16d
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| a151bda37de366f108b6f25a84a8ee8802f77442 |
24-Apr-2014 |
Hui Shu <hush@google.com> |
Merge "Move initTraceEvent from Chromium to Android tree" into master-chromium
|
| 6590bd55a007cac3c235987d4f7accf407f9c393 |
22-Apr-2014 |
Hui Shu <hush@google.com> |
Move initTraceEvent from Chromium to Android tree
Also, call initTraceEvent after the ThreadUtils.setUiThread
b/14230288
Change-Id: If3dd0530faf3a0b41093761aba4adfba2019a991
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 832833dd517f8ae4eedca8e4441438e3380ff905 |
24-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge "Add plumbing for get/setMixedContentMode" into master-chromium
|
| b0f5cd24f0760c43a31a7b75f3512c543b2d0589 |
23-Apr-2014 |
Ben Murdoch <benm@google.com> |
Add plumbing for super_onHoverEvent.
Required for some upstream changes - please see
https://codereview.chromium.org/250583002/
Bug:crbug.com/359209
Change-Id: I1ff233b3c0b2c19304e39449b08e7f10e4062e9e
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| c0d2ad12f6209353d033f9920436f37ba24b457c |
24-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r265802
This commit was generated by merge_to_master.py.
Change-Id: I5aa01b456d515a502c8fc31040d84fa98a5a749b
|
| 6ceaf02e3b127e76616b204a0f3a703a7eb858db |
23-Apr-2014 |
Conley Owens <cco3@android.com> |
Merge "Merge up to 2e8d713 from chromium-dev."
|
| dd32cd7f9d7b748e1fbadeded338bd9f76d8ee90 |
23-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Iee74e0ed42a5578045e0a98e325eee636ec3b247
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| 0baea318ac859a40d1fba737b4e964a41b054861 |
22-Apr-2014 |
wsmlby <wsmlby@google.com> |
Use waitForExists to avoid UiObjectNotFoundException
Change-Id: I8a504a42a9ef87c6d858c542e0ca66316c3e1d6b
hromium/tests/java/src/com/android/uiautomator/platform/WebViewFlingTest.java
|
| 16fd0a4cd7a9d5faca76c32d1bd994934c36caa8 |
19-Apr-2014 |
Selim Gurun <sgurun@google.com> |
Revert "Revert "Fix master-gpl build""
This reverts commit dfe651910253c4d50509fe499b1389557d307ea7.
Change-Id: I69428884a56d180f7ded431e6f62222cc4b90b5f
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| dfe651910253c4d50509fe499b1389557d307ea7 |
19-Apr-2014 |
Selim Gurun <sgurun@google.com> |
Revert "Fix master-gpl build"
This reverts commit 4d472df62e7beb2690f279cf1c34aa5d9df38eed.
Change-Id: I78644ffed8d04f51bb7542f92b54d7af8dc33924
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 4d472df62e7beb2690f279cf1c34aa5d9df38eed |
19-Apr-2014 |
Selim Gurun <sgurun@google.com> |
Fix master-gpl build
Bug: 13250097
Change-Id: I5dfa44048e7c6e1c7b9aa8fb0ace43909bfe02b7
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| dac1cf470e8a0e0289ae112dea195724846fe7be |
14-Mar-2014 |
Selim Gurun <sgurun@google.com> |
Plumb documentname to AwPrintDocumentAdapter
Bug: 13250097
Change-Id: Ie1cd2d1860dc6ae39d864e4399178488dfbe8db2
(cherry picked from commit 77d4cb45a67dd70f618b3a7e21f54421b5425f19)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 77d4cb45a67dd70f618b3a7e21f54421b5425f19 |
14-Mar-2014 |
Selim Gurun <sgurun@google.com> |
Plumb documentname to AwPrintDocumentAdapter
Bug: 13250097
Change-Id: Ie1cd2d1860dc6ae39d864e4399178488dfbe8db2
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| a20ed154f99b770bb8d56de031754207a3461c4c |
01-Apr-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge up to 2e8d713 from chromium-dev.
Update the WebView glue code to match the current version of
external/chromium_org.
|
| 41fb86acfcf25d5af7baf460aee13a2bd70335a0 |
16-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r263965
This commit was generated by merge_to_master.py.
Change-Id: I34573f19a2eb00789561d928078f3ca1c1723637
|
| f314b7b570c1e1e6c3ee49811fb5d42cd42c0597 |
15-Apr-2014 |
Tao Bai <michaelbai@google.com> |
Merge "Add stub method for general permission API" into master-chromium
|
| b08f21b559dde37e74e5d2bc15185cf5448ac95f |
03-Apr-2014 |
Tao Bai <michaelbai@google.com> |
Add stub method for general permission API
BUG: 13699047
Change-Id: Ifd95151835da7eecea137cce8f8b1e3ba2d7ddc0
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 5f878dabf8b5e36989a8d62ea66734f14e8c9132 |
10-Apr-2014 |
Ben Murdoch <benm@google.com> |
Add plumbing for get/setMixedContentMode
Second of a three sided patch. Plumbs the API into
Chromium.
Bug:13948531
Change-Id: I5963498e2536e925aaaa82b3829e0b8f32b79887
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 5b3b1b1eb080ed5169c050b2c4e80cbba82ac6fe |
10-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r262940
This commit was generated by merge_to_master.py.
Change-Id: I6025166d14c7cf660ad1da9fdf7536f798ed7eb2
|
| eb2c435c4034e15805f81caf4c70389fa11afd26 |
07-Apr-2014 |
Torne (Richard Coles) <torne@google.com> |
Revert "Merge scripts: duplicate arm makefile for arm64."
We no longer need to duplicate the arm makefiles for arm64, as we
include the arm makefile from the top-level Android.mk as well to
support multilib builds.
This reverts commit 4a4e55409b32f638e45fd8ab1ba8de512400c4f9.
hromium/tools/merge_from_chromium.py
|
| 1a3a953bed67c073abc981bd4471600e5c696488 |
03-Apr-2014 |
Ben Murdoch <benm@google.com> |
Add missing Chromium LICENSE file.
The frameworks/webview project contains code from the Chromium
project which needs a copy of the Chromium license.
Bug: 13789162
Change-Id: I15e6984321f1ca2cc03d76ce36a4bbf49349e67c
hromium/LICENSE
|
| 5edbdc751c8a79f4efac310a59dd3aadfc9ec650 |
03-Apr-2014 |
Ben Murdoch <benm@google.com> |
Add missing Chromium LICENSE file.
The frameworks/webview project contains code from the Chromium
project which needs a copy of the Chromium license.
Bug: 13789162
Change-Id: I15e6984321f1ca2cc03d76ce36a4bbf49349e67c
hromium/LICENSE
|
| b23880dafe8d10882c6934f570a25e4106dba1d8 |
02-Apr-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge "Restore accidentally removed translations."
|
| 67cb6c5fc41ec684ce9d20e90e8e77dd9bd7f36a |
01-Apr-2014 |
Ben Murdoch <benm@google.com> |
Add JTH prebuilt and link against it for WebViewJankTests.
Bug: 13743200
Change-Id: I8008be1e4778f9897d04417154c2d74b52f987be
hromium/tests/java/Android.mk
hromium/tests/prebuilts/android-janktesthelper.jar
|
| e9ddca8060ccb4fd2e26e6ba78dd63102861d9c5 |
01-Apr-2014 |
Torne (Richard Coles) <torne@google.com> |
Restore accidentally removed translations.
An automerger mistake accidentally deleted the translations here; put
them back.
Change-Id: I3299a8a9c777f2c115182a1eec1696d440df71b4
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az-rAZ/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne-rNP/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si-rLK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| 8aae26a5b86bacabf12e83a46a8f8114feae5286 |
31-Mar-2014 |
Leon Scroggins <scroggo@google.com> |
Switch to new call to determine shape of clip.
SkCanvas::getTotalClip() has been removed. We only need to know
whether the clip is a rect, so call the new SkCanvas::isClipRect().
Depends on changes to frameworks/base and external/skia.
Change-Id: Ifd78028adeca2474d3f476f6f5e571c9a1c849bf
hromium/plat_support/graphics_utils.cpp
|
| 0603a37edd728ebf34c3a6d658e586fa8712c1f6 |
31-Mar-2014 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r260458
This commit was generated by merge_to_master.py.
Change-Id: Ib6904576e3ed5e95e21afa77da4c53222279e3a1
|
| 58702ab5d6fe80a179dff41ec1741cf3cd7bf3df |
25-Mar-2014 |
Ross McIlroy <rmcilroy@google.com> |
Fix JNI for jint to jlong conversion
Change-Id: Icc67260af28123edc1a92c2b95db0c9d9f7e88ab
hromium/plat_support/graphics_utils.cpp
|
| 2ddcc98cb29e567ea545b3eba2fedc576d1f5365 |
24-Mar-2014 |
Ross McIlroy <rmcilroy@google.com> |
Convert jint to jlong for native pointers in GLFunctionTable to support 64 b
Corresponding Chromium change is: https://codereview.chromium.org/210023002
Change-Id: Ibe1b1bcbecb3257edbbd5bfee1b5b7da4505f5de
Signed-off-by: Ross McIlroy <rmcilroy@google.com>
hromium/java/com/android/webview/chromium/GraphicsUtils.java
hromium/plat_support/graphic_buffer_impl.cpp
hromium/plat_support/graphic_buffer_impl.h
hromium/plat_support/graphics_utils.cpp
|
| 2e8d713894b88bf8df125735d28963690b78f154 |
25-Mar-2014 |
Ben Murdoch <benm@android.com> |
Merge "Fix JNI for jint to jlong conversion" into chromium-dev
|
| b94c28174b2d3a1fa7350eb7570e4b920f98584c |
25-Mar-2014 |
Ross McIlroy <rmcilroy@google.com> |
Fix JNI for jint to jlong conversion
Change-Id: Icc67260af28123edc1a92c2b95db0c9d9f7e88ab
hromium/plat_support/graphics_utils.cpp
|
| 91c257e83bf32e3394686cafd27a83c6ccd6b912 |
24-Mar-2014 |
Richard Coles <torne@google.com> |
Merge " Convert jint to jlong for native pointers in GLFunctionTable to support 64 b" into chromium-dev
|
| 3e4df66826fafadf80b919b9c103dcee8c225d61 |
24-Mar-2014 |
Ross McIlroy <rmcilroy@google.com> |
Convert jint to jlong for native pointers in GLFunctionTable to support 64 b
Corresponding Chromium change is: https://codereview.chromium.org/210023002
Change-Id: Ibe1b1bcbecb3257edbbd5bfee1b5b7da4505f5de
Signed-off-by: Ross McIlroy <rmcilroy@google.com>
hromium/java/com/android/webview/chromium/GraphicsUtils.java
hromium/plat_support/graphic_buffer_impl.cpp
hromium/plat_support/graphic_buffer_impl.h
hromium/plat_support/graphics_utils.cpp
|
| 1df823e3e3bf8cfce7d0912fd41e755809f2f5ca |
24-Mar-2014 |
Richard Coles <torne@google.com> |
Merge "Revert "Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit.""
|
| 62a900bf8326e355e0202cb27437190bb68f2e32 |
24-Mar-2014 |
Richard Coles <torne@google.com> |
Revert "Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit."
Landed on wrong branch.
This reverts commit 5ffecf060de7ee5e94a73dff21ebb2705d947fd9.
Change-Id: I88d9986785829f1b356fef95612a87c1049e3bc6
hromium/java/com/android/webview/chromium/GraphicsUtils.java
hromium/plat_support/graphic_buffer_impl.cpp
hromium/plat_support/graphic_buffer_impl.h
hromium/plat_support/graphics_utils.cpp
|
| 74954d763cbf88a644893853e8331b35ff1e2d9d |
24-Mar-2014 |
Richard Coles <torne@google.com> |
Merge "Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit."
|
| 5ffecf060de7ee5e94a73dff21ebb2705d947fd9 |
24-Mar-2014 |
Ross McIlroy <rmcilroy@google.com> |
Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit.
Corresponding Chromium change is: https://codereview.chromium.org/210023002
Change-Id: Ifbc580a940425b042029542585f12e3e6a012a9a
Signed-off-by: Ross McIlroy <rmcilroy@google.com>
hromium/java/com/android/webview/chromium/GraphicsUtils.java
hromium/plat_support/graphic_buffer_impl.cpp
hromium/plat_support/graphic_buffer_impl.h
hromium/plat_support/graphics_utils.cpp
|
| 1d50dc5c53956be042f4cbf4a39a1f61f4897d92 |
21-Mar-2014 |
Ben Murdoch <benm@android.com> |
Merge "Fix jni strings after converting to long" into chromium-dev
|
| e356aebb15fe97a9d52bd12b88f7e8a1ae909e7e |
21-Mar-2014 |
Bo Liu <boliu@google.com> |
Fix jni strings after converting to long
Change-Id: Ib9df4ab5e1749b216aa5b573816ebb3cdd9c8f90
hromium/plat_support/draw_gl_functor.cpp
|
| 3579d6fb5d979d2d03a6250e82c37d81d672291e |
21-Mar-2014 |
Bo Liu <boliu@google.com> |
Convert pointers to long to support x64
This matches https://codereview.chromium.org/205533006/
Change-Id: I27382a8ffc09d7b24866d903cc1099d9a7483c5f
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
hromium/plat_support/draw_gl_functor.cpp
|
| bc73d5b4dd8ddd41c32d649b8416b8aab84394af |
21-Mar-2014 |
Ben Murdoch <benm@android.com> |
Merge "Convert points to long" into chromium-dev
|
| e0cdba1ed3f8130e914a9285fea04353a4a8a53f |
21-Mar-2014 |
Bo Liu <boliu@google.com> |
Convert points to long
This matches https://codereview.chromium.org/205533006/
Change-Id: I6cb9cf8cef6938b2cd6f3b0f2c55f37b32cb023f
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
hromium/plat_support/draw_gl_functor.cpp
|
| 92d71db0bad04f8164a3bbc59e12380fd7c9078c |
21-Mar-2014 |
Richard Coles <torne@google.com> |
Merge "Pass layer type to AwContents when WebView calls setLayerType" into chromium-dev
|
| c09906e775b8e8ab1e3cd1c25080a4baa5724f80 |
30-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Revert "Support a prebuilt WebView."
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
hromium/Android.mk
|
| 5df04f587e544f0586347a9e178ad6e95a1b6b96 |
30-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Revert "Support a prebuilt WebView."
To work around framework resource IDs not being constant, go back to
building webviewchromium.jar from source.
This reverts commit 9c9341f1d2368b4209fe982f3f1c5de384f67fb7.
Bug: 11426593
(cherry picked from commit cf686f7adb1cbc4efe3e93ae69b040d328b0e23f)
Change-Id: I91f8c8101e1a74eea69221df72980092b6be4375
hromium/Android.mk
|
| 09f95bfd0731d77fe147ee5ff60149af2ae91e51 |
18-Mar-2014 |
Jin Yang <jin.a.yang@intel.com> |
Pass layer type to AwContents when WebView calls setLayerType
Application may call setLayerType for WebView to request SW
Layer. We need to pass the layer type to AwContents, this is
the aosp part fix for Chromium issue:
https://codereview.chromium.org/199573002/
Change-Id: Ibde096d26bd3b8ce11b9ed5401619d38e73838bc
Signed-off-by: Jin Yang <jin.a.yang@intel.com>
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 3f1d44b2f8a5b993c5d5682e1eeb06c837ea54e8 |
19-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ibcefc0f2e1c153683208a63896f544770bb63c76
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
|
| 5cd1c86917ef15b2f3d26f508793bc294fad8c97 |
18-Mar-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r257591
This commit was generated by merge_to_master.py.
Change-Id: Ic354a983bf6b8add24cca796556aa777c132b192
|
| 735a433faa4c304f09f2b27bee1854cbe7e5c740 |
18-Mar-2014 |
Bo Liu <boliu@google.com> |
Fix check when setLayerType is called in constructor
BUG: 13514997
Change-Id: I8414b7caf3a7fb6770242dd4d1640ff89c9be26a
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| b3d255b84ff3ae8c3924e349560cfdabdb312145 |
18-Mar-2014 |
Bo Liu <boliu@google.com> |
Fix check when setLayerType is called in constructor
BUG: 13514997
Change-Id: I8414b7caf3a7fb6770242dd4d1640ff89c9be26a
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 30fc9fe24bb40e9300ae622bebffb077413c43ab |
17-Mar-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I3bdfc9bee803cbda4abee6eed7ed52556e9e04d0
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
|
| ef6c1d6470ab42ce074fcbd0146f354336d6bf2a |
15-Mar-2014 |
John Reck <jreck@google.com> |
Remove unnecessary check
Eliminate dependency on DisplayList for a condition
that can never fail. callDrawGlFunction always
returns STATUS_DONE at record time
Change-Id: I838e38e97f1428306a62270467e853c5aeaf91af
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
|
| 44666b166c7c073ade5c2b13c2fd96a0b4bbb0b6 |
14-Mar-2014 |
Bo Liu <boliu@google.com> |
Merge "Plumb setLayerType to AwContents" into master-chromium
|
| 8b40943e64e797e59b6dc037daab9b5c87d61242 |
14-Mar-2014 |
Bo Liu <boliu@google.com> |
Plumb setLayerType to AwContents
BUG: 13328348
Change-Id: Ib8f21cb18b22937bb6108d6a48d996dd5ebb055a
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 125973639f92ac1ac6080808ddf5b06f131d3c95 |
14-Mar-2014 |
Bo Liu <boliu@google.com> |
Plumb setLayerType to AwContents
BUG: 13328348
Change-Id: Ib8f21cb18b22937bb6108d6a48d996dd5ebb055a
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| b57c44e9749cdd67ccfeb18c8774ca7f16e975d5 |
13-Mar-2014 |
wsmlby <wsmlby@google.com> |
set orientation to natural
Change-Id: Ia40b3fe7b88d3a14bdbf5555ffa195844b759be6
hromium/tests/java/src/com/android/uiautomator/platform/WebViewFlingTest.java
|
| 5b52e3894feab2ee757145e7f7a69202e4808f20 |
07-Mar-2014 |
wsmlby <wsmlby@google.com> |
Merge "run only flingForward" into master-chromium
|
| e3c6ee0b29d69cf8d67594b748d0114380771e85 |
06-Mar-2014 |
Elliott Hughes <enh@google.com> |
am b7e3b14b: (-s ours) am fc00858f: Merge "Move to the canonical UniquePtr.h."
* commit 'b7e3b14b04b38332bfe2b3b5873e8e71b84149f0':
Move to the canonical UniquePtr.h.
|
| b3c52d3bb715a12862eec852ef6897f45a3516b1 |
02-Mar-2014 |
wsmlby <wsmlby@google.com> |
run only flingForward
use local version of android-janktesthelper
Change-Id: I7312d7c8cff9649883621e6dda242f1c91ab18bc
hromium/tests/java/Android.mk
hromium/tests/java/src/com/android/uiautomator/platform/WebViewFlingTest.java
|
| 665cdb2c1cff50e9885b233ef2de35f2dfd6ae6d |
06-Mar-2014 |
Ying Wang <wangying@google.com> |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/webview
|
| f246f9015ed47f7a7d03764d0271918318c82e93 |
05-Mar-2014 |
Bart Sears <bsears@google.com> |
Merge "Make executeHardwareAction avaiable to AwContents" into chromium-dev
|
| 55aff944126d8f2dc4020ec88405a93919579db2 |
28-Feb-2014 |
Bo Liu <boliu@google.com> |
Make executeHardwareAction avaiable to AwContents
Removed wrapping all of onDetachedFromWindow with executeHardwareAction,
since upstream code will have finer control on what code to wrap
executeHardwareAction in.
Also take this opportunity to clean up native public interface.
This is the first of a 3-sided patch. The upstream change is at
https://codereview.chromium.org/185133003/
Change-Id: Ie791842a0becd8189dd8d52a027b75b8ee34211a
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/plat_support/draw_gl_functor.cpp
hromium/plat_support/graphics_utils.cpp
|
| 7a63db1dc253badb616ca318e59f55580ae0b054 |
28-Feb-2014 |
Bo Liu <boliu@google.com> |
Make executeHardwareAction avaiable to AwContents
Removed wrapping all of onDetachedFromWindow with executeHardwareAction,
since upstream code will have finer control on what code to wrap
executeHardwareAction in.
Also take this opportunity to clean up native public interface.
This is the first of a 3-sided patch. The upstream change is at
https://codereview.chromium.org/185133003/
Change-Id: Ie0731a9546aefa7b195c9fd43bfc5c0a72745fd1
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/plat_support/draw_gl_functor.cpp
hromium/plat_support/graphics_utils.cpp
|
| bd7f8ebeca2bb9dcba2dc453667b40d034619c7f |
03-Mar-2014 |
Marcin Kosiba <mkosiba@google.com> |
Update resources to match upstream.
This updates resources to match the upstream M33 release branch
at r254123.
BUG: 11964789
Change-Id: I0561b916b242d310d291d8c403bb04f415492889
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_title.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_multi_field_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_two_field_date_picker.xml
|
| 4b2c8cb6870d1c665db98d18af953c47883551cf |
27-Feb-2014 |
Mikhail Naganov <mnaganov@google.com> |
Disable inspection of injected JavaScript objects for compatibility
Inspection of JavaScript objects injected via addJavascriptInterface
will be allowed on OS versions newer than KitKat.
Bug: 12169386
Change-Id: I8d3bdcca6d8e9f4dfb123a62a805dc5a9bc8c1c7
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| efe9d9c0d598bc9cfecf53803997f2afdf93318e |
26-Feb-2014 |
Richard Coles <torne@google.com> |
Merge "Update resources added in Chromium r253153" into chromium-dev
|
| 52e2123635cae61c54999ba6f2c6cb0e47fbb57e |
26-Feb-2014 |
Bo Liu <boliu@google.com> |
Update resources added in Chromium r253153
Added in
https://src.chromium.org/viewvc/chrome?revision=253153&view=revision
Change-Id: Icb2b5461d5c9a711fb256691824f89927c96dd13
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
|
| 9c04f4257b47fed1c4bb475308c3e3b305722ba4 |
26-Feb-2014 |
Bo Liu <boliu@google.com> |
Update resources added in Chromium r253153
Added in
https://src.chromium.org/viewvc/chrome?revision=253153&view=revision
Change-Id: Icb2b5461d5c9a711fb256691824f89927c96dd13
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
|
| bc202a5b0921c61acd246c016833313ddc248ac8 |
24-Feb-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r251904
Change-Id: Ic00e4e2d81b921b4e0ebda7064346d95e520bf9b
|
| a4f272f5c58b4c0488d735849223d346921f3948 |
24-Feb-2014 |
Torne (Richard Coles) <torne@google.com> |
Add third_party/usrsctp to merged projects.
Add external/chromium_org/third_party/usrsctp/usrsctplib as it's needed
by WebRTC.
Change-Id: Ibc75300d1962e8290b18f0f00ab0150a7d7ef41a
hromium/tools/merge_common.py
|
| 86f32503b59474383879a768f26dc9917068ab8e |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I04d722ba942122591211d03696964fab0e781930
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
|
| c3ad68b45e650bde54c3b4d9e33d6e4d13c15571 |
13-Feb-2014 |
Andreas Huber <andih@google.com> |
Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
This reverts commit 82fd1199a69c681c79ca1aa6d7a49c47afc1d33e.
Change-Id: Idfb2df3132dad448aeadde18e2d1a72ada8a2d79
hromium/Android.mk
|
| 3112f038b13e11f26e6c0320fd2a80a616dd192e |
12-Feb-2014 |
Anthony Berent <aberent@google.com> |
Merge "Data for WebView Jank test" into master-chromium
|
| 87517ec1cbf5b385a227f59a9aa22632fdf22e57 |
12-Feb-2014 |
Richard Coles <torne@google.com> |
Merge "Fix the JarJar path selection mechanism." into chromium-dev
|
| 9d0effa09a7c50f4b586dbe4d0a8796c934b4066 |
12-Feb-2014 |
Marcin Kosiba <mkosiba@google.com> |
Fix the JarJar path selection mechanism.
Update the JarJar path selection mechanism to actually work instead
of referencing an undeclared variable.
Change-Id: I182b3ba6aaa3cc86d664b13c7ba0f13e2902bb6f
hromium/Android.mk
|
| b6f25b3338c23872ac32c902415cb5e9a1f5b622 |
12-Feb-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: add webrtc projects to merge.
Merge libsrtp, libvpx, libyuv, and webrtc, for chromium webrtc support.
Change-Id: Ib9187ae83cc2643cc399b1c4700d621b919a6494
hromium/tools/merge_common.py
|
| 0a8b2fd8f1e1de1093e8b0ddb2a54c3157f10d88 |
03-Feb-2014 |
Anthony Berent <aberent@google.com> |
Data for WebView Jank test
Although the WebView Jank test will work with any page with an
index.html these pages are the standard data set for this test.
Two data sets are used:
light is a simple page that should fling with no Jank
heavy is designed to make things difficult for WebView.
BUG=1266902
Change-Id: Ifdc4a308bc9682b503bcb04183e985e3325e9bf8
hromium/tests/data/heavy/index.html
hromium/tests/data/light/index.html
|
| a77e6d097abd2e9e720c1d1b81b8ac9b63e17bc1 |
12-Feb-2014 |
Richard Coles <torne@google.com> |
Merge "Reflect library loader move to base." into chromium-dev
|
| 54b3666a044d576394424822704d21dace02dc7c |
12-Feb-2014 |
Marcin Kosiba <mkosiba@google.com> |
Reflect library loader move to base.
The library loader moved to base/ in Chromium r250113, this change
updates the imports to reflect that.
Change-Id: I9cfce1ffba93cc4450e349051bd017a6844c0c43
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| ec064844db014ef78ed74b0d2b92d0fd44b6672f |
12-Feb-2014 |
Marcin Kosiba <mkosiba@google.com> |
Reflect library loader move to base.
The library loader moved to base/ in Chromium r250113, this change
updates the imports to reflect that.
Change-Id: I4ac401e602516f05027d5375aefd3378263b7500
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 3344e192f0e3d956986b63377674533e6e12ce5d |
12-Feb-2014 |
Ben Murdoch <benm@android.com> |
Merge "Update resources to match changes in upstream Chromium." into chromium-dev
|
| 2c932c1b175390a8c3186f27014ba0480e9dda40 |
12-Feb-2014 |
Ben Murdoch <benm@android.com> |
Merge "Reflect print API changes" into chromium-dev
|
| 2c9f1177681a3f7349aff3cc80c6524d9503c8d4 |
12-Feb-2014 |
Ben Murdoch <benm@android.com> |
Merge "Make the AOSP + Chromium workflow simpler." into chromium-dev
|
| d6518e53b3458699c6033b8c3ab2a287d06e1786 |
12-Feb-2014 |
Ben Murdoch <benm@android.com> |
Merge changes I70aed30a,Ib74f8d7a into chromium-dev
* changes:
Switch ResourceProvider to use new setters from AwResources
Don't strip ColorPicker resources referenced from XML.
|
| 17a7006c49aff4394684c2a8322597bd0e45dc83 |
12-Feb-2014 |
Ben Murdoch <benm@android.com> |
Merge "Make the onScrollChange implementation a no-op." into chromium-dev
|
| 11f064dd358c6655139b973c4c4d27a0455180b1 |
12-Feb-2014 |
Ben Murdoch <benm@android.com> |
Merge "Remove dependency on UniquePtr." into chromium-dev
|
| 382302884bb00a4abb61ed42d6bed85310e1dd94 |
12-Feb-2014 |
Ben Murdoch <benm@android.com> |
Merge "Reflect move of CommandLine from content/ to base/" into chromium-dev
|
| d9b6ceaf693123dda0a54dc04f636fd81ee5f404 |
12-Feb-2014 |
Ben Murdoch <benm@android.com> |
Merge "Stop using the test constructor." into chromium-dev
|
| 8016a9baa936546f0449946a1c42e1d4f0e2e60f |
12-Feb-2014 |
Ben Murdoch <benm@android.com> |
Merge "Remove a not dangerous warning from skia header files" into chromium-dev
|
| 1d5782a1b40d845dee88c897f24c9e7277f9564e |
12-Feb-2014 |
Ben Murdoch <benm@android.com> |
Merge "Tidy up WebViewChromiumFactoryProvider." into chromium-dev
|
| 1f5730a14f4410968d00e3cf0c064b96b378e58b |
07-Feb-2014 |
Marcin Kosiba <mkosiba@google.com> |
Update resources to match changes in upstream Chromium.
Change-Id: Ie8a1d011910f1a6b210ef1c2e5427a09f920040e
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_button_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_border.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_autofill_text.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_suggestion.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_multi_field_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az-rAZ/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne-rNP/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si-rLK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/colors.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| 979dae00a0669f9e1bb3ab631783289a0f9d5f72 |
07-Feb-2014 |
Marcin Kosiba <mkosiba@google.com> |
Reflect print API changes
The referenced class is no longer exported by android_webview/
Change-Id: Ib0c08c9e015b82a6a2eb30657c18b5d047ec3a60
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 86d41bf287603ad76fd6604f47b898bf86e874a8 |
07-Feb-2014 |
Marcin Kosiba <mkosiba@google.com> |
Make the AOSP + Chromium workflow simpler.
The default Chromium checkout process puts the source code in an
src/ subfolder. Supporting that kind of checkout makes it simpler
to place the Chromium checkout directly in the Android checkout.
Change-Id: I79c7dc0c0f644cd9b8b8a408f7182b855b693339
hromium/Android.mk
|
| 2e18ded46defccbe44b527c59a66886e9ad10149 |
07-Feb-2014 |
Mikhail Naganov <mnaganov@google.com> |
Switch ResourceProvider to use new setters from AwResources
Upstream https://codereview.chromium.org/155653003/ introduces setter methods
for error pages and default text encoding with an intention to hide static
fields that are currently in use.
Change-Id: I70aed30ab1586ddc5206cf9ecafe5b091645c6fb
hromium/java/com/android/webview/chromium/ResourceProvider.java
|
| c270f2b2346677ef800e6ffb5bb96d1e5ab91b3e |
24-Oct-2013 |
Martin Kosiba <mkosiba@google.com> |
Make the onScrollChange implementation a no-op.
Chromium calls this method from ContentViewCore, but it shouldn't
be called this way for the WebView.
Change-Id: I9424236bcbf00da30d223bb330c9d9a0c0cc2bbb
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 440b7668e3e9ef074975eaf4a0489375591fa2e2 |
26-Nov-2013 |
Ben Murdoch <benm@google.com> |
Remove dependency on UniquePtr.
Change-Id: Ic1ae9275216f9f33808083ceb88d0f34ff8eba0f
hromium/plat_support/graphics_utils.cpp
|
| e5195d94cd3c58c7a3e05decff2148a8aea032dd |
02-Jan-2014 |
Ben Murdoch <benm@google.com> |
Don't strip ColorPicker resources referenced from XML.
Change-Id: Ib74f8d7a46a25b94a1684c9b05ee2ccafbdcc4ff
hromium/proguard.flags
|
| 2de7a52b3eeaa7b77570d8c0ce01b80ba38a754a |
20-Nov-2013 |
Ben Murdoch <benm@google.com> |
Reflect move of CommandLine from content/ to base/
Unblock the automerger.
Please see upstream review https://codereview.chromium.org/62333025/
for the details.
Change-Id: I967675ccfe1ede0f4eabd3f37804b61c6f21a000
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 82fd1199a69c681c79ca1aa6d7a49c47afc1d33e |
07-Feb-2014 |
Andreas Huber <andih@google.com> |
Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.
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
hromium/Android.mk
|
| cf03d67655e2763d476fb7e97429018f87edbeda |
08-Nov-2013 |
Martin Kosiba <mkosiba@google.com> |
Stop using the test constructor.
This is to match http://crrev.com/40663002/
Change-Id: I339fc44eafaf601f7eefc78d1a4a19cb5f06b05c
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 556e2d03f4c50ea4c3cf0f4f85ff4eeb4f73d25b |
11-Nov-2013 |
Kristian Monsen <kristianm@google.com> |
Remove a not dangerous warning from skia header files
Change-Id: I0f7718cd5beaa3c2428f9617a5051f515ae5e9e0
hromium/Android.mk
|
| 7fed03b1b06301297bf607262889b2ec3af9c526 |
05-Nov-2013 |
Ben Murdoch <benm@google.com> |
Tidy up WebViewChromiumFactoryProvider.
Clarify log message about UI thread binding and move functions
to their correct place in the file structure.
Change-Id: I4c201ba9141590b71a492e975ae6e3f40ddbdef1
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 2a334733e1d6ca581ad149f24d347aa95f62f11a |
07-Feb-2014 |
Mikhail Naganov <mnaganov@google.com> |
Switch ResourceProvider to use new setters from AwResources
Upstream https://codereview.chromium.org/155653003/ introduces setter methods
for error pages and default text encoding with an intention to hide static
fields that are currently in use.
Change-Id: I70aed30ab1586ddc5206cf9ecafe5b091645c6fb
hromium/java/com/android/webview/chromium/ResourceProvider.java
|
| b7e3b14b04b38332bfe2b3b5873e8e71b84149f0 |
05-Feb-2014 |
Elliott Hughes <enh@google.com> |
am fc00858f: Merge "Move to the canonical UniquePtr.h."
* commit 'fc00858f4cdc87b0e77be01ffd2cc9c8a70076b5':
Move to the canonical UniquePtr.h.
|
| fc00858f4cdc87b0e77be01ffd2cc9c8a70076b5 |
05-Feb-2014 |
Elliott Hughes <enh@google.com> |
Merge "Move to the canonical UniquePtr.h."
|
| 038552b7be8a0d97f362d953c7cdefd26e71bca0 |
04-Feb-2014 |
Elliott Hughes <enh@google.com> |
Move to the canonical UniquePtr.h.
Change-Id: Ibf1a02a98475384a1e16f69f50f3daf20c8f130c
hromium/plat_support/graphics_utils.cpp
|
| 4a4e55409b32f638e45fd8ab1ba8de512400c4f9 |
30-Jan-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: duplicate arm makefile for arm64.
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
hromium/tools/merge_from_chromium.py
|
| 319b081862b976989494a01962333cff8b7b12ad |
30-Jan-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: duplicate arm makefile for arm64.
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
hromium/tools/merge_from_chromium.py
|
| f9b4aa3a6b7f77e10cd575e360b2f791e29c193b |
02-Jan-2014 |
Ben Murdoch <benm@google.com> |
Don't strip ColorPicker resources referenced from XML.
Change-Id: Ib74f8d7a46a25b94a1684c9b05ee2ccafbdcc4ff
(cherry picked from commit 6b18e81fbb548f00151092bf7a9cb6e23733e934)
hromium/proguard.flags
|
| 9281a85e9587dec5e4b2eb55b6b8b55b6368d6f7 |
23-Jan-2014 |
Selim Gurun <sgurun@google.com> |
Remove @override to fix build break
Remove @override to fix a build break in master-gpl branch.
Change-Id: Id3f58dbecfec4a806f7857a6c1c73954e1bdd6e3
(cherry picked from commit 106c4320b02fb790d9955de133013662bbdc3094)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 78a576ee52d81b1f34e5055951d5bdfabd3f19d9 |
16-Jan-2014 |
Anthony Berent <aberent@google.com> |
Merge "First jank test for Android Webview" into master-chromium
|
| 8ec8dff6e77148a220fe56229dce43ff3ef21782 |
06-Jan-2014 |
Anthony Berent <aberent@google.com> |
First jank test for Android Webview
Includes both the test, and the dummy application that is tested. Only
tests flinging. This is based on the old BrowserFlingTest, but,
since BaseBrowserFlingTest is no longer maintained, and there is only
one browser type here, it merges that code into WebViewFlingTest.
BUG=11266902
Change-Id: I7c246d5d97bb70d119cb1fab9a7c538bef17bcd1
hromium/tests/java/Android.mk
hromium/tests/java/src/com/android/uiautomator/platform/WebViewFlingTest.java
hromium/tools/WebViewShell/AndroidManifest.xml
hromium/tools/WebViewShell/res/values/strings.xml
hromium/tools/WebViewShell/src/com/android/webview/chromium/shell/JankActivity.java
|
| 6da42471335d1df82733c21989e367bf0658cb25 |
08-Jan-2014 |
Ben Murdoch <benm@google.com> |
Update ProGuard flags to silence new notes.
Also clean up unneccesary or.chromium.* classes, as proguard
runs after JARJAR.
Change-Id: I24d379658b8d683fe05a244b573056b8f4f2efde
hromium/proguard.flags
|
| f0f06187a11edc8887aac508c27f28c840764f6f |
18-Dec-2013 |
Mikhail Naganov <mnaganov@google.com> |
Add WebSettings API tracing
(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)
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 6b18e81fbb548f00151092bf7a9cb6e23733e934 |
02-Jan-2014 |
Ben Murdoch <benm@google.com> |
Don't strip ColorPicker resources referenced from XML.
Change-Id: Ib74f8d7a46a25b94a1684c9b05ee2ccafbdcc4ff
hromium/proguard.flags
|
| 55f497a876e74762bac7838f486d52294a4f9406 |
02-Jan-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8d60644097f2502f5f7a7efe74cb327d86aa8571
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
|
| c548c8e47dc1baafa3010c46db0c4ebb26e2b9ca |
18-Dec-2013 |
Richard Coles <torne@google.com> |
Reland "automerger: download gn before generating makefiles."
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)
hromium/tools/merge_from_chromium.py
|
| e6fc6c637811f2c69e1bd8c866d9a52080e7b0cf |
02-Jan-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into m33 at r241094
This commit was generated by merge_to_master.py.
Change-Id: Icfa82bbab9ec740b58774edc9faf8f0097847e5a
|
| 6a06648d228363b777cbf15c41179e2d3926eee4 |
30-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I88b2f7712e6f78b73963c8ef7bceffc56b49ed9b
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
|
| 0ddbe4442772ef3c959e5a611d7c96b8bd97a7ce |
26-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ibed719c3b7e082f04b34ed7b269a61cf58a5a517
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| 1cd7942f7d98f8f2512f661f2973d8b0ba99bb0f |
20-Dec-2013 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Add WebSettings API tracing" into master-chromium
|
| b5841d578580cdf40a03c974ed5671dff5681c5d |
18-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ic461aac635891501fcb85a0faa2fffeadb47d6cf
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| 0b29910a7d689f3456eeb880f163b189f6b57aeb |
18-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r240154
This commit was generated by merge_to_master.py.
Change-Id: Ia61470ff57c573bccec9f7c9043bab7ac8d41fa5
|
| e7478c916867188cb4365f5c751dda95f65c6268 |
24-Oct-2013 |
Martin Kosiba <mkosiba@google.com> |
Make the onScrollChange implementation a no-op.
Chromium calls this method from ContentViewCore, but it shouldn't
be called this way for the WebView.
Change-Id: I9424236bcbf00da30d223bb330c9d9a0c0cc2bbb
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 6944a8d902d36b30fd75c6562f0c73da34617648 |
18-Dec-2013 |
Richard Coles <torne@google.com> |
Merge "Reland "automerger: download gn before generating makefiles."" into master-chromium
|
| d7fe98f16c652eb648ff5668a2d81858458c18f6 |
18-Dec-2013 |
Richard Coles <torne@google.com> |
Reland "automerger: download gn before generating makefiles."
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
hromium/tools/merge_from_chromium.py
|
| d7ad43dc1ed52dc48532738c950ea825e9b7def0 |
18-Dec-2013 |
Mikhail Naganov <mnaganov@google.com> |
Add WebSettings API tracing
This seems to be useful for tracking app's interaction with WebView
Change-Id: I1a88f4d2296a822a2d1c0afe398fbc621a3352f0
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| d40d8d933e977971e271e70d1c625dad76c12d6b |
17-Dec-2013 |
Martin Kosiba <mkosiba@google.com> |
Add third_party/brotli/src to the list of projects to merge.
Change-Id: I4e89adb1dfbd2baa2b57c30246a330862032732f
hromium/tools/merge_common.py
|
| 4aab98dbcc33a94cc58b884ecc623e56d6b0e03a |
17-Dec-2013 |
Bo Liu <boliu@google.com> |
Do not merge third_party/angle_dx11
This is no longer needed and replaced by third_party/angle.
Change-Id: I19c8303745dd0211e96416fe77c3c4f0a3f0e2cc
hromium/tools/merge_common.py
|
| d1d110d8139cf8347ed7c30b1ac78829ce861f32 |
16-Dec-2013 |
Martin Kosiba <mkosiba@google.com> |
Merge "Revert "Adding a fake on page started for data url's since we know it wont be sent"" into master-chromium
|
| 6ce095b8635ab72aa2508a3f99dbbb85ec4ca152 |
13-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
Add third_party/angle to merged project list.
Chromium needs third_party/angle again.
Change-Id: I886614fe0bf538b69e0a4cbda58edc59de526c36
hromium/tools/merge_common.py
|
| 6a6311f8331f8cd2b3f86e012e552ec10e9b8d0b |
13-Dec-2013 |
Ben Murdoch <benm@google.com> |
Revert "Revert "Wire up resources for the Form Validation message bubble.""
This reverts commit 477b059d2035e22280f5ee2892d257b035cca32e.
Change-Id: I3cb22edb023bee31ebf66c166be9ca52eeb44420
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
|
| 477b059d2035e22280f5ee2892d257b035cca32e |
13-Dec-2013 |
Mikhail Naganov <mnaganov@google.com> |
Revert "Wire up resources for the Form Validation message bubble."
This reverts commit 0820c3d292380d5f06017de0877706b4924f0c60.
Change-Id: I95f17cb99d2e565a416d3e918d6d7ade6c0d9589
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
|
| 0820c3d292380d5f06017de0877706b4924f0c60 |
16-Sep-2013 |
Ben Murdoch <benm@google.com> |
Wire up resources for the Form Validation message bubble.
Bug: 11481260
Change-Id: If8782f7a00904ceea7bad61e5296e12e23315001
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
|
| 1dcc873fead7198083da19ea33734ad4d92a496a |
12-Dec-2013 |
Martin Kosiba <mkosiba@google.com> |
Revert "Adding a fake on page started for data url's since we know it wont be sent"
This reverts commit f401798d628ddb492defeb0a00bf289284d1677a.
This code was moved upstream: http://crrev.com/110573003
BUG=10570052
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 7cc5af6a8cbf8dd6a7820227c79cb714e04e802f |
11-Dec-2013 |
Bo Liu <boliu@google.com> |
Merge "Resources for "Support datalist for date/time input types on Android"" into master-chromium
|
| 3aa5f079750def82cafa2e8b18f790e4b869b725 |
11-Dec-2013 |
Richard Coles <torne@google.com> |
Merge "Revert "automerger: download gn before generating makefiles."" into master-chromium
|
| 36797b2162e38e606e48ac5cabec6feae6f078d1 |
11-Dec-2013 |
Richard Coles <torne@google.com> |
Revert "automerger: download gn before generating makefiles."
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
hromium/tools/merge_from_chromium.py
|
| 664f87414423ea78ef543ee8da168d32fc8f0f94 |
10-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am 26ed03a2: (-s ours) DO NOT MERGE: Support a prebuilt WebView.
* commit '26ed03a28a28395f14c119f4bc723c09a9d6547b':
DO NOT MERGE: Support a prebuilt WebView.
|
| cae76b54ee1ff2a072a13eba13c64046f60dd059 |
10-Dec-2013 |
Qiwen Zhao <zhao@google.com> |
am 52c771c9: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit '52c771c927739d2a4108313d463b8b93c0fb460e':
|
| 82417bf9e95d2abf74a57f4fff3b8a4a7dc893f7 |
10-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 26c0eaa0: (-s ours) am bc0f8d36: (-s ours) am 5fc2b7c0: (-s ours) Import translations. DO NOT MERGE
* commit '26c0eaa0b61b34499180260c2ac9543199589955':
|
| dccec01926a1afbf0e438b1d922d135983863f79 |
10-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am 8009977d: (-s ours) am 3ba0b9a1: am cf686f7a: Revert "Support a prebuilt WebView."
* commit '8009977db575433507a018e0bc903376aac6815d':
|
| 3e0fb9cc1746b81c8c52c855820ab2defd727f30 |
10-Dec-2013 |
Ed Heyl <edheyl@google.com> |
am 35cba6a3: (-s ours) am 16448f0d: am dcd99113: merge in klp-release (no-op)
* commit '35cba6a3325867f74a277a5baa9cfc4e53db5c29':
|
| b9f81fc35290d20cf1fbe16bade7d75ecfdd89ac |
10-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am 2c2f2d15: (-s ours) am 6c911270: am 9c9341f1: Support a prebuilt WebView.
* commit '2c2f2d15a1876d2e1f118087e7e6afbd4f600bd1':
|
| 2cdabefe8c0eaed7d4286c013f419c5f60a6556c |
10-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am fa3b5841: (-s ours) am 21ebcdeb: am 908391fe: Merge "Remove the classic WebView from the build." into klp-dev
* commit 'fa3b58410041e7dc42c8b8a9f50311af4d3cc8ea':
|
| 6ccb470962ba361d14bf080034763a386d640d03 |
10-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am bde202bd: (-s ours) am f27e19e4: am 6138d17c: Provide a video poster even if the client doesn\'t.
* commit 'bde202bd4383b83195d3a90f413b1a331a93f21f':
|
| c886b19f0d055ee6a4ced472677bac6dd3d8993e |
10-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am 79d44b7e: (-s ours) am 80c0348f: am 58ca6d4c: Merge "Set the webview-classic-workarounds for targetSDk < KLP" into klp-dev
* commit '79d44b7ebe3b645d23ce3fd79defa139b94cbc6d':
|
| d12f3c3f2f3ff9c8d1f9fa95247f1f5741e4f08b |
10-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am 67f4c579: (-s ours) am e20e606c: am a679c945: Merge "For apps targeting JB MR2+, bind to the first thread using WebView" into klp-dev
* commit '67f4c5798ee4270bc0918b2cd5a14a5bc4213ee5':
|
| f079596f48c388612c037cdd0abd01c2b7a8fb6a |
10-Dec-2013 |
Ed Heyl <edheyl@google.com> |
am ec6fb319: (-s ours) am fbc8a2b6: am 80f7472a: merge in KFS78N (no-op)
* commit 'ec6fb3195c38668a0abf73ea9d9962d1d0487276':
|
| da87f6db05b768f0d3d10de0f337f33cea4a1bc6 |
10-Dec-2013 |
Ed Heyl <edheyl@google.com> |
am af474733: (-s ours) am 2fbef71c: am 9e69c423: merge in KQS81M
* commit 'af474733ba53d94b19f39f1b399aac13b942d841':
|
| 8fd8c4ad6139f19f394b9a8150c3247e7e7a2238 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 98187895: (-s ours) am d228ba84: am 91472035: Merge "Possible fix for bug b/11114227: Occasional crash on rotation" into klp-dev
* commit '981878950505552e834eaf2ab967263a3f995350':
|
| b5865d888a7d5b3d13859f5bba13eb2a6eefabdd |
10-Dec-2013 |
Ben Murdoch <benm@google.com> |
am ee39947f: (-s ours) am 80e37218: am 1bd0fb5f: Merge "Enable favicon downloading." into klp-dev
* commit 'ee39947f3c52e56c8c990029f1fe4bcb0802bada':
|
| 1d8a0624eec51c6ed0743df7bf23cc3e1db5302c |
10-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 03846c52: (-s ours) am b858a596: (-s ours) am 183f750a: (-s ours) Import translations. DO NOT MERGE
* commit '03846c52dec6fc90e2b99157ac4b4f77db3f8277':
|
| 2f718edde9c2306eebb472b6eb6ab4822fc3f177 |
10-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 3608161a: (-s ours) am 8d4e76dd: (-s ours) Import translations. DO NOT MERGE
* commit '3608161adc8273c8b02f971e7efa3eeefdbe4d19':
Import translations. DO NOT MERGE
|
| 232b8821b447d9141b982a1424de37ce4078e18a |
10-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am cadd6d4f: (-s ours) am 9dab5652: Allow CookieManager to be used without starting Chromium.
* commit 'cadd6d4ffd526825865bc0cbb252350bb097eaa3':
|
| 859a7fedfd2e4bd107a45d2adca224bbec2a13d1 |
10-Dec-2013 |
Ben Murdoch <benm@google.com> |
am e66f89d5: (-s ours) am 30c0a035: Do not assume WebView is running on the main thread.
* commit 'e66f89d5642b421a008126d31644984a0df001fd':
|
| a5ee63967032e7c18fd18c9e5bfc96c827e6cb55 |
10-Dec-2013 |
Bo Liu <boliu@google.com> |
am 8b20f316: (-s ours) am 157c78cf: Use View.executeHardwareAction for onDetachedFromWindow
* commit '8b20f316b2854feabc81faaeb2a3e7fcd17169a5':
|
| 8c4ab3988f40b151f35e9cbc7d716021231c771f |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 566bea1e: (-s ours) am 4cde2296: Making super_onGenericMotionEvent call the super event
* commit '566bea1e27142dd335bfc24ed8fd654b4e933478':
|
| fa8009e1baf214672563271d48676df4fad5c06c |
10-Dec-2013 |
Ben Murdoch <benm@google.com> |
am 9086b7eb: (-s ours) am 588476c7: Wire up Select Action Bar in WebView.
* commit '9086b7ebcca8cbc86a5f34e3404a7ae3e27ee8fe':
|
| c56e4c432255a0e378b2a0fb53d264170920c5a4 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am b929ead0: (-s ours) am d21b8fe0: Using the chromium clearView implementation
* commit 'b929ead04d8006c08494442a2e7722897171411b':
|
| 86d6ac20ceefd36eabd13d584e3324fbaaf3aa87 |
10-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am a9a383c5: (-s ours) am e36bb83b: Revert "Revert "Implement the new WebView.setWebContentsDebuggingEnabled API""
* commit 'a9a383c5bb9ef8f414c36cdfad41baad5db131eb':
|
| b56582e4320822cdad35307ba77b1c878f7a8c53 |
10-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am d924c94e: (-s ours) am 36cab457: Revert "Implement the new WebView.setWebContentsDebuggingEnabled API"
* commit 'd924c94e26bf605f0a74a3fdbab0be2188cbc593':
|
| c7dd0b01896b66e4c118489e132fa84439fbf447 |
10-Dec-2013 |
Mikhail Naganov <mnaganov@google.com> |
am 4f713e7b: (-s ours) am d9e4aedf: Implement the new WebView.setWebContentsDebuggingEnabled API
* commit '4f713e7b7d992e1f641fd1874ca387f31cb51af3':
|
| 010daed00a80ad11b3556eed26b51c6b1e70ca64 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 1a5671b0: (-s ours) am 1a0ca658: Posting additional log message if apps have a blocked URL
* commit '1a5671b0efb16a857e58a47294e3358f90545f6c':
|
| c208e5f34006c9289e7a91eb4970b65660375b9d |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 00dfede5: (-s ours) am a6229846: Adding a fake on page started for data url\'s since we know it wont be sent
* commit '00dfede53188dfe7a61a921a50dacc07914f1ff0':
|
| 7bf80cd92bd9763a7382b06ac06e7dd40e0467d7 |
10-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am dedf8d9e: (-s ours) am d32e2580: Keep @JavascriptInterface methods in proguard.
* commit 'dedf8d9eac93c86464afde00927876263e65ba90':
|
| 0638831e167f551e1c7b6baecf08411064c5fa46 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am e0ad8972: (-s ours) am 1a692d93: Fixing up the checkThread exception message
* commit 'e0ad8972469f550fd7cf2ad409623d93ea1e860f':
|
| 4a062e691669228cf61627652b582ad4780633db |
10-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am 2457fd41: (-s ours) am b8453b86: Merge "Revert "Remove the classic WebView from the build."" into klp-dev
* commit '2457fd419e98652b6a52e2fd76c894639efbab9d':
|
| 896f11130f5d2e798a2ecbe867fce7462b6142e1 |
10-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am 3257311a: (-s ours) am f98f0ca1: Merge "Remove the classic WebView from the build." into klp-dev
* commit '3257311a5863f61a9ad4fe68d00d6dc7f9f72275':
|
| dfa09c675a46d5eebe83045185a2ed439cd39cfd |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am ea2891de: (-s ours) am f2b715be: Removing UnimplementedWebViewApi.invoke from methods that are not needed to implement
* commit 'ea2891deddd63a1a15bfee58676e50701e0485e4':
|
| 10683a15e42aff9626596a4c3904bfa7b23324ac |
10-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 9a281716: (-s ours) am 8fd6a561: (-s ours) Import translations. DO NOT MERGE
* commit '9a2817167538ce14d579e152119e056d97959885':
|
| 0c790d44d268392b532f1d8a4d966de3916a4499 |
10-Dec-2013 |
Selim Gurun <sgurun@google.com> |
am 46da19cc: (-s ours) am 412d84be: DO NOT MERGE Reflect print API changes
* commit '46da19ccdb15464e528294103a85b4ab93acb6ce':
|
| 2bcdef80f307f2ef9ae752ef28c4444014089eb9 |
10-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am dd19feee: (-s ours) am 2de8edf3: Merge changes Id195f1e6,I19dc412e into klp-dev
* commit 'dd19feee121e9e462962fc03a681abc08e02d898':
|
| a72478c2a642efe1e6311d73378c9d23e55dae12 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 27a606b9: (-s ours) am 2c11b458: Post all functions returning a value to the UI thread
* commit '27a606b9fa99162b3ba5158c9e2ff5b0c440536a':
|
| 08b779a9aab5f43406f8a803a05a5231d5508b97 |
10-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am cb6aea76: (-s ours) am 25652b1d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'cb6aea76d6bc89924db302d5a9c083d8b739ef4d':
|
| d9efb0c9e90df928e732fdb58e1ba9a33f3ad9ee |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am c0578dd2: (-s ours) am 81cdab1b: Posting ALL the void functions to UI thread
* commit 'c0578dd2c3cb63dbd5d61360fd1ef1f2dcdd4d8f':
|
| 61d1be76320f5abac1cca8f675941b3ad2aecfa2 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 23c36d61: (-s ours) am 41618b2a: Null check url before using instance methods
* commit '23c36d611efb0464e0a0d4fb29de09fb90ef8c26':
|
| 20bedee6bea523410c4887ffcdb5338d0b22b4d7 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am db64047c: (-s ours) am 4fb262f3: Post init to the UI thread blocking with a timeout to detect deadlock
* commit 'db64047c7757fea80aa1db386f38f5ffaa66db8e':
|
| a8ecbff97e8c9c1f30687b6f776cbf2e907be5b1 |
10-Dec-2013 |
Primiano Tucci <primiano@google.com> |
am a4857804: (-s ours) am 855ab488: Wire up stylable attributes for <select> dialogs.
* commit 'a4857804f04313c7eae12f74fd82b8c9bb33c7a8':
|
| b37a3186f6b14e381f047e9f0b77e0a190ac2683 |
10-Dec-2013 |
Bo Liu <boliu@google.com> |
am 21ec8cc0: (-s ours) am bc8c946f: Merge "Raise NOFILE to hard limit (1024->4096) on draw functor attach" into klp-dev
* commit '21ec8cc042fc3f48e008b8ca1582ac04000654a7':
|
| 99ccf72eb86ee0af9384fb80aed4d36b28df2367 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 70a4658a: (-s ours) am c8523c99: Letting onDraw be called from other threads
* commit '70a4658acfc4fbd722c81793f634e5d8452ac2d1':
|
| e5862f8e98974d300ee4dcb97e48a4d479cc74d9 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 6babd1b5: (-s ours) am e80eedd9: Merge "Post stopLoading() to the UI thread" into klp-dev
* commit '6babd1b514e127a83e44a22993bfc6544cee43d7':
|
| 529fef5ee895610549ce67273f824315e8725641 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am f06a131a: (-s ours) am 4ce3edbf: Merge "Allow getScale on all threads" into klp-dev
* commit 'f06a131a2caadbdb57454930e83114a69ca5af42':
|
| f1f10ee12ceb928db299f35dd4a29135b57e84f5 |
10-Dec-2013 |
Martin Kosiba <mkosiba@google.com> |
am c0144546: (-s ours) am 56eb9568: Merge "Hook up requestChildRectangleOnScreen." into klp-dev
* commit 'c014454642f636ce968221a7740131a0473caca6':
|
| 1fd84bba3894c42021ba4696e287cf5efb697800 |
10-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am 3ce45bdc: (-s ours) am 94addffe: Merge scripts: support merging from Chromium releases.
* commit '3ce45bdcafa1a557272f11ba3933c629667d175d':
|
| 836a5ae5d0dd4cd2ad12e788a1dd2a36dcefb861 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am c44187f6: (-s ours) am d6b155b4: Merge "Post destroy() to UI thread" into klp-dev
* commit 'c44187f6b7e129fbc9453f3e81a95d89da5a692d':
|
| 9bedfac3e62666b3f701306959012952198c8122 |
10-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am 6aad3047: (-s ours) am 3c50ec3f: Merge "Allow null inputs in loadDataWithBaseURL" into klp-dev
* commit '6aad30479705f5168abae1070f4545a6b35e0a9b':
|
| e33d52a87dff67e993203c28a16158075bb2a79c |
10-Dec-2013 |
Mikhail Naganov <mnaganov@google.com> |
am 92d07be0: (-s ours) am ffabf2e1: Enable web layout quirks for apps with targetSdkVersion < K
* commit '92d07be0d09881cb4f2d7ef6eeb5042408f400c6':
|
| ea01239f11c4f658172422b60fa68481d0b7bb4f |
10-Dec-2013 |
Ben Murdoch <benm@google.com> |
am b31ffbc2: (-s ours) am 1610a524: Merge "Wire up stylable attributes." into klp-dev
* commit 'b31ffbc283e353db7e0bbe77dcf451650c72be44':
|
| 452bb3020d17c30c04da8c3a025ef0c95e082c2e |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am e7771f76: (-s ours) am 7720b10b: Letting getSettings be called from any thread
* commit 'e7771f76137bb319f5825554a1e61c9d59d6d23b':
|
| 13143157c5f1e84f71b67b98c72cf6db92ab2fb2 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 1a8fc63b: (-s ours) am 4e8f7b0d: Merge "Let getContentHeight be used from any thread" into klp-dev
* commit '1a8fc63b27ab1573f87722821f87984a84bbbc47':
|
| 9809ceb9a60c32f90be07c9854fdbac6615b8ce4 |
10-Dec-2013 |
Chet Haase <chet@google.com> |
am f0c11c76: (-s ours) am 9cd49cbc: Change build version from KEY_LIME_PIE to KITKAT
* commit 'f0c11c762e9d31b709dc160dffaff82a7f2baf28':
|
| 27da62beeddb46bbf76d276c73c6c6d9c0602962 |
10-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am e30b18b0: (-s ours) am e27917ca: Merge "Don\'t check thread access for HierarchyHandler methods" into klp-dev
* commit 'e30b18b04b86fbb2ce2d72c2e2f6cd20b1c64211':
|
| 502117890479f7d5394adf3b8cc03b384fc4878e |
10-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am b551c947: (-s ours) am 081c438a: Add tracing for WebviewChromium callbacks
* commit 'b551c947ae8f71f377646af3e49fac83e7f704ca':
|
| f41b05aab2f6161b14b495346ccf323c8f23a59c |
10-Dec-2013 |
Ben Murdoch <benm@google.com> |
am 0596628a: (-s ours) am 5be0edbd: Merge "Implement WebViewChromium.freeMemory." into klp-dev
* commit '0596628a9561657d3324c93e6351422901fe3740':
|
| 64ad65c15734a6584f51f8d1de090c55398eb1a3 |
10-Dec-2013 |
Selim Gurun <sgurun@google.com> |
am c0b9aa3f: (-s ours) am a8d0ef26: DO NOT MERGE Printing API changes for supporting better page layout
* commit 'c0b9aa3fe9743f8419590635cf6e6573b1da1040':
|
| ecd3c90771123f5c0b6cac285eee36765f7f58e5 |
10-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am fc3349b1: (-s ours) am 9cf31969: Merge "Fix bug 10533304 - HD Wallpapers access getProgress on wrong thread" into klp-dev
* commit 'fc3349b1862297aa7b00dbd684cfa5f86e183f3a':
|
| 3989aabdbb858c042a59438fa4075a3d5456732d |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 383b5936: (-s ours) am 3b31fa53: Merge "More diagnostics for methods called from the wrong thread" into klp-dev
* commit '383b5936db2295d299bffa4d3f13ce7ad7cee574':
|
| c61a71dbe7346011cc0a160c9a3ebf4b3181689d |
10-Dec-2013 |
Ben Murdoch <benm@google.com> |
am fad276fd: (-s ours) am ef6e94b3: Merge "Update CHAR-LIMIT on webviewchromium_media_player_loading_video string" into klp-dev
* commit 'fad276fd1199b127ad10c0735d4d44ae02fbdc36':
|
| 919975b891464fbbef7d2860578dc9d362ada2cb |
10-Dec-2013 |
Ben Murdoch <benm@google.com> |
am 16f89c01: (-s ours) am 9cb4b295: Merge "Change WebView.setNetworkAvailable plumbing." into klp-dev
* commit '16f89c0118e5850c78931e5a113509a30c0a9007':
|
| ba730613aeea5e5df418830927267a4173575359 |
10-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am ae3d3247: (-s ours) am 3108e9ae: (-s ours) Import translations. DO NOT MERGE
* commit 'ae3d324799c5d946c3d073ac8a14b019f03c92c1':
|
| e6abaeb94266051e0ebe601e74be169c2209690c |
10-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 7c3f69f3: (-s ours) am df72e595: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '7c3f69f328705bbcb1868ad895ec7a0a3ac319ed':
|
| dc52050b8730587fdee4b89b9b3380c5945d0e05 |
10-Dec-2013 |
Ben Murdoch <benm@google.com> |
am b3f193b8: (-s ours) am fe4c5712: Merge "Fix styled attribute resolution in WebView." into klp-dev
* commit 'b3f193b8080c983327d9f741ccad93d2ecabca78':
|
| ee5db3f0fe87d402a06d94de6847e2aa3f9392c8 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am c228c9f8: (-s ours) am 57b714b4: Ferrying setBackgroundColor to the UI thread
* commit 'c228c9f8ac589c86af61d541799a505a8b65a6e4':
|
| c4523c825bc430ee098f1275c83bbca2c3b61158 |
10-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am f93d4271: (-s ours) am da5db0da: Merge "Fix for b/10428080: Check that apps are calling View methods on UI thread" into klp-dev
* commit 'f93d42710fdadc511b56bcdc826b7da5ee4ae2d2':
|
| b375ba6047e526a49d0bf6c4bf47c45ae446e99a |
10-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 53e4558c: (-s ours) am 369d3e50: (-s ours) Import translations. DO NOT MERGE
* commit '53e4558c1ccdc263315e9a4fc910877aa019e0b5':
|
| f4d0d781598c1e28e4bc0db21883d496b13ba28a |
10-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am ae75b6aa: (-s ours) am 89e6a8b8: (-s ours) Import translations. DO NOT MERGE
* commit 'ae75b6aaa9b8373fd2411dd893db33a438ed2e5a':
|
| bcfff7dd27e4b7323e9dcf8755d315e186dc7487 |
10-Dec-2013 |
Tao Bai <michaelbai@google.com> |
am 7f72c0a7: (-s ours) am 3d52163e: Use evaluateJavaScriptEvenIfNotYetNavigated for loadUrl JavaScript:
* commit '7f72c0a7236af1de256c10dace5e13b6e75b66bf':
|
| bbf4f1b0746f518f98379bfab0caffac9f7df74c |
10-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am aee0179d: (-s ours) am aa8a8f95: (-s ours) Import translations. DO NOT MERGE
* commit 'aee0179dc7910546069b7af05f2fec033b93f343':
|
| 26ed03a28a28395f14c119f4bc723c09a9d6547b |
16-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
DO NOT MERGE: Support a prebuilt WebView.
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
hromium/Android.mk
|
| a2b875747e2dc03eaf10e87bdc2f2061fc2c91fa |
09-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales
Bug:11340849
Change-Id: I290be61e82fb259a9b0b675a543c4d88cf00ac0c
hromium/overlay/frameworks/base/core/res/res/values-et/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms/strings.xml
|
| 52c771c927739d2a4108313d463b8b93c0fb460e |
09-Dec-2013 |
Qiwen Zhao <zhao@google.com> |
DO NOT MERGE reset to goog/klp-volantis-dev
|
| c13e4e8413e9649b1a53f9a9d9b0ca98bfd43e52 |
09-Dec-2013 |
Bo Liu <boliu@google.com> |
Resources for "Support datalist for date/time input types on Android"
Add resources introduced in crrev.com/r239290
Change-Id: I5788a60e9f98164f09cccd291fda767b2de97d8c
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_suggestion.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| 3fbc9545f7fda99adedd2216becd106d6b0c9ccf |
06-Dec-2013 |
Bo Liu <boliu@google.com> |
Add resource after chromium crrev.com/r239076
Change-Id: I73c193454cb9cb2e8a77981675395e9c06844ae2
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| f7f4e5362655ca1699af4893b8dd8c11d5256f00 |
05-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am edc70c88: (-s ours) DO NOT MERGE: Support a prebuilt WebView.
* commit 'edc70c88af24df137bc52560a907f2d5abcb2bf8':
DO NOT MERGE: Support a prebuilt WebView.
|
| 83fdd810a009a9dcffd50243f72f0b2919f8bb8b |
05-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 5fc2b7c0: (-s ours) Import translations. DO NOT MERGE
* commit '5fc2b7c0aa383e8c693e7292081e81c6a2944d53':
Import translations. DO NOT MERGE
|
| 1eabde9e1c311e7500aed4e9a25040f9c4a22cc5 |
05-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am cf686f7a: (-s ours) Revert "Support a prebuilt WebView."
* commit 'cf686f7adb1cbc4efe3e93ae69b040d328b0e23f':
Revert "Support a prebuilt WebView."
|
| ef3a228411bd8feb2d595e5a28e73eb8da900cde |
05-Dec-2013 |
Ed Heyl <edheyl@google.com> |
am dcd99113: (-s ours) merge in klp-release (no-op)
* commit 'dcd9911315bc6864b61d1d76ca0ff3904227889b':
Do not assume WebView is running on the main thread.
|
| 6a2f08e628bac10d151c816acd62fba8417086b1 |
05-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am 9c9341f1: (-s ours) Support a prebuilt WebView.
* commit '9c9341f1d2368b4209fe982f3f1c5de384f67fb7':
Support a prebuilt WebView.
|
| 9a5277bc89a5f114a1fd55eaafda0a251a88b79b |
05-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am 908391fe: (-s ours) Merge "Remove the classic WebView from the build." into klp-dev
* commit '908391fee972492bdb5d8b179b4d9e8a01719003':
Remove the classic WebView from the build.
|
| 0871d920cf4644c985d2869f833c32c83fbd874b |
05-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am 6138d17c: (-s ours) Provide a video poster even if the client doesn\'t.
* commit '6138d17c5fd136a215078b4a9ae818d73cfa8b9a':
Provide a video poster even if the client doesn't.
|
| b77cc7ac6c33ea859deb369187c0e991e4a409cd |
05-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am 58ca6d4c: (-s ours) Merge "Set the webview-classic-workarounds for targetSDk < KLP" into klp-dev
* commit '58ca6d4c0f3ea5d35d313ac13915a5a6b5c1ce9e':
Set the webview-classic-workarounds for targetSDk < KLP
|
| 2b6abcce5de9f75e4dffc047f7c8f9d9f8f32d8a |
05-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am a679c945: (-s ours) Merge "For apps targeting JB MR2+, bind to the first thread using WebView" into klp-dev
* commit 'a679c94584888adc39738c132940cdc6f0244618':
For apps targeting JB MR2+, bind to the first thread using WebView
|
| 4ac9b12aac5c7855e0776322ed86b233a6fc6d38 |
05-Dec-2013 |
Ed Heyl <edheyl@google.com> |
am 80f7472a: (-s ours) merge in KFS78N (no-op)
* commit '80f7472a95cdbbf85a62431bf061eeef29c9d697':
Remove the classic WebView from the build.
|
| ecfef8212883d6ce779e37a0bb3d830094a9b99b |
05-Dec-2013 |
Ed Heyl <edheyl@google.com> |
am 9e69c423: (-s ours) merge in KQS81M
* commit '9e69c42340f1c8e620e416d9427443466280e876':
Post all functions returning a value to the UI thread
Import translations. DO NOT MERGE
Use evaluateJavaScriptEvenIfNotYetNavigated for loadUrl JavaScript:
Temp fix for bug 10152369: Broken SW draw with multiple layers
|
| f6416a371034f46f532cd91899a53eb09e843353 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 91472035: (-s ours) Merge "Possible fix for bug b/11114227: Occasional crash on rotation" into klp-dev
* commit '91472035f666e633d4c299617ae1b20ccd3b6e0c':
Possible fix for bug b/11114227: Occasional crash on rotation
|
| c3cc76a82ecb5c5e05692a37b1b1c55ed7ec9a6f |
05-Dec-2013 |
Ben Murdoch <benm@google.com> |
am 1bd0fb5f: (-s ours) Merge "Enable favicon downloading." into klp-dev
* commit '1bd0fb5f6962e25d89aa61e0f3098ac57c446fe8':
Enable favicon downloading.
|
| 121dcf4985890a8d0e6fdade61a569d8aa879c9f |
05-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 183f750a: (-s ours) Import translations. DO NOT MERGE
* commit '183f750ae29f7eef752a21a48fe0c45c300d3c78':
Import translations. DO NOT MERGE
|
| 6fa426e81d2589090db2fb893eac62c40994f3ba |
05-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am 9dab5652: (-s ours) Allow CookieManager to be used without starting Chromium.
* commit '9dab5652ee2433cb990baca967d4331be0b2d3f3':
Allow CookieManager to be used without starting Chromium.
|
| 801fe4622a8b809cc9ecdcf9bcdcfbb0d826032e |
05-Dec-2013 |
Ben Murdoch <benm@google.com> |
am 30c0a035: (-s ours) Do not assume WebView is running on the main thread.
* commit '30c0a035f7c865ee300a3d8a9a3e515a66c6a818':
Do not assume WebView is running on the main thread.
|
| 72420b2d50ffd69271c70e1cb2da8dfdb409dc96 |
05-Dec-2013 |
Bo Liu <boliu@google.com> |
am 157c78cf: (-s ours) Use View.executeHardwareAction for onDetachedFromWindow
* commit '157c78cfd4127a0b39d3c55c95c7cec23ccdc234':
Use View.executeHardwareAction for onDetachedFromWindow
|
| bc51bd3d9aebbabc33bcae574aaacc05f371c9d5 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 4cde2296: (-s ours) Making super_onGenericMotionEvent call the super event
* commit '4cde2296b2a773d3139ed97daa097eefa42b511a':
Making super_onGenericMotionEvent call the super event
|
| 54650b829b665bcb92437297402955d2ad5fc705 |
05-Dec-2013 |
Ben Murdoch <benm@google.com> |
am 588476c7: (-s ours) Wire up Select Action Bar in WebView.
* commit '588476c7a7151edd9f01401cd905c8b7229b2b75':
Wire up Select Action Bar in WebView.
|
| 5a94f7de08096b181b63e14e6f0d66a6036b5341 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am d21b8fe0: (-s ours) Using the chromium clearView implementation
* commit 'd21b8fe00b21742cc36929cb02eef6ad25946512':
Using the chromium clearView implementation
|
| 87f3e4641440dd6d08f960e1cb78b6b1955bda51 |
05-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am e36bb83b: (-s ours) Revert "Revert "Implement the new WebView.setWebContentsDebuggingEnabled API""
* commit 'e36bb83b4a1907d71527d3a8ef54db1ec8de3188':
Revert "Revert "Implement the new WebView.setWebContentsDebuggingEnabled API""
|
| 392804238c4e896e08b1dfd1e07acebaa228ee3a |
05-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am 36cab457: (-s ours) Revert "Implement the new WebView.setWebContentsDebuggingEnabled API"
* commit '36cab4579d7633fa3bc89bd550a01cc0e39fb163':
Revert "Implement the new WebView.setWebContentsDebuggingEnabled API"
|
| 01f1a90f85d398f636043a04e25f873c31db1510 |
05-Dec-2013 |
Mikhail Naganov <mnaganov@google.com> |
am d9e4aedf: (-s ours) Implement the new WebView.setWebContentsDebuggingEnabled API
* commit 'd9e4aedf3d14b3494d54dbb482ece3603d0f693d':
Implement the new WebView.setWebContentsDebuggingEnabled API
|
| d043e444872c5f1ee38abb8f02229c91cde52f19 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 1a0ca658: (-s ours) Posting additional log message if apps have a blocked URL
* commit '1a0ca658d1d188ed9dc9b2163be0f2ee89e06a1e':
Posting additional log message if apps have a blocked URL
|
| 5c4415ae30da6906447e96e999c6b87b575aa4b6 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am a6229846: (-s ours) Adding a fake on page started for data url\'s since we know it wont be sent
* commit 'a622984698ea393f81ce968ec87bab75087af7dc':
Adding a fake on page started for data url's since we know it wont be sent
|
| ca09293ca5737d98a35d1d8033c627cdfdc41693 |
05-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am d32e2580: (-s ours) Keep @JavascriptInterface methods in proguard.
* commit 'd32e258033d74fb551442b10547215de443be05c':
Keep @JavascriptInterface methods in proguard.
|
| 90d2880ade027d63584bc40225256be3d3fff65e |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 1a692d93: (-s ours) Fixing up the checkThread exception message
* commit '1a692d93c0172dc09a316bbf9a54896f1d40234f':
Fixing up the checkThread exception message
|
| 858116050cb209ee85f1f41250d84459a0b6d0f7 |
05-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am b8453b86: (-s ours) Merge "Revert "Remove the classic WebView from the build."" into klp-dev
* commit 'b8453b8656b0febc25877ccb57b98d3842a4221c':
Revert "Remove the classic WebView from the build."
|
| 8966563a9c1a699ca0987a5aad0352b08c55d1aa |
05-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am f98f0ca1: (-s ours) Merge "Remove the classic WebView from the build." into klp-dev
* commit 'f98f0ca12308ed7af0b13e627d2a45b1f0b636e3':
Remove the classic WebView from the build.
|
| 474def30f4a630c0a53e8c26b8c7260f464b6e73 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am f2b715be: (-s ours) Removing UnimplementedWebViewApi.invoke from methods that are not needed to implement
* commit 'f2b715bee3bb3a41e59f80ae53b45f249d9559c5':
Removing UnimplementedWebViewApi.invoke from methods that are not needed to implement
|
| 85ce897eea86097ebe7d6467cd71b6d08ca24e98 |
05-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 8fd6a561: (-s ours) Import translations. DO NOT MERGE
* commit '8fd6a5614f7580f045695085797d03504591ad02':
Import translations. DO NOT MERGE
|
| a371b8ecfb39ee0ef2d8e2e329fa53c73b8e7f28 |
05-Dec-2013 |
Selim Gurun <sgurun@google.com> |
am 412d84be: (-s ours) DO NOT MERGE Reflect print API changes
* commit '412d84be859ce0eb91baf2f9afe5e6326a15d76a':
DO NOT MERGE Reflect print API changes
|
| fd9b158d76652cae1c7d150b68669d78502f2953 |
05-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am 2de8edf3: (-s ours) Merge changes Id195f1e6,I19dc412e into klp-dev
* commit '2de8edf317abd50f69fb0867571c7c0d27e76d2c':
Optimize the complex clip case
Export canvas info via SkCanvasLayerState
|
| 82fb4399c5b654bf46d232aab36d126236d71b8c |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 2c11b458: (-s ours) Post all functions returning a value to the UI thread
* commit '2c11b458a21170c4eacba6c072f695c465f1c083':
Post all functions returning a value to the UI thread
|
| a1088fbf91711da0cf941d53a3d1f206c95393b2 |
05-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 25652b1d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '25652b1db444c90537ab67bc696db8130994521b':
Import translations. DO NOT MERGE
|
| 0a5853bd2cbbfe539ecf83abe9f8ad5c73216568 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 81cdab1b: (-s ours) Posting ALL the void functions to UI thread
* commit '81cdab1b4a022515f0234daafb3e224d13f20a9f':
Posting ALL the void functions to UI thread
|
| 6f7b8a339d160b66b2bc8696c41db2c7fa4bf649 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 41618b2a: (-s ours) Null check url before using instance methods
* commit '41618b2aeb0a500c740a75871a8f614cb6543362':
Null check url before using instance methods
|
| 0e07063ef0bacec61a2bb78065ba0d4b38fcc343 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 4fb262f3: (-s ours) Post init to the UI thread blocking with a timeout to detect deadlock
* commit '4fb262f34ba888eaacc24a83d94a56b8d7bcef2b':
Post init to the UI thread blocking with a timeout to detect deadlock
|
| 742d11f3fbcb5f94b394c5ba01c394076dfa00a7 |
05-Dec-2013 |
Primiano Tucci <primiano@google.com> |
am 855ab488: (-s ours) Wire up stylable attributes for <select> dialogs.
* commit '855ab488e8afd5297b312a9cf2c06ada3a286593':
Wire up stylable attributes for <select> dialogs.
|
| ba4baacef9f6cb90900aed6a69deae8e2a2e9347 |
05-Dec-2013 |
Bo Liu <boliu@google.com> |
am bc8c946f: (-s ours) Merge "Raise NOFILE to hard limit (1024->4096) on draw functor attach" into klp-dev
* commit 'bc8c946f4f939ff9f51e61716f995faf29478426':
Raise NOFILE to hard limit (1024->4096) on draw functor attach
|
| 9e7773fbe8f38b80371eada13439550283a83530 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am c8523c99: (-s ours) Letting onDraw be called from other threads
* commit 'c8523c99833f364c64744d60e408510fb83b998b':
Letting onDraw be called from other threads
|
| e91c8558a3dfc9c78d8b5436148f6a43e31e708e |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am e80eedd9: (-s ours) Merge "Post stopLoading() to the UI thread" into klp-dev
* commit 'e80eedd97cf65f058960f6d07cdc7c1bc457035f':
Post stopLoading() to the UI thread
|
| be7cfa658ac30610eb9b8c8af51c265e269b5bf0 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 4ce3edbf: (-s ours) Merge "Allow getScale on all threads" into klp-dev
* commit '4ce3edbffa79974f160605c4bc997b1b08d262b2':
Allow getScale on all threads
|
| d937043e36d3e20a87b0aede0e8c9fbe9c1697e6 |
05-Dec-2013 |
Martin Kosiba <mkosiba@google.com> |
am 56eb9568: (-s ours) Merge "Hook up requestChildRectangleOnScreen." into klp-dev
* commit '56eb9568f2dea488c0be768e5117f428378d7003':
Hook up requestChildRectangleOnScreen.
|
| 50b8887ed6ee6e262457c643ccc35aacbc799947 |
05-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
am 94addffe: (-s ours) Merge scripts: support merging from Chromium releases.
* commit '94addffe055d2df297d4cf6c981d13a6e0a62bbc':
Merge scripts: support merging from Chromium releases.
|
| 50a2b83ae97a978dc49465cbb874a6d305aab29b |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am d6b155b4: (-s ours) Merge "Post destroy() to UI thread" into klp-dev
* commit 'd6b155b4e96e8f6158063de6c2118e20d72010fa':
Post destroy() to UI thread
|
| a323fafa6b6171daa0d0145ba8f021b8eeca9d96 |
05-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am 3c50ec3f: (-s ours) Merge "Allow null inputs in loadDataWithBaseURL" into klp-dev
* commit '3c50ec3fdce2a693d065395040276630fd89106c':
Allow null inputs in loadDataWithBaseURL
|
| 24fe32d06beed7ce9411ca24d3532385b61d033d |
05-Dec-2013 |
Mikhail Naganov <mnaganov@google.com> |
am ffabf2e1: (-s ours) Enable web layout quirks for apps with targetSdkVersion < K
* commit 'ffabf2e121746d06b9930b1ae8fea243c4f5cb9d':
Enable web layout quirks for apps with targetSdkVersion < K
|
| daae6a6f12eb375bdc15c6f8643f918d9bebedbe |
05-Dec-2013 |
Ben Murdoch <benm@google.com> |
am 1610a524: (-s ours) Merge "Wire up stylable attributes." into klp-dev
* commit '1610a52469877adaa73b088589f86dfe9d2f00df':
Wire up stylable attributes.
|
| 380dbbc262cae17b833c2565b8276d04d19235d3 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 7720b10b: (-s ours) Letting getSettings be called from any thread
* commit '7720b10b55b5db5564a72c2e4c2c23631acbff0a':
Letting getSettings be called from any thread
|
| 1f033a51cce241a5fe8ac4de613864b425d32fca |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 4e8f7b0d: (-s ours) Merge "Let getContentHeight be used from any thread" into klp-dev
* commit '4e8f7b0d88d73b1ac77efc24e63ebc731a4c31d9':
Let getContentHeight be used from any thread
|
| 128bfbce692d74142297b1a631d4eec0f4cf3880 |
05-Dec-2013 |
Chet Haase <chet@google.com> |
am 9cd49cbc: (-s ours) Change build version from KEY_LIME_PIE to KITKAT
* commit '9cd49cbc245e07e8e8c360fd22821a2918f99eae':
Change build version from KEY_LIME_PIE to KITKAT
|
| f7c50e0a161c046c10d5601b16c0b1baafd2ab50 |
05-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am e27917ca: (-s ours) Merge "Don\'t check thread access for HierarchyHandler methods" into klp-dev
* commit 'e27917ca170c4df6f2a949c58820ac1d841a57e2':
Don't check thread access for HierarchyHandler methods
|
| f5561a5142fe01a3365e596e111518cb05e39f09 |
05-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am 081c438a: (-s ours) Add tracing for WebviewChromium callbacks
* commit '081c438a8201fe2d1248f487808b3bae6706aa7e':
Add tracing for WebviewChromium callbacks
|
| fbb08e92e0cf33a9d543531755540388a7af319e |
05-Dec-2013 |
Ben Murdoch <benm@google.com> |
am 5be0edbd: (-s ours) Merge "Implement WebViewChromium.freeMemory." into klp-dev
* commit '5be0edbd27f9402ee53ab7d6dc16a06de540325c':
Implement WebViewChromium.freeMemory.
|
| 85bec6863057b6b687441b5730d8a597d681f9da |
05-Dec-2013 |
Selim Gurun <sgurun@google.com> |
am a8d0ef26: (-s ours) DO NOT MERGE Printing API changes for supporting better page layout
* commit 'a8d0ef2693c3bcd4a091cc7fa49b69b54e3472c4':
DO NOT MERGE Printing API changes for supporting better page layout
|
| 3aaf3fd4a974ef64172de4802602bc11efac671a |
05-Dec-2013 |
Jonathan Dixon <joth@google.com> |
am 9cf31969: (-s ours) Merge "Fix bug 10533304 - HD Wallpapers access getProgress on wrong thread" into klp-dev
* commit '9cf31969a3e2e33d750b881ac6a4b3e980a5952a':
Fix bug 10533304 - HD Wallpapers access getProgress on wrong thread
|
| a91b49af33a6448aa936dbecc3bc4fb5c9cd721f |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 3b31fa53: (-s ours) Merge "More diagnostics for methods called from the wrong thread" into klp-dev
* commit '3b31fa53b24614e84d1c04354abc2703391bfb19':
More diagnostics for methods called from the wrong thread
|
| 8bf2e814f5c4fae28064c4b1a19b21d5545b0551 |
05-Dec-2013 |
Ben Murdoch <benm@google.com> |
am ef6e94b3: (-s ours) Merge "Update CHAR-LIMIT on webviewchromium_media_player_loading_video string" into klp-dev
* commit 'ef6e94b3aca5d82cc786b2e5df29de0eff9bda37':
Update CHAR-LIMIT on webviewchromium_media_player_loading_video string
|
| 8f556644517fc59692223c1c0304ce5378577506 |
05-Dec-2013 |
Ben Murdoch <benm@google.com> |
am 9cb4b295: (-s ours) Merge "Change WebView.setNetworkAvailable plumbing." into klp-dev
* commit '9cb4b295387c46126e4dbb2b0035310fa9f27038':
Change WebView.setNetworkAvailable plumbing.
|
| d6e95c617632e5632c3904a4c64ea03371102460 |
05-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 3108e9ae: (-s ours) Import translations. DO NOT MERGE
* commit '3108e9ae2611c0897a48188e45e4106c70e109da':
Import translations. DO NOT MERGE
|
| 986dd670edc0f298d01f4a4e6d198f6d7b0dcc17 |
05-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am df72e595: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'df72e59525a1a11ea4276e65620c18e21cbc22b2':
Import translations. DO NOT MERGE
|
| e2597b1c547bfd7fcb6e2610c787a7cf9d4eaf55 |
05-Dec-2013 |
Ben Murdoch <benm@google.com> |
am fe4c5712: (-s ours) Merge "Fix styled attribute resolution in WebView." into klp-dev
* commit 'fe4c571226f77a661de8e3a576ece2d9a314001e':
Fix styled attribute resolution in WebView.
|
| 9a85adf2eb511d7baf0c4b4d788c08bab2ef3f69 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am 57b714b4: (-s ours) Ferrying setBackgroundColor to the UI thread
* commit '57b714b4b5f44c9a385836c7074e4f879ad7a767':
Ferrying setBackgroundColor to the UI thread
|
| 9d577cd9072aa2f07cc546172c5114f8d1847d78 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am da5db0da: (-s ours) Merge "Fix for b/10428080: Check that apps are calling View methods on UI thread" into klp-dev
* commit 'da5db0dadd27c0fdd3b626b8705cb9b1d91d2da3':
Fix for b/10428080: Check that apps are calling View methods on UI thread
|
| ece8cb24f054482cdc2e6e8105e944b3e96a3145 |
05-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 369d3e50: (-s ours) Import translations. DO NOT MERGE
* commit '369d3e508c8468e09d858725a28c453e5dfa3a07':
Import translations. DO NOT MERGE
|
| 56ff8f93e9741bbb3f5f5963f00ef7df843a7495 |
05-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 89e6a8b8: (-s ours) Import translations. DO NOT MERGE
* commit '89e6a8b8a356d0bd3046dc3abd74b3dd7896a9e5':
Import translations. DO NOT MERGE
|
| eaea914002a12d4c8c693a4110cdd0c913582de1 |
05-Dec-2013 |
Tao Bai <michaelbai@google.com> |
am 3d52163e: (-s ours) Use evaluateJavaScriptEvenIfNotYetNavigated for loadUrl JavaScript:
* commit '3d52163e1c466860651414670c59762f5bdd269f':
Use evaluateJavaScriptEvenIfNotYetNavigated for loadUrl JavaScript:
|
| 78f145f41fa3bbda91014871840afc95b67e27e1 |
05-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am aa8a8f95: (-s ours) Import translations. DO NOT MERGE
* commit 'aa8a8f953177bc3ffa493e2bee69e9062a209bd7':
Import translations. DO NOT MERGE
|
| b23780e6cf46497a831b515405a31028ec280afc |
05-Dec-2013 |
Selim Gurun <sgurun@google.com> |
am 307a2740: (-s ours) Merge "Added the callback signal to the glue layer." into klp-dev
* commit '307a2740a4425c9714da2a5c007d0cccb4810429':
Added the callback signal to the glue layer.
|
| 2dea9af77f13795845d604325e43157e6d5b234c |
05-Dec-2013 |
Ben Murdoch <benm@google.com> |
am 33e1eeae: (-s ours) Show visible feedback that private browsing not supported.
* commit '33e1eeae98299666b8c2d1e879f92d1c83fe33fb':
Show visible feedback that private browsing not supported.
|
| 785eac86421ab306adbbdf2d175e2271edcd9af6 |
05-Dec-2013 |
Kristian Monsen <kristianm@google.com> |
am e9542c07: (-s ours) Merge "Temp fix for bug 10152369: Broken SW draw with multiple layers" into klp-dev
* commit 'e9542c07dd10a17adf5df9dbb421a99db05083ce':
Temp fix for bug 10152369: Broken SW draw with multiple layers
|
| c673dbdbfa853ed101dfc9193a34c14b5134cc78 |
05-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
automerger: download gn before generating makefiles.
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
hromium/tools/merge_from_chromium.py
|
| 2fc62636b11c3019e7ed1a132bc6c26a8705cada |
04-Dec-2013 |
Primiano Tucci <primiano@google.com> |
Merge "Update resources needed for colour picker." into master-chromium
|
| 79a1e3e73fa3e14642e44a80f4f475660d5e4b57 |
02-Dec-2013 |
Primiano Tucci <primiano@google.com> |
Update resources needed for colour picker.
Bug: 7621527
Match the upstream changes of crrev.com/23026006
Change-Id: I5645388cb599affc4ee8ed6e93cada330084286b
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_button_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_border.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/colors.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| 37ec00200aff23c50057bfcd22066d3af58ac5e7 |
02-Nov-2013 |
Selim Gurun <sgurun@google.com> |
Enable webview printing
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
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| edc70c88af24df137bc52560a907f2d5abcb2bf8 |
16-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
DO NOT MERGE: Support a prebuilt WebView.
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: I9cffbff67acccbbe9316d2442be314c207a38f2f
hromium/Android.mk
|
| 1c502c56a8964a72ccc1bcb0b6a0d8685aed983e |
29-Nov-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge "Allow CookieManager to be used without starting Chromium." into master-chromium
|
| a5caf2cf6f3e7d06f45286f971591848117c10af |
28-Nov-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r237746
This commit was generated by merge_to_master.py.
Change-Id: I9737950a60bd23242c69d52ab9d62b1348195f56
|
| 48c8233468f8c735d8504c8410b86cc373d679ed |
27-Jul-2013 |
Jonathan Dixon <joth@google.com> |
Connect up the showFileChooser client callback
Bug: 6930981
Full implementation depends on the associated API landing in frameworks/base
As as stop-gap, just fallback to calling the old never-published
openFileChooser in the default case.
Change-Id: I9f44dab183aab0c3431ecc7557aea78d9e78e50d
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 8be908c9c3af0debd0aeb0e4ff511dd16bcecf7b |
03-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Allow CookieManager to be used without starting Chromium.
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)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 8ec5fb8559251164082b3f050c090ceb740a14e8 |
26-Nov-2013 |
Ben Murdoch <benm@google.com> |
Remove dependency on UniquePtr.
Change-Id: Ic1ae9275216f9f33808083ceb88d0f34ff8eba0f
hromium/plat_support/graphics_utils.cpp
|
| 6c5c7a371291e4009323b45ca9b4a9f662966922 |
22-Nov-2013 |
Torne (Richard Coles) <torne@google.com> |
Add third_party/sfntly to merged project list.
Merge third_party/sfntly from Chromium to support skia printing.
Change-Id: I26f08c81f4d7e0aab64ab51edecec3632df6d619
hromium/tools/merge_common.py
|
| 2fbdaa7353e16996e874ea99f050a7b857dd92c4 |
20-Nov-2013 |
Ben Murdoch <benm@google.com> |
Reflect move of CommandLine from content/ to base/
Unblock the automerger.
Please see upstream review https://codereview.chromium.org/62333025/
for the details.
Change-Id: I967675ccfe1ede0f4eabd3f37804b61c6f21a000
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 700f46fbdfa21747caf7e8c44e74c92edf12926a |
08-Oct-2013 |
Jonathan Dixon <joth@google.com> |
For apps targeting JB MR2+, bind to the first thread using WebView
Bug 10937207
This reflects base change to bind to the first thread that instantiates
a WebView.
Change-Id: I2994db6e72b80ff24b93df3fbbd6c57ea9267657
(cherry picked from commit 916f857e0af25e8b179f60f532065386607567d7)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| fafc9af73efe42f4b37ade0b07624295bb86afe5 |
13-Nov-2013 |
Bo Liu <boliu@google.com> |
Add java resources after crrev.com/r234378
Change-Id: Ib00a68d6e7ade156ba5edd0b0d6e353a48d83369
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_autofill_text.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/colors.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
|
| 9252178615b356b7722ca04425e818addf86fa7d |
13-Nov-2013 |
Martin Kosiba <mkosiba@google.com> |
Merge "Stop using the test constructor." into master-chromium
|
| 03506360ed108ae00fad990fa49f7ada97fc7a04 |
11-Nov-2013 |
Kristian Monsen <kristianm@google.com> |
Remove a not dangerous warning from skia header files
Change-Id: I0f7718cd5beaa3c2428f9617a5051f515ae5e9e0
hromium/Android.mk
|
| c92fae9f066a95e7c8fff637961f2e26e994ff22 |
08-Nov-2013 |
Martin Kosiba <mkosiba@google.com> |
Stop using the test constructor.
This is to match http://crrev.com/40663002/
Change-Id: I339fc44eafaf601f7eefc78d1a4a19cb5f06b05c
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 26c0eaa0b61b34499180260c2ac9543199589955 |
05-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am bc0f8d36: (-s ours) am 5fc2b7c0: (-s ours) Import translations. DO NOT MERGE
* commit 'bc0f8d3645329287c8965168672def96c6c8212f':
Import translations. DO NOT MERGE
|
| bc0f8d3645329287c8965168672def96c6c8212f |
05-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 5fc2b7c0: (-s ours) Import translations. DO NOT MERGE
* commit '5fc2b7c0aa383e8c693e7292081e81c6a2944d53':
Import translations. DO NOT MERGE
|
| 57f39b97561187c13c4903afdae51c3c9c1cc209 |
05-Nov-2013 |
Ben Murdoch <benm@google.com> |
Tidy up WebViewChromiumFactoryProvider.
Clarify log message about UI thread binding and move functions
to their correct place in the file structure.
Change-Id: I4c201ba9141590b71a492e975ae6e3f40ddbdef1
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 2ab6417d7548a6c13700dbeea0782c8efbd34ede |
03-Oct-2013 |
Ben Murdoch <benm@google.com> |
Enable favicon downloading.
If an app is targetting >= K, always download favicons (as the legacy
method for enabling the behavior is deprecated). Also enable favicon
downloading for legacy apps that use the deprecated method.
Bug: 10825362
Change-Id: Ia0037365fc7211cdf01714d8385907f017225386
(cherry picked from commit 54bae732019ac13327c0a68a6f8a82548d73ea9e)
hromium/java/com/android/webview/chromium/WebIconDatabaseAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 5fc2b7c0aa383e8c693e7292081e81c6a2944d53 |
04-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ie9541d4a4a1dd1ddab22aecaf6243d6837b91fdb
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
|
| fa14014161c4f0bc0e99d926cacb7071b8d903ef |
27-Sep-2013 |
Ben Murdoch <benm@google.com> |
Do not assume WebView is running on the main thread.
Cherry pick of Change-Id: I981136571782352889684e4c3181d8cc22a1679d
WebView will run at most one UI thread per process, but that
thread is not necessarily the main thread.
If the first WebView that an app constructs is on the main thread,
then we will bind Chromium's notion of the UI thread to the main
thread. This mitigates the risk introduced by this refactoring for the vast
majority of apps that create their Views on the main thread.
In the case that the WebView is created on a background thread, we delay
binding of Chromium's notion of the UI thread until we get a clear
signal from the apps usage of WebView that it is intended to use that
background thread as an Android UI thread.
In the case that the app does not intend to use the thread it creates
the WebView on as an Android UI thread, we defer as long as possible
before we are required to run operations that require Chromium to be
started, at which point we bind to the main thread. This covers the case
that an app creates WebView on a background thread to read some state
from it (e.g. the user agent) and then later intends to use WebView
as a View on the main thread.
This change does not support:
- Apps that create more than one Android UI thread in the same process
and expect to use a WebView as a View on both of them.
Bug 10932261
Conflicts:
chromium/java/com/android/webview/chromium/WebViewChromium.java
Change-Id: Ief406e30d12b201b6cac2c10c73a0aa0631ca900
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| f574d96ff2e79ab1aab64c0ab98c65d17c8608fc |
01-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 6a43bd4c417e7cd0e9889f8b02b893a1c2065b44 |
31-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r232015
This commit was generated by merge_to_master.py.
Change-Id: I14f4b198cd79af60384671c8393ddc09894652f4
|
| 8009977db575433507a018e0bc903376aac6815d |
30-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
am 3ba0b9a1: am cf686f7a: Revert "Support a prebuilt WebView."
* commit '3ba0b9a13dadcc75e2078c6a6567d8656360b160':
Revert "Support a prebuilt WebView."
|
| 3ba0b9a13dadcc75e2078c6a6567d8656360b160 |
30-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
am cf686f7a: Revert "Support a prebuilt WebView."
* commit 'cf686f7adb1cbc4efe3e93ae69b040d328b0e23f':
Revert "Support a prebuilt WebView."
|
| 90922c76654a24d001f8f14cb17206adbb675c92 |
30-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Iabb3633846838abfc2077e41f72ed334d144d3b1
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
|
| cf686f7adb1cbc4efe3e93ae69b040d328b0e23f |
30-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Revert "Support a prebuilt WebView."
To work around framework resource IDs not being constant, go back to
building webviewchromium.jar from source.
This reverts commit 9c9341f1d2368b4209fe982f3f1c5de384f67fb7.
Bug: 11426593
hromium/Android.mk
|
| aa1f358fa0a856119e93a262a76a5fad9b6386cc |
24-Oct-2013 |
Martin Kosiba <mkosiba@google.com> |
Make the onScrollChange implementation a no-op.
Chromium calls this method from ContentViewCore, but it shouldn't
be called this way for the WebView.
Change-Id: I01592cd3b2fc1020c23a692cc00a4a7f1bf81d07
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| e9cbca9b8fd7ddcdf247c534121457a9abd4a0e4 |
16-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Support a prebuilt WebView.
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: I236fd98916f2a20006c946c0a0c8b317e77dafd1
(cherry picked from commit 9c9341f1d2368b4209fe982f3f1c5de384f67fb7)
hromium/Android.mk
|
| e7fca2816e860b7e2be11d743561b96300fca91e |
24-Oct-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Possible fix for bug b/11114227: Occasional crash on rotation" into master-chromium
|
| bd4bc1ac4b664f0137544d6a5cc28d81919a6b5c |
24-Oct-2013 |
Kristian Monsen <kristianm@google.com> |
Possible fix for bug b/11114227: Occasional crash on rotation
Checking the View has a parent before sending the longclick.
Manually cherry-picked from klp-dev:
(Change-Id: I6d4ff5d5b726d1d1220891099754195e2616dd8b)
Change-Id: I5de2f6b052b6c1262af87678321a35317721a3e0
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 8a75592b1d7f07f2a4c0d4f9a1a30252c9ffd483 |
24-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I6b0c8df7cad3b55f176eaddd01f28dd6b73fbf15
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| 86abeb66b6f8237f85ccce79495f15ace437a96a |
07-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Optimize the complex clip case
Bug 10152369
This can save considerable time on each draw
Change-Id: Id195f1e691f1cbc92efcbfdf357fa93e01e4e241
(cherry picked from commit 3603a870e2edfac7b6430796971eca72b6d02924)
hromium/plat_support/graphics_utils.cpp
|
| 1f2093ddb4f8da5663e1c4c6ce37927d6ea2df0c |
22-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 0444ece2ae7debcba1499393d646b5a39e3d788e |
22-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r230120
This commit was generated by merge_to_master.py.
Change-Id: Id32f5110501fcdfd0898011221ce81275cee8290
|
| 031cc89c1a241b593fd851cd3f8a96188fb2cbcf |
22-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Make string descriptions more explicit.
Add more context to the profiler strings to make it clear to
translators.
Bug: 11305836
Change-Id: Ic6156d3b4b09cd212dff7c776cf65f868fdc1e59
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| 9473d328ddee43aa4a9dfad05a86d12a068f1af1 |
21-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: If25cb1dbae27bc7a826a2c4635ebb363a5ce7030
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| 0d09882cf767f2ed8c1c7764eb47f307d4332801 |
18-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Record merge up to 315d507 from klp-dev to master-chromium.
This merge is a no-op; pushing to record that the branches had not
diverged until after this point.
Change-Id: Idad19735b4d0d8e038238e2be570db2117387ee5
|
| 727a0f0f7fd00bb28c5299454e5c249284c64ed8 |
18-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r228962
This commit was generated by merge_to_master.py.
Change-Id: I64358ed1bf10189777b1883c444a38f513c466d0
|
| 35cba6a3325867f74a277a5baa9cfc4e53db5c29 |
17-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am 16448f0d: am dcd99113: merge in klp-release (no-op)
* commit '16448f0df5f5dab200e01ac5010294bfd50ec233':
Do not assume WebView is running on the main thread.
|
| 16448f0df5f5dab200e01ac5010294bfd50ec233 |
17-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am dcd99113: merge in klp-release (no-op)
* commit 'dcd9911315bc6864b61d1d76ca0ff3904227889b':
Do not assume WebView is running on the main thread.
|
| dcd9911315bc6864b61d1d76ca0ff3904227889b |
17-Oct-2013 |
Ed Heyl <edheyl@google.com> |
merge in klp-release (no-op)
|
| 2c2f2d15a1876d2e1f118087e7e6afbd4f600bd1 |
16-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
am 6c911270: am 9c9341f1: Support a prebuilt WebView.
* commit '6c911270f0610e3bf3062f53159f94e5919b4b91':
Support a prebuilt WebView.
|
| 6c911270f0610e3bf3062f53159f94e5919b4b91 |
16-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
am 9c9341f1: Support a prebuilt WebView.
* commit '9c9341f1d2368b4209fe982f3f1c5de384f67fb7':
Support a prebuilt WebView.
|
| 17cd884446d243f8ef74b99ef9d617699953419a |
16-Oct-2013 |
Primiano Tucci <primiano@google.com> |
Re-enable synthetic memory signal for pagecycler tests.
This was commented out last week to unlock the automerger
due to some changes upstream, which have been resynced.
Change-Id: Iccaaae5ceff11b0cbf90c30d1a2aa3b325197716
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 9c9341f1d2368b4209fe982f3f1c5de384f67fb7 |
16-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Support a prebuilt WebView.
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: I236fd98916f2a20006c946c0a0c8b317e77dafd1
hromium/Android.mk
|
| becadfeac509ca2253520ceb46b7b0b59b85a66b |
15-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Add profiler toast strings to resource overlay.
We don't currently use the profiler but we may want to support this in
future, so add the strings to satisfy the upstream code for now.
Change-Id: Ic070e4433690bd8e0915be669a22b2fa13b00138
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| 7d71762c9c19fecd582fc64b63270c216b5de19a |
12-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Remove the classic WebView from the build.
Remove the dependency from the dummy "webview" module to libwebcore now
that webviewchromium is being used instead.
Bug: 10427705
Change-Id: I5a489b2b353f0d0fa862ab47ec28f75c09fdcffc
(cherry picked from commit 64e5b2d4d918724baaa4182309d8b02e7aa075e3)
ndroid.mk
|
| 64e5b2d4d918724baaa4182309d8b02e7aa075e3 |
12-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Remove the classic WebView from the build.
Remove the dependency from the dummy "webview" module to libwebcore now
that webviewchromium is being used instead.
Bug: 10427705
Change-Id: I5a489b2b353f0d0fa862ab47ec28f75c09fdcffc
ndroid.mk
|
| 7d985c36a5e956f99d414d8035323bed0c62ade4 |
14-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| fa3b58410041e7dc42c8b8a9f50311af4d3cc8ea |
14-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
am 21ebcdeb: am 908391fe: Merge "Remove the classic WebView from the build." into klp-dev
* commit '21ebcdeb00d23060bff882d954ef5e2183c235d8':
Remove the classic WebView from the build.
|
| 21ebcdeb00d23060bff882d954ef5e2183c235d8 |
14-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
am 908391fe: Merge "Remove the classic WebView from the build." into klp-dev
* commit '908391fee972492bdb5d8b179b4d9e8a01719003':
Remove the classic WebView from the build.
|
| 908391fee972492bdb5d8b179b4d9e8a01719003 |
14-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge "Remove the classic WebView from the build." into klp-dev
|
| 780460e70baa6eeb9dd596248384c6dd6a05673f |
11-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Provide a video poster even if the client doesn't.
To match the behaviour of the old webview, use the framework resource
ic_media_video_poster as the default video poster if the WebChromeClient
provided by the client doesn't give us one.
Bug: 11158656
Change-Id: Id8c5b4e546081ed765356c38308cf1b6f198109d
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| d3d0b6cb92144426f9f0509d0118f2eee44af6f1 |
13-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| bde202bd4383b83195d3a90f413b1a331a93f21f |
13-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
am f27e19e4: am 6138d17c: Provide a video poster even if the client doesn\'t.
* commit 'f27e19e4703e49dd894550dc4dcff2064f347627':
Provide a video poster even if the client doesn't.
|
| f27e19e4703e49dd894550dc4dcff2064f347627 |
13-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
am 6138d17c: Provide a video poster even if the client doesn\'t.
* commit '6138d17c5fd136a215078b4a9ae818d73cfa8b9a':
Provide a video poster even if the client doesn't.
|
| 6138d17c5fd136a215078b4a9ae818d73cfa8b9a |
11-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Provide a video poster even if the client doesn't.
To match the behaviour of the old webview, use the framework resource
ic_media_video_poster as the default video poster if the WebChromeClient
provided by the client doesn't give us one.
Bug: 11158656
Change-Id: Id8c5b4e546081ed765356c38308cf1b6f198109d
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 2eea62d908f8194025f8b3c9fd9066606b9709ca |
10-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 79d44b7ebe3b645d23ce3fd79defa139b94cbc6d |
10-Oct-2013 |
Jonathan Dixon <joth@google.com> |
am 80c0348f: am 58ca6d4c: Merge "Set the webview-classic-workarounds for targetSDk < KLP" into klp-dev
* commit '80c0348fe2315235bbba4911faeb7f5abf5560a4':
Set the webview-classic-workarounds for targetSDk < KLP
|
| 80c0348fe2315235bbba4911faeb7f5abf5560a4 |
10-Oct-2013 |
Jonathan Dixon <joth@google.com> |
am 58ca6d4c: Merge "Set the webview-classic-workarounds for targetSDk < KLP" into klp-dev
* commit '58ca6d4c0f3ea5d35d313ac13915a5a6b5c1ce9e':
Set the webview-classic-workarounds for targetSDk < KLP
|
| 58ca6d4c0f3ea5d35d313ac13915a5a6b5c1ce9e |
10-Oct-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Set the webview-classic-workarounds for targetSDk < KLP" into klp-dev
|
| b965bec90a986fbd4fb7ffc4fe3ff08bf7fd380e |
25-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Set the webview-classic-workarounds for targetSDk < KLP
Bug 10569530
Change-Id: I943b18c2a6af3c860720a2d31348a700e0903a82
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 67f4c5798ee4270bc0918b2cd5a14a5bc4213ee5 |
10-Oct-2013 |
Jonathan Dixon <joth@google.com> |
am e20e606c: am a679c945: Merge "For apps targeting JB MR2+, bind to the first thread using WebView" into klp-dev
* commit 'e20e606c53ea0972ccfde4af2933239cefb4fa8b':
For apps targeting JB MR2+, bind to the first thread using WebView
|
| e20e606c53ea0972ccfde4af2933239cefb4fa8b |
10-Oct-2013 |
Jonathan Dixon <joth@google.com> |
am a679c945: Merge "For apps targeting JB MR2+, bind to the first thread using WebView" into klp-dev
* commit 'a679c94584888adc39738c132940cdc6f0244618':
For apps targeting JB MR2+, bind to the first thread using WebView
|
| a679c94584888adc39738c132940cdc6f0244618 |
10-Oct-2013 |
Jonathan Dixon <joth@google.com> |
Merge "For apps targeting JB MR2+, bind to the first thread using WebView" into klp-dev
|
| 916f857e0af25e8b179f60f532065386607567d7 |
08-Oct-2013 |
Jonathan Dixon <joth@google.com> |
For apps targeting JB MR2+, bind to the first thread using WebView
Bug 10937207
This reflects base change to bind to the first thread that instantiates
a WebView.
Change-Id: I2994db6e72b80ff24b93df3fbbd6c57ea9267657
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| ec6fb3195c38668a0abf73ea9d9962d1d0487276 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am fbc8a2b6: am 80f7472a: merge in KFS78N (no-op)
* commit 'fbc8a2b65904209dde7de49d961f2ea5acdca791':
Remove the classic WebView from the build.
|
| fbc8a2b65904209dde7de49d961f2ea5acdca791 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am 80f7472a: merge in KFS78N (no-op)
* commit '80f7472a95cdbbf85a62431bf061eeef29c9d697':
Remove the classic WebView from the build.
|
| 80f7472a95cdbbf85a62431bf061eeef29c9d697 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
merge in KFS78N (no-op)
|
| af474733ba53d94b19f39f1b399aac13b942d841 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am 2fbef71c: am 9e69c423: merge in KQS81M
* commit '2fbef71cfd9ae8ffde8c3e9a2e5ccc5ce8ae33c2':
Post all functions returning a value to the UI thread
Import translations. DO NOT MERGE
Use evaluateJavaScriptEvenIfNotYetNavigated for loadUrl JavaScript:
Temp fix for bug 10152369: Broken SW draw with multiple layers
|
| 2fbef71cfd9ae8ffde8c3e9a2e5ccc5ce8ae33c2 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am 9e69c423: merge in KQS81M
* commit '9e69c42340f1c8e620e416d9427443466280e876':
Post all functions returning a value to the UI thread
Import translations. DO NOT MERGE
Use evaluateJavaScriptEvenIfNotYetNavigated for loadUrl JavaScript:
Temp fix for bug 10152369: Broken SW draw with multiple layers
|
| 9e69c42340f1c8e620e416d9427443466280e876 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
merge in KQS81M
|
| 3e9cdbe3fe00ef50eff256e7b5f4b6a1ae796ec5 |
12-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Remove the classic WebView from the build.
Remove the dependency from the dummy "webview" module to libwebcore now
that webviewchromium is being used instead.
Bug: 10427705
Change-Id: I5a489b2b353f0d0fa862ab47ec28f75c09fdcffc
ndroid.mk
|
| 9dea77e53b16ad59d1f78a7b069da7a63c27d196 |
08-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| ac95ff766dc80d25310a9f8f0adf34fed09ca900 |
08-Oct-2013 |
Primiano Tucci <primiano@google.com> |
Unlock the automerger: remove simulateMemoryPressureSignal.
The semantic of simulateMemoryPressureSignal is changed and a fix
upstream is required. Commenting out the code for the moment to
unlock the automerger.
Change-Id: I5c06ec53e164d8162d03e861206f043cce829981
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 981878950505552e834eaf2ab967263a3f995350 |
08-Oct-2013 |
Kristian Monsen <kristianm@google.com> |
am d228ba84: am 91472035: Merge "Possible fix for bug b/11114227: Occasional crash on rotation" into klp-dev
* commit 'd228ba84ae24e8967d88cfdd7cbe0646887c4969':
Possible fix for bug b/11114227: Occasional crash on rotation
|
| d228ba84ae24e8967d88cfdd7cbe0646887c4969 |
08-Oct-2013 |
Kristian Monsen <kristianm@google.com> |
am 91472035: Merge "Possible fix for bug b/11114227: Occasional crash on rotation" into klp-dev
* commit '91472035f666e633d4c299617ae1b20ccd3b6e0c':
Possible fix for bug b/11114227: Occasional crash on rotation
|
| 91472035f666e633d4c299617ae1b20ccd3b6e0c |
08-Oct-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Possible fix for bug b/11114227: Occasional crash on rotation" into klp-dev
|
| 59a30ac62fdd1e22b59776547730ac8d8be68531 |
08-Oct-2013 |
Kristian Monsen <kristianm@google.com> |
Possible fix for bug b/11114227: Occasional crash on rotation
Checking the View has a parent before sending the longclick.
Change-Id: I6d4ff5d5b726d1d1220891099754195e2616dd8b
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 64119316903c3e05838ca7408239799c765a06e6 |
07-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| ee39947f3c52e56c8c990029f1fe4bcb0802bada |
07-Oct-2013 |
Ben Murdoch <benm@google.com> |
am 80e37218: am 1bd0fb5f: Merge "Enable favicon downloading." into klp-dev
* commit '80e37218a065b6785d921cd54d7992581ca554cb':
Enable favicon downloading.
|
| 80e37218a065b6785d921cd54d7992581ca554cb |
07-Oct-2013 |
Ben Murdoch <benm@google.com> |
am 1bd0fb5f: Merge "Enable favicon downloading." into klp-dev
* commit '1bd0fb5f6962e25d89aa61e0f3098ac57c446fe8':
Enable favicon downloading.
|
| 1bd0fb5f6962e25d89aa61e0f3098ac57c446fe8 |
07-Oct-2013 |
Ben Murdoch <benm@google.com> |
Merge "Enable favicon downloading." into klp-dev
|
| 88dafefe39dde25c8a2b7bc20c749f171bfc26ff |
06-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 03846c52dec6fc90e2b99157ac4b4f77db3f8277 |
04-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am b858a596: (-s ours) am 183f750a: (-s ours) Import translations. DO NOT MERGE
* commit 'b858a596cb907d328da72dc70427bbc276133dee':
Import translations. DO NOT MERGE
|
| 3608161adc8273c8b02f971e7efa3eeefdbe4d19 |
04-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 8d4e76dd: (-s ours) Import translations. DO NOT MERGE
* commit '8d4e76dd713677372b6d41cfff00a422aed7632b':
Import translations. DO NOT MERGE
|
| b858a596cb907d328da72dc70427bbc276133dee |
04-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 183f750a: (-s ours) Import translations. DO NOT MERGE
* commit '183f750ae29f7eef752a21a48fe0c45c300d3c78':
Import translations. DO NOT MERGE
|
| 8d4e76dd713677372b6d41cfff00a422aed7632b |
04-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Id9c857be16a3b6646572d2d9ed8ddc3898a99261
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
|
| 183f750ae29f7eef752a21a48fe0c45c300d3c78 |
04-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ia8d6f3701aa4674b0ac30f596a257605b58e70a7
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
|
| cadd6d4ffd526825865bc0cbb252350bb097eaa3 |
04-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
am 9dab5652: Allow CookieManager to be used without starting Chromium.
* commit '9dab5652ee2433cb990baca967d4331be0b2d3f3':
Allow CookieManager to be used without starting Chromium.
|
| 54bae732019ac13327c0a68a6f8a82548d73ea9e |
03-Oct-2013 |
Ben Murdoch <benm@google.com> |
Enable favicon downloading.
If an app is targetting >= K, always download favicons (as the legacy
method for enabling the behavior is deprecated). Also enable favicon
downloading for legacy apps that use the deprecated method.
Bug: 10825362
Change-Id: Ia0037365fc7211cdf01714d8385907f017225386
hromium/java/com/android/webview/chromium/WebIconDatabaseAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 9dab5652ee2433cb990baca967d4331be0b2d3f3 |
03-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Allow CookieManager to be used without starting Chromium.
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
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| e66f89d5642b421a008126d31644984a0df001fd |
04-Oct-2013 |
Ben Murdoch <benm@google.com> |
am 30c0a035: Do not assume WebView is running on the main thread.
* commit '30c0a035f7c865ee300a3d8a9a3e515a66c6a818':
Do not assume WebView is running on the main thread.
|
| b95ac390e1f373ad0a31d628d283d5a7891ddd46 |
27-Sep-2013 |
Ben Murdoch <benm@google.com> |
Do not assume WebView is running on the main thread.
WebView will run at most one UI thread per process, but that
thread is not necessarily the main thread.
If the first WebView that an app constructs is on the main thread,
then we will bind Chromium's notion of the UI thread to the main
thread. This mitigates the risk introduced by this refactoring for the vast
majority of apps that create their Views on the main thread.
In the case that the WebView is created on a background thread, we delay
binding of Chromium's notion of the UI thread until we get a clear
signal from the apps usage of WebView that it is intended to use that
background thread as an Android UI thread.
In the case that the app does not intend to use the thread it creates
the WebView on as an Android UI thread, we defer as long as possible
before we are required to run operations that require Chromium to be
started, at which point we bind to the main thread. This covers the case
that an app creates WebView on a background thread to read some state
from it (e.g. the user agent) and then later intends to use WebView
as a View on the main thread.
This change does not support:
- Apps that create more than one Android UI thread in the same process
and expect to use a WebView as a View on both of them.
Bug 10932261
Change-Id: I981136571782352889684e4c3181d8cc22a1679d
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 30c0a035f7c865ee300a3d8a9a3e515a66c6a818 |
27-Sep-2013 |
Ben Murdoch <benm@google.com> |
Do not assume WebView is running on the main thread.
WebView will run at most one UI thread per process, but that
thread is not necessarily the main thread.
If the first WebView that an app constructs is on the main thread,
then we will bind Chromium's notion of the UI thread to the main
thread. This mitigates the risk introduced by this refactoring for the vast
majority of apps that create their Views on the main thread.
In the case that the WebView is created on a background thread, we delay
binding of Chromium's notion of the UI thread until we get a clear
signal from the apps usage of WebView that it is intended to use that
background thread as an Android UI thread.
In the case that the app does not intend to use the thread it creates
the WebView on as an Android UI thread, we defer as long as possible
before we are required to run operations that require Chromium to be
started, at which point we bind to the main thread. This covers the case
that an app creates WebView on a background thread to read some state
from it (e.g. the user agent) and then later intends to use WebView
as a View on the main thread.
This change does not support:
- Apps that create more than one Android UI thread in the same process
and expect to use a WebView as a View on both of them.
Bug 10932261
Change-Id: I981136571782352889684e4c3181d8cc22a1679d
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| bd0438c2d08727a41632dd98aeb95b949561fcca |
02-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Iae87cc1fc58cb9f8dcd0877a3e472ea0438bd2c2
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
|
| 9017f9d3e01d2789bb5c79188ee97263c01eac93 |
01-Oct-2013 |
Bo Liu <boliu@google.com> |
Merge "Use View.executeHardwareAction for onDetachedFromWindow" into master-chromium
|
| 8b20f316b2854feabc81faaeb2a3e7fcd17169a5 |
01-Oct-2013 |
Bo Liu <boliu@google.com> |
am 157c78cf: Use View.executeHardwareAction for onDetachedFromWindow
* commit '157c78cfd4127a0b39d3c55c95c7cec23ccdc234':
Use View.executeHardwareAction for onDetachedFromWindow
|
| aa71119694b43898207e117e8b86f28dd02c24dd |
30-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I696c0b4031960a5efef9bfdb88f248ba6a890475
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
|
| 87f98ae5faf489507c164a0e0b95c9ca358d8017 |
29-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 35e8d5750feeb1fa86458a8c341ecc2a415c80de |
27-Sep-2013 |
Bo Liu <boliu@google.com> |
Use View.executeHardwareAction for onDetachedFromWindow
If AwContents has hardware resources to clean up in
onDetachedFromWindow (ie functor is not null), then use
View.executeHardwareAction to ensure that a context is current in
detach.
BUG: 10911502
Change-Id: I69392745cc375bc2f804fbc056d29d58ce06c000
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 157c78cfd4127a0b39d3c55c95c7cec23ccdc234 |
27-Sep-2013 |
Bo Liu <boliu@google.com> |
Use View.executeHardwareAction for onDetachedFromWindow
If AwContents has hardware resources to clean up in
onDetachedFromWindow (ie functor is not null), then use
View.executeHardwareAction to ensure that a context is current in
detach.
BUG: 10911502
Change-Id: I69392745cc375bc2f804fbc056d29d58ce06c000
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 62e6d002bb3d8a5b797f4dc31636d14c70d2f194 |
21-Sep-2013 |
Ben Murdoch <benm@google.com> |
Wire up Select Action Bar in WebView.
Bug: 10800319
Change-Id: I59445237e0e328417175386239f33ce71c465eea
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/menu/webviewchromium_select_action_menu.xml
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
|
| 2c5041edf462182ade763e7ae022542f9748e5d7 |
26-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r225410
This commit was generated by merge_to_master.py.
Change-Id: I118c0c1ae2c309d6e8ee91cdf1dee758544bdac8
|
| 04866777d9e3caf1acd4cacd3048d34bd953f724 |
26-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 566bea1e27142dd335bfc24ed8fd654b4e933478 |
26-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am 4cde2296: Making super_onGenericMotionEvent call the super event
* commit '4cde2296b2a773d3139ed97daa097eefa42b511a':
Making super_onGenericMotionEvent call the super event
|
| 4cde2296b2a773d3139ed97daa097eefa42b511a |
24-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Making super_onGenericMotionEvent call the super event
Part of fix for bug 9230062
Change-Id: I41264cde1105b7eca25e8e4adbccc1d591ddb2e7
(cherry picked from commit ae81cc9f8d4a6af28017849a637dc61186c04d60)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| e52200834054790488efb316ead4ce5ca5e307f1 |
25-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Making super_onGenericMotionEvent call the super event" into master-chromium
|
| d6d1cd422a0f847d02a7879dd52bab80b45b22f3 |
25-Sep-2013 |
Bo Liu <boliu@google.com> |
Revert "Chromium WebView warn long URLs"
BUG: 10742235
As discussed in bug, we no longer want to enforce a limit since long term
plan will not have a limit.
This reverts commit 4176c4ec32e59d659f63f8f7425329755ff44668.
Change-Id: I82ef6dd2883acc46701e64f4e52fd9852586e532
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 9086b7ebcca8cbc86a5f34e3404a7ae3e27ee8fe |
25-Sep-2013 |
Ben Murdoch <benm@google.com> |
am 588476c7: Wire up Select Action Bar in WebView.
* commit '588476c7a7151edd9f01401cd905c8b7229b2b75':
Wire up Select Action Bar in WebView.
|
| bb42bdd82b086631af5479824c5bc630266f1084 |
25-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| ae81cc9f8d4a6af28017849a637dc61186c04d60 |
24-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Making super_onGenericMotionEvent call the super event
Part of fix for bug 9230062
Change-Id: I41264cde1105b7eca25e8e4adbccc1d591ddb2e7
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 4176c4ec32e59d659f63f8f7425329755ff44668 |
24-Sep-2013 |
Bo Liu <boliu@google.com> |
Chromium WebView warn long URLs
Chromium has a URL restriction of no longer than 2M. For content of this
size, should prefer using WebViewClient#shouldInterceptRequest instead
for memory and performance reasons.
For apps targeting pre-K, log a message. And for apps targetting K or
later, throw an IllegalArgumentException instead.
BUG: 10742235
Change-Id: Ia5ea31ff55c77aecc404aa9bd344f20195ed32e0
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| bb536e9ccbe4357a7ad5d2ae0bdbb1d21ca7624c |
24-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 588476c7a7151edd9f01401cd905c8b7229b2b75 |
21-Sep-2013 |
Ben Murdoch <benm@google.com> |
Wire up Select Action Bar in WebView.
Bug: 10800319
Change-Id: I0a855f97c8229b2bb3d325ad62e8ff7a103ae8b1
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/menu/webviewchromium_select_action_menu.xml
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
|
| b929ead04d8006c08494442a2e7722897171411b |
24-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am d21b8fe0: Using the chromium clearView implementation
* commit 'd21b8fe00b21742cc36929cb02eef6ad25946512':
Using the chromium clearView implementation
|
| d21b8fe00b21742cc36929cb02eef6ad25946512 |
21-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Using the chromium clearView implementation
Landed upstream in:
https://codereview.chromium.org/22849016/
Fix for bug 5012842
Change-Id: I74e2822bb41ba4fb6f6b73248bef52d423c7903b
(cherry picked from commit 618af7f3f0bf2d0713e1e38e4dbd041c3ba8a299)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 0aad9c7d2ada22ec46f33d13b01f2abc9a7027fe |
23-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Using the chromium clearView implementation" into master-chromium
|
| f586a7b21dba403276acba6b2668b613e5368bd7 |
22-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| ce9af55ead7f34c32cd4b9e8e768e5b8143f51c0 |
21-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Implement the new WebView.setWebContentsDebuggingEnabled API" into master-chromium
|
| feac794dbbf370a88467e8ff6fde82ab6e2fc85a |
21-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Revert "Add empty setWebContentsDebuggingEnabled implementation"
The underlying http://crrev.com/224607 rolled in so can now replace this with the real implementation
This reverts commit 08b38428998be747f4c1c4abc43b96648ecb53dd.
Change-Id: I10f31b9b8ac45a24cb05092db41eed03dbb1d591
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 9d0315cd966ad486abfcb51afa6692249461d14c |
18-Sep-2013 |
Mikhail Naganov <mnaganov@google.com> |
Implement the new WebView.setWebContentsDebuggingEnabled API
BUG: 8691809
Change-Id: I62441515da9bf70712305ba245db53bb22f52fbf
(cherry picked from commit d9e4aedf3d14b3494d54dbb482ece3603d0f693d)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 08b38428998be747f4c1c4abc43b96648ecb53dd |
21-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Add empty setWebContentsDebuggingEnabled implementation
Temporary patch to keep master building. This should be reverted when
the next master-chromium merge containing crrev.com/224607 and
go/ag/361664 have been rolled in.
Change-Id: I2cf15c05552a64b7f24b4d19b2faeeb382810763
(cherry picked from commit 98f658a9e611f7fad4a4fc4d2b6d737571361ff0)
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 98f658a9e611f7fad4a4fc4d2b6d737571361ff0 |
21-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Add empty setWebContentsDebuggingEnabled implementation
Temporary patch to keep master building. This should be reverted when
the next master-chromium merge containing crrev.com/224607 and
go/ag/361664 have been rolled in.
Change-Id: I2cf15c05552a64b7f24b4d19b2faeeb382810763
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| a9a383c5bb9ef8f414c36cdfad41baad5db131eb |
21-Sep-2013 |
Jonathan Dixon <joth@google.com> |
am e36bb83b: Revert "Revert "Implement the new WebView.setWebContentsDebuggingEnabled API""
* commit 'e36bb83b4a1907d71527d3a8ef54db1ec8de3188':
Revert "Revert "Implement the new WebView.setWebContentsDebuggingEnabled API""
|
| e36bb83b4a1907d71527d3a8ef54db1ec8de3188 |
21-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Revert "Revert "Implement the new WebView.setWebContentsDebuggingEnabled API""
This reverts commit 36cab4579d7633fa3bc89bd550a01cc0e39fb163.
Change-Id: I57caa1c4ce572ecb70ef1a06fa6b0f6c78d2bc2d
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 618af7f3f0bf2d0713e1e38e4dbd041c3ba8a299 |
21-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Using the chromium clearView implementation
Landed upstream in:
https://codereview.chromium.org/22849016/
Fix for bug 5012842
Change-Id: I74e2822bb41ba4fb6f6b73248bef52d423c7903b
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| d924c94e26bf605f0a74a3fdbab0be2188cbc593 |
21-Sep-2013 |
Jonathan Dixon <joth@google.com> |
am 36cab457: Revert "Implement the new WebView.setWebContentsDebuggingEnabled API"
* commit '36cab4579d7633fa3bc89bd550a01cc0e39fb163':
Revert "Implement the new WebView.setWebContentsDebuggingEnabled API"
|
| 36cab4579d7633fa3bc89bd550a01cc0e39fb163 |
21-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Revert "Implement the new WebView.setWebContentsDebuggingEnabled API"
chromium_org this relies on is reverted so this must be too.
This reverts commit d9e4aedf3d14b3494d54dbb482ece3603d0f693d.
Change-Id: I260c806028eb5368cb639876a727ce710e9b4f2b
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 4f713e7b7d992e1f641fd1874ca387f31cb51af3 |
21-Sep-2013 |
Mikhail Naganov <mnaganov@google.com> |
am d9e4aedf: Implement the new WebView.setWebContentsDebuggingEnabled API
* commit 'd9e4aedf3d14b3494d54dbb482ece3603d0f693d':
Implement the new WebView.setWebContentsDebuggingEnabled API
|
| 0b433af141a42880f2530a61137a30cad6ac9581 |
19-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r224184
This commit was generated by merge_to_master.py.
Change-Id: I2a06d53fd76f4cbc1249a3bd86f2dcc30e3f90b6
|
| d9e4aedf3d14b3494d54dbb482ece3603d0f693d |
18-Sep-2013 |
Mikhail Naganov <mnaganov@google.com> |
Implement the new WebView.setWebContentsDebuggingEnabled API
BUG: 8691809
Change-Id: I62441515da9bf70712305ba245db53bb22f52fbf
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 2addc1f198d30a63e727c1dc15864256b5e2b6c0 |
19-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 1a5671b0efb16a857e58a47294e3358f90545f6c |
19-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am 1a0ca658: Posting additional log message if apps have a blocked URL
* commit '1a0ca658d1d188ed9dc9b2163be0f2ee89e06a1e':
Posting additional log message if apps have a blocked URL
|
| 1a0ca658d1d188ed9dc9b2163be0f2ee89e06a1e |
18-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Posting additional log message if apps have a blocked URL
This is to make sure it is easy to spot even if app
intentionally override it.
Partial fix for bug 10570054
Change-Id: Ic100ed110c69488a489bb303597a6cbcd852806b
(cherry picked from commit cd7ea20fdcedc8cf0a8beb9e3a0f3ec2e7955a29)
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 7c1d85bba3249a0892fd3046b5f1b9d4865cd058 |
19-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Posting additional log message if apps have a blocked URL" into master-chromium
|
| cd7ea20fdcedc8cf0a8beb9e3a0f3ec2e7955a29 |
18-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Posting additional log message if apps have a blocked URL
This is to make sure it is easy to spot even if app
intentionally override it.
Change-Id: Ic100ed110c69488a489bb303597a6cbcd852806b
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 34f562167480492c26ce185e97f97476808b2623 |
18-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| af08cec61ed296aad7fec631daa028c7ae6f43da |
18-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 00dfede53188dfe7a61a921a50dacc07914f1ff0 |
18-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am a6229846: Adding a fake on page started for data url\'s since we know it wont be sent
* commit 'a622984698ea393f81ce968ec87bab75087af7dc':
Adding a fake on page started for data url's since we know it wont be sent
|
| a622984698ea393f81ce968ec87bab75087af7dc |
16-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Adding a fake on page started for data url's since we know it wont be sent
Fix for bug 10570052
Change-Id: Ib4d6373da2601e0165a9f44160d2d465daeadcdf
(cherry picked from commit f401798d628ddb492defeb0a00bf289284d1677a)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 53fc207e8b5079af5edfef849996a7e5dda01364 |
17-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Adding a fake on page started for data url's since we know it wont be sent" into master-chromium
|
| f401798d628ddb492defeb0a00bf289284d1677a |
16-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Adding a fake on page started for data url's since we know it wont be sent
Fix for bug 10570052
Change-Id: Ib4d6373da2601e0165a9f44160d2d465daeadcdf
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| de8d04a10debf3e5d7cfd89cdcadbb49a2fe0101 |
17-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 5afa0a4835688f6ff9298d2aa21bc24e27d367d4 |
12-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Remove the classic WebView from the build.
Remove the dependency from the dummy "webview" module to libwebcore now
that webviewchromium is being used instead.
Bug: 10427705
Change-Id: Ib2c33a7b1dfbbf6e3b3fe9f71f88fce0174c5185
ndroid.mk
|
| dedf8d9eac93c86464afde00927876263e65ba90 |
17-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
am d32e2580: Keep @JavascriptInterface methods in proguard.
* commit 'd32e258033d74fb551442b10547215de443be05c':
Keep @JavascriptInterface methods in proguard.
|
| 4bfa09dfeee67f4349a3833b615f3ad76c332e16 |
17-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Keep @JavascriptInterface methods in proguard.
We need to keep methods that are tagged @JavascriptInterface as these
are discovered by reflection at runtime and used to create JS bindings.
Stripping these was breaking ChromeVox; works with this change.
Bug: 10766751
Change-Id: I1c0b9a855d99c812bd4a3f05e6373c5b2fe045a4
(cherry picked from commit d32e258033d74fb551442b10547215de443be05c)
hromium/proguard.flags
|
| d32e258033d74fb551442b10547215de443be05c |
17-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Keep @JavascriptInterface methods in proguard.
We need to keep methods that are tagged @JavascriptInterface as these
are discovered by reflection at runtime and used to create JS bindings.
Stripping these was breaking ChromeVox; works with this change.
Bug: 10766751
Change-Id: I1c0b9a855d99c812bd4a3f05e6373c5b2fe045a4
hromium/proguard.flags
|
| fa9bab162c74443c008512d2b2fbde52bed46a17 |
16-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-factoryrom-release history after reset to klp-release
|
| e0ad8972469f550fd7cf2ad409623d93ea1e860f |
16-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am 1a692d93: Fixing up the checkThread exception message
* commit '1a692d93c0172dc09a316bbf9a54896f1d40234f':
Fixing up the checkThread exception message
|
| 8462bc390da39fb63be8f7598676e7e8a07cdaf0 |
16-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 1a692d93c0172dc09a316bbf9a54896f1d40234f |
16-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Fixing up the checkThread exception message
Fix for bug 10428080
Change-Id: I746f6d0131405f3963897e1ae9f311ab32260afa
(cherry picked from commit 8830d3b3f159bedcad3a8f52099da5ff0634a5dd)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| dd46e76cbdf7cac216bb90ac5d6cade0b34d17a9 |
16-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Fixing up the checkThread exception message" into master-chromium
|
| 2457fd419e98652b6a52e2fd76c894639efbab9d |
16-Sep-2013 |
Jonathan Dixon <joth@google.com> |
am b8453b86: Merge "Revert "Remove the classic WebView from the build."" into klp-dev
* commit 'b8453b8656b0febc25877ccb57b98d3842a4221c':
Revert "Remove the classic WebView from the build."
|
| b8453b8656b0febc25877ccb57b98d3842a4221c |
16-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Revert "Remove the classic WebView from the build."" into klp-dev
|
| 8830d3b3f159bedcad3a8f52099da5ff0634a5dd |
16-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Fixing up the checkThread exception message
Fix for bug 10428080
Change-Id: I746f6d0131405f3963897e1ae9f311ab32260afa
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 3257311a5863f61a9ad4fe68d00d6dc7f9f72275 |
16-Sep-2013 |
Jonathan Dixon <joth@google.com> |
am f98f0ca1: Merge "Remove the classic WebView from the build." into klp-dev
* commit 'f98f0ca12308ed7af0b13e627d2a45b1f0b636e3':
Remove the classic WebView from the build.
|
| f98f0ca12308ed7af0b13e627d2a45b1f0b636e3 |
16-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Remove the classic WebView from the build." into klp-dev
|
| 49ebe84f1588b0330884c73447b5515faf824985 |
16-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Revert "Remove the classic WebView from the build."
Bug 10769282
Reverting temporary patch required for factory rom.
This reverts commit 237f380127e1d4e4765911e6777b602699eda042.
ndroid.mk
|
| 237f380127e1d4e4765911e6777b602699eda042 |
12-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Remove the classic WebView from the build.
Remove the dependency from the dummy "webview" module to libwebcore now
that webviewchromium is being used instead.
Bug: 10427705
Change-Id: Ib2c33a7b1dfbbf6e3b3fe9f71f88fce0174c5185
ndroid.mk
|
| ea2891deddd63a1a15bfee58676e50701e0485e4 |
16-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am f2b715be: Removing UnimplementedWebViewApi.invoke from methods that are not needed to implement
* commit 'f2b715bee3bb3a41e59f80ae53b45f249d9559c5':
Removing UnimplementedWebViewApi.invoke from methods that are not needed to implement
|
| f2b715bee3bb3a41e59f80ae53b45f249d9559c5 |
16-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Removing UnimplementedWebViewApi.invoke from methods that are not needed to implement
Replacing with a // Intentional no-op comment
Part of fix for bug 9230062
Change-Id: I25dc869dcad0726bd9c56a4cc82c4681cc59e01e
(cherry picked from commit b147392394af2430ddaccafde0dd1e90cf9cfb99)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| b147392394af2430ddaccafde0dd1e90cf9cfb99 |
16-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Removing UnimplementedWebViewApi.invoke from methods that are not needed to implement
Replacing with a // Intentional no-op comment
Part of fix for bug 9230062
Change-Id: I25dc869dcad0726bd9c56a4cc82c4681cc59e01e
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 9a2817167538ce14d579e152119e056d97959885 |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 8fd6a561: (-s ours) Import translations. DO NOT MERGE
* commit '8fd6a5614f7580f045695085797d03504591ad02':
Import translations. DO NOT MERGE
|
| ba16b7193400ce0d6ffddbcd665adb74420cbc4a |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I9a16dfcd15164dac2a7a4c1d887ba93bbed8044d
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
|
| b73be12894f7fd2b66f2c5596e3bed1b8e9ef3f3 |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I4bd6a5d65f2575623c434c280a957504e9cfb051
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
|
| 8fd6a5614f7580f045695085797d03504591ad02 |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I3d65a7ab81d07633ed59425b0e6a6b0d2fc7cf58
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
|
| 0d20b4c8c92522641301b4974cf2986057eeaca2 |
13-Sep-2013 |
Selim Gurun <sgurun@google.com> |
Fix build break due to printing changes.
Change-Id: Id7a4dc15ca0d4e62aaa6f1bb72c49039e9dce05e
(cherry picked from commit 446527cc7e4f0a5df72ca9c4d68753a698e2895b)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 46da19ccdb15464e528294103a85b4ab93acb6ce |
13-Sep-2013 |
Selim Gurun <sgurun@google.com> |
am 412d84be: DO NOT MERGE Reflect print API changes
* commit '412d84be859ce0eb91baf2f9afe5e6326a15d76a':
DO NOT MERGE Reflect print API changes
|
| 446527cc7e4f0a5df72ca9c4d68753a698e2895b |
13-Sep-2013 |
Selim Gurun <sgurun@google.com> |
Fix build break due to printing changes.
Change-Id: Id7a4dc15ca0d4e62aaa6f1bb72c49039e9dce05e
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 412d84be859ce0eb91baf2f9afe5e6326a15d76a |
07-Sep-2013 |
Selim Gurun <sgurun@google.com> |
DO NOT MERGE Reflect print API changes
Bug:10652036
Change-Id: Id379d9dbbdcfe722d9b899fea5dd80751b86bcfd
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| a468583fcca4d60a4e75b1228fdee60138cacdd3 |
12-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Post all functions returning a value to the UI thread
All functions should now either be evalued and considered safe,
posted to the UI thread or new in K.
Fix for bug 10208157
Change-Id: Ia9ef928254a0396423eff64987a36088161f0411
(cherry picked from commit 4f6d854132c5bb539cd4edde985435859d393d25)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| dd19feee121e9e462962fc03a681abc08e02d898 |
12-Sep-2013 |
Jonathan Dixon <joth@google.com> |
am 2de8edf3: Merge changes Id195f1e6,I19dc412e into klp-dev
* commit '2de8edf317abd50f69fb0867571c7c0d27e76d2c':
Optimize the complex clip case
Export canvas info via SkCanvasLayerState
|
| 2de8edf317abd50f69fb0867571c7c0d27e76d2c |
12-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Merge changes Id195f1e6,I19dc412e into klp-dev
* changes:
Optimize the complex clip case
Export canvas info via SkCanvasLayerState
|
| 27a606b9fa99162b3ba5158c9e2ff5b0c440536a |
12-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am 2c11b458: Post all functions returning a value to the UI thread
* commit '2c11b458a21170c4eacba6c072f695c465f1c083':
Post all functions returning a value to the UI thread
|
| 3603a870e2edfac7b6430796971eca72b6d02924 |
07-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Optimize the complex clip case
Bug 10152369
This can save considerable time on each draw
Change-Id: Id195f1e691f1cbc92efcbfdf357fa93e01e4e241
hromium/plat_support/graphics_utils.cpp
|
| e2a6daca0cb3f0a261dfa45c5613f62646eb385d |
30-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Export canvas info via SkCanvasLayerState
Bug 10152369
Depends on https://codereview.chromium.org/23789003
Change-Id: I19dc412e3019cc1718c638f5f146b99d41f70795
(cherry picked from commit a4f187ef3723a330f2145cea5a4f83e486199137)
hromium/plat_support/graphics_utils.cpp
|
| 2c11b458a21170c4eacba6c072f695c465f1c083 |
12-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Post all functions returning a value to the UI thread
All functions should now either be evalued and considered safe,
posted to the UI thread or new in K.
Fix for bug 10208157
Change-Id: Ia9ef928254a0396423eff64987a36088161f0411
(cherry picked from commit 4f6d854132c5bb539cd4edde985435859d393d25)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| ec228fff863de34531bf76f19ac9d478a80c3c35 |
12-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Post all functions returning a value to the UI thread" into master-chromium
|
| 4f6d854132c5bb539cd4edde985435859d393d25 |
12-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Post all functions returning a value to the UI thread
All functions should now either be evalued and considered safe,
posted to the UI thread or new in K.
Change-Id: Ia9ef928254a0396423eff64987a36088161f0411
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| cb6aea76d6bc89924db302d5a9c083d8b739ef4d |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 25652b1d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '25652b1db444c90537ab67bc696db8130994521b':
Import translations. DO NOT MERGE
|
| 9d2d019d5d245f5e5f0da83f43aa77e25d029220 |
12-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 17736fcb92bc631b252cca2c124d4b3521fe0222 |
12-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge changes from master into master-chromium.
A few changes have been submitted directly to master that aren't in
master-chromium; merge the branches to bring everything back in sync.
Change-Id: Ib2d61d2799b6aa72e1e3f277183e739dcc75d2e7
|
| 2479270939ee95cbf8f7f1f2f20d7d68b66bb1d2 |
12-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r222756
This commit was generated by merge_to_master.py.
Change-Id: Ic5aa443a2c3226f2213b40627871fb6d31282d26
|
| f2a866b33d4874f6bcda37e593f83df1b1fb2fd2 |
12-Sep-2013 |
Primiano Tucci <primiano@google.com> |
Merge "Adding freeMemoryForTests method to the WebView Chromium glue layer." into master-chromium
|
| a68073f3c0ef06b8a5c0a6c71cf33bc1f37664b9 |
12-Sep-2013 |
Kenny Root <kroot@google.com> |
Use canonical UniquePtr.h file
Change-Id: Id738acf5c2990df81945404db4edef85b3f978ad
hromium/plat_support/graphics_utils.cpp
|
| e7cf85da58125c9f6582f9c93152099767c76483 |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-chromium
|
| 25652b1db444c90537ab67bc696db8130994521b |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
| c0578dd2c3cb63dbd5d61360fd1ef1f2dcdd4d8f |
12-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am 81cdab1b: Posting ALL the void functions to UI thread
* commit '81cdab1b4a022515f0234daafb3e224d13f20a9f':
Posting ALL the void functions to UI thread
|
| 81cdab1b4a022515f0234daafb3e224d13f20a9f |
10-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Posting ALL the void functions to UI thread
Also removing some old out of date TODO's.
Part of fix for bug 10208157
Change-Id: I060c0969400e9497062ad985201a83ddfdd08c9f
(cherry picked from commit be5b09396cb34b040528eacff45069658897c3bc)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 0741fee0cbea98d53bd477cd4e1cdb1d9ea1edb8 |
12-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Posting ALL the void functions to UI thread" into master-chromium
|
| be5b09396cb34b040528eacff45069658897c3bc |
10-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Posting ALL the void functions to UI thread
Also removing some old out of date TODO's.
Part of fix for bug 10208157
Change-Id: I060c0969400e9497062ad985201a83ddfdd08c9f
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 23c36d611efb0464e0a0d4fb29de09fb90ef8c26 |
12-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am 41618b2a: Null check url before using instance methods
* commit '41618b2aeb0a500c740a75871a8f614cb6543362':
Null check url before using instance methods
|
| 41618b2aeb0a500c740a75871a8f614cb6543362 |
12-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Null check url before using instance methods
Also early out to match classic behaviour.
Fix for bug 10688422
Change-Id: Ic6cff8271e6c0c92ca583e4a2cf61567aa27dc00
(cherry picked from commit a5d717b8b2047e74e6b1ba6084e96f5e28e0c5e7)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| a5d717b8b2047e74e6b1ba6084e96f5e28e0c5e7 |
12-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Null check url before using instance methods
Also early out to match classic behaviour.
Fix for bug 10688422
Change-Id: Ic6cff8271e6c0c92ca583e4a2cf61567aa27dc00
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| db64047c7757fea80aa1db386f38f5ffaa66db8e |
11-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am 4fb262f3: Post init to the UI thread blocking with a timeout to detect deadlock
* commit '4fb262f34ba888eaacc24a83d94a56b8d7bcef2b':
Post init to the UI thread blocking with a timeout to detect deadlock
|
| 4fb262f34ba888eaacc24a83d94a56b8d7bcef2b |
10-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Post init to the UI thread blocking with a timeout to detect deadlock
Fix for bug 10208157, and several others.
init() is called right after the constructor, and must be posted to the UI thread.
(The constructor itself does not require this treatment as it does not touch any
global / non-threadsafe state)
Change-Id: I72db913f4d560b0d2979226384adb6631f836c73
(cherry picked from commit f7823c0ca540eb039e0b4400bbefdf5a3dd0d127)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 7f12bfd97115c70b8bb1c956d022f47e6c811977 |
11-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Post init to the UI thread blocking with a timeout to detect deadlock" into master-chromium
|
| f7823c0ca540eb039e0b4400bbefdf5a3dd0d127 |
10-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Post init to the UI thread blocking with a timeout to detect deadlock
Fix for bug 10208157, and several others.
init() is called right after the constructor, and must be posted to the UI thread.
(The constructor itself does not require this treatment as it does not touch any
global / non-threadsafe state)
Change-Id: I72db913f4d560b0d2979226384adb6631f836c73
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 5ecf5af14aa62a9b7d7c5d11357b58d77c5fd356 |
11-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Better onConsole tracing, add the console message to the trace" into master-chromium
|
| 287418fbae803a0a10c274e03de7885ce4879af3 |
11-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ica9c9920a7c44b29188d031587cc3f6e6d239a18
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
|
| a30aedd5a1dc6b6e04e6d6edfc65ff97e1ae764d |
11-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I726c7a8930f4736f8c7614184f8e37cdf4248717
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
|
| 35f0c5dbdade961f1a6fba5665a48b65b0984fa1 |
11-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I25508f8d723caa9d11ebe3076c02af59563d9eba
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
|
| 38318e258390ea31ede42ce03ee3254f5cfcd6d8 |
11-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| a4857804f04313c7eae12f74fd82b8c9bb33c7a8 |
11-Sep-2013 |
Primiano Tucci <primiano@google.com> |
am 855ab488: Wire up stylable attributes for <select> dialogs.
* commit '855ab488e8afd5297b312a9cf2c06ada3a286593':
Wire up stylable attributes for <select> dialogs.
|
| 855ab488e8afd5297b312a9cf2c06ada3a286593 |
09-Sep-2013 |
Primiano Tucci <primiano@google.com> |
Wire up stylable attributes for <select> dialogs.
This complements crrev.com/23523025 and overrides the layouts used
for rendering the <select> dialogs using the same ones used by classic
WebView. Clank's default layouts, in fact, can be (graphically) broken
by apps if they override, for instance as happened in b/10549550, the
text color for their alert dialogs and show the WebView in an alert dialog.
Bug: 10549550
Change-Id: Ie64d11a85fd39425915122fa11901989bee9d5a7
(cherry picked from commit 28dd03bb3206928814a5598fbfd6d9695bd46e44)
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values/attrs.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
|
| f8f270cb5b54adc9546566b283b83df911fc516f |
11-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Better onConsole tracing, add the console message to the trace
Change-Id: Ia00a9f49be3ca82afbd5189d0a2de22861b6c58c
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 807d66b5cabfaca41925adcb28805e803dda0373 |
10-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 21ec8cc042fc3f48e008b8ca1582ac04000654a7 |
10-Sep-2013 |
Bo Liu <boliu@google.com> |
am bc8c946f: Merge "Raise NOFILE to hard limit (1024->4096) on draw functor attach" into klp-dev
* commit 'bc8c946f4f939ff9f51e61716f995faf29478426':
Raise NOFILE to hard limit (1024->4096) on draw functor attach
|
| bc8c946f4f939ff9f51e61716f995faf29478426 |
10-Sep-2013 |
Bo Liu <boliu@google.com> |
Merge "Raise NOFILE to hard limit (1024->4096) on draw functor attach" into klp-dev
|
| f533bc666f11273be2d7a211be4cda18d53bf0a3 |
10-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: fix force pushing to temp branch.
In the refactoring of the script to suport branch merges I accidentally
lost the '+' to force-push to the temporary branch, resulting in merges
failing once the temporary branch wasn't in the right state any more.
Fixed.
Change-Id: I05d779a524c09ac6122e66b3cc3772b125c36e30
hromium/tools/merge_from_chromium.py
|
| 4709732eeda0c2418ea6475624084cba1db12dad |
10-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-chromium
|
| 70a4658acfc4fbd722c81793f634e5d8452ac2d1 |
10-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am c8523c99: Letting onDraw be called from other threads
* commit 'c8523c99833f364c64744d60e408510fb83b998b':
Letting onDraw be called from other threads
|
| c8523c99833f364c64744d60e408510fb83b998b |
06-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Letting onDraw be called from other threads
Fix for bug 10624076
Change-Id: I9d59cbf600a4deb17f9324c9970033b951180250
(cherry picked from commit d12274bf92a1b0126db3a678f96c26d74cf25b24)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 7d68a51e8f222d731b2d29891c08d44d59a04f1b |
10-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Letting onDraw be called from other threads" into master-chromium
|
| 6babd1b514e127a83e44a22993bfc6544cee43d7 |
09-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am e80eedd9: Merge "Post stopLoading() to the UI thread" into klp-dev
* commit 'e80eedd97cf65f058960f6d07cdc7c1bc457035f':
Post stopLoading() to the UI thread
|
| f06a131a2caadbdb57454930e83114a69ca5af42 |
09-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am 4ce3edbf: Merge "Allow getScale on all threads" into klp-dev
* commit '4ce3edbffa79974f160605c4bc997b1b08d262b2':
Allow getScale on all threads
|
| e80eedd97cf65f058960f6d07cdc7c1bc457035f |
09-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Post stopLoading() to the UI thread" into klp-dev
|
| 4ce3edbffa79974f160605c4bc997b1b08d262b2 |
09-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Allow getScale on all threads" into klp-dev
|
| eb96910bf3ba41ae59fa6c8dcaab88969d1c08da |
09-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I3a3e3942528039b9443c73f46f9bdcb1fa6476df
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
|
| 8e5eb40bd0864409afdc5e2be6b5fb7789e7b1f5 |
09-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Idc7b4e3717fe1bd85c0a78cd934359be6574ada2
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
|
| c014454642f636ce968221a7740131a0473caca6 |
09-Sep-2013 |
Martin Kosiba <mkosiba@google.com> |
am 56eb9568: Merge "Hook up requestChildRectangleOnScreen." into klp-dev
* commit '56eb9568f2dea488c0be768e5117f428378d7003':
Hook up requestChildRectangleOnScreen.
|
| 56eb9568f2dea488c0be768e5117f428378d7003 |
09-Sep-2013 |
Martin Kosiba <mkosiba@google.com> |
Merge "Hook up requestChildRectangleOnScreen." into klp-dev
|
| 54729a2b11a40bd401b19f443d27b71a0d7d1db3 |
09-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 816f8b55f5a0143dd4106d12c54915c3cf05625d |
09-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: fix merging trunk.
The automerger has an older version of git that doesn't support passing
a SHA1 to "git fetch". Go back to using the old method when merging
trunk, since it's not necessary to fetch a specific SHA1 in this case.
Change-Id: I4e0b7f4e671f63135c829afa0ebff320ad202b8b
hromium/tools/merge_from_chromium.py
|
| 69e3200689e3f40d0682e6e5664c3f4766f51550 |
09-Sep-2013 |
Primiano Tucci <primiano@google.com> |
Merge "Wire up stylable attributes for <select> dialogs." into master-chromium
|
| 3ce45bdcafa1a557272f11ba3933c629667d175d |
09-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
am 94addffe: Merge scripts: support merging from Chromium releases.
* commit '94addffe055d2df297d4cf6c981d13a6e0a62bbc':
Merge scripts: support merging from Chromium releases.
|
| f81a1ea8129a3a620d677d6eeab99d2727367c88 |
23-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: support merging from Chromium releases.
Add support for merging from Chromium releases as well as from trunk.
Bug: 10152587
Change-Id: I34ed760d005c7e8c60d46a1ce36fa0167ae0c2fe
(cherry picked from commit 94addffe055d2df297d4cf6c981d13a6e0a62bbc)
hromium/tools/merge_from_chromium.py
hromium/tools/merge_to_master.py
|
| 94addffe055d2df297d4cf6c981d13a6e0a62bbc |
23-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: support merging from Chromium releases.
Add support for merging from Chromium releases as well as from trunk.
Bug: 10152587
Change-Id: I34ed760d005c7e8c60d46a1ce36fa0167ae0c2fe
hromium/tools/merge_from_chromium.py
hromium/tools/merge_to_master.py
|
| 28dd03bb3206928814a5598fbfd6d9695bd46e44 |
09-Sep-2013 |
Primiano Tucci <primiano@google.com> |
Wire up stylable attributes for <select> dialogs.
This complements crrev.com/23523025 and overrides the layouts used
for rendering the <select> dialogs using the same ones used by classic
WebView. Clank's default layouts, in fact, can be (graphically) broken
by apps if they override, for instance as happened in b/10549550, the
text color for their alert dialogs and show the WebView in an alert dialog.
Change-Id: Ie64d11a85fd39425915122fa11901989bee9d5a7
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values/attrs.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
|
| ee6263d77779b521f5e84b486809b921ced17a6d |
09-Sep-2013 |
Primiano Tucci <primiano@google.com> |
Merge "Revert "Wire up stylable attributes for <select> dialogs."" into master-chromium
|
| f39f2ce296477580ef9bec323d45fa913eec6a79 |
09-Sep-2013 |
Primiano Tucci <primiano@google.com> |
Revert "Wire up stylable attributes for <select> dialogs."
This reverts commit 0e18f7f2e47c3c10a87ad2f35bfad7648488007d.
Unfortunately the alphabetical re-ordering of patch set 2 was
screwed (I forgot to reorder attrs in 2 xml files) and that
broke the select dialog at runtime. Relanding soon the fix
in a whole (correct) CL.
Change-Id: I2883bd78acd438733af37ab88c004c0b66f19f1a
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values/attrs.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
|
| fa62be4cdc2630566ee179843393d4a6f9893966 |
07-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Allow getScale on all threads
Similar to the others we think is just thread safe enough to
not throw exception for now.
Bug: 10652991
Change-Id: I19ce1babb7e371054d35926e18a35d30aef3b5b5
(cherry picked from commit 774546b62c2de2030f09cdad8bcd6cce0581c222)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 0617b8e0f4050a8dfc2e02f6475eeaaa705b4cdd |
07-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Allow getScale on all threads" into master-chromium
|
| d18983cc7040f96a2283c0a318f25fe4474d72ff |
07-Sep-2013 |
Bo Liu <boliu@google.com> |
Raise NOFILE to hard limit (1024->4096) on draw functor attach
This is needed since gralloc buffers take 2 file handles on qualcomm,
and 1024 / 2 which is too low for using as tiles.
BUG: 10606165
Change-Id: Ib38dc4dfde96cb4be32adb2bb85e5ed77a8c3159
(cherry picked from commit 64511fa442b9937f0e6d8449ec0c230767f0cfa9)
hromium/plat_support/draw_gl_functor.cpp
|
| 45bfc11f8ec966138a09e039438a0852cb28b490 |
07-Sep-2013 |
Bo Liu <boliu@google.com> |
Merge "Raise NOFILE to hard limit (1024->4096) on draw functor attach" into master-chromium
|
| 64511fa442b9937f0e6d8449ec0c230767f0cfa9 |
07-Sep-2013 |
Bo Liu <boliu@google.com> |
Raise NOFILE to hard limit (1024->4096) on draw functor attach
This is needed since gralloc buffers take 2 file handles on qualcomm,
and 1024 / 2 which is too low for using as tiles.
Change-Id: Ib38dc4dfde96cb4be32adb2bb85e5ed77a8c3159
hromium/plat_support/draw_gl_functor.cpp
|
| 774546b62c2de2030f09cdad8bcd6cce0581c222 |
07-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Allow getScale on all threads
Similar to the others we think is just thread safe enough to
not throw exception for now.
Change-Id: I19ce1babb7e371054d35926e18a35d30aef3b5b5
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| d12274bf92a1b0126db3a678f96c26d74cf25b24 |
06-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Letting onDraw be called from other threads
Fix for bug 10624076
Change-Id: I9d59cbf600a4deb17f9324c9970033b951180250
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 19af3f6395d08f8d2b106b8d205260d3194e1017 |
06-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Post stopLoading() to the UI thread
Fix for bug 10648349. Usual racyness disclaimer applies.
Change-Id: I984b239f8563760ba77105804147068a1419afbf
(cherry picked from commit 68cbc0faa699037b3fa3859cb8285a205d7ea592)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| ce2c4f142c72082a05f3847cd16be7f344ea135b |
07-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Post stopLoading() to the UI thread" into master-chromium
|
| c44187f6b7e129fbc9453f3e81a95d89da5a692d |
06-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am d6b155b4: Merge "Post destroy() to UI thread" into klp-dev
* commit 'd6b155b4e96e8f6158063de6c2118e20d72010fa':
Post destroy() to UI thread
|
| 68cbc0faa699037b3fa3859cb8285a205d7ea592 |
06-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Post stopLoading() to the UI thread
Fix for bug 10648349. Usual racyness disclaimer applies.
Change-Id: I984b239f8563760ba77105804147068a1419afbf
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| d6b155b4e96e8f6158063de6c2118e20d72010fa |
06-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Post destroy() to UI thread" into klp-dev
|
| 6aad30479705f5168abae1070f4545a6b35e0a9b |
06-Sep-2013 |
Jonathan Dixon <joth@google.com> |
am 3c50ec3f: Merge "Allow null inputs in loadDataWithBaseURL" into klp-dev
* commit '3c50ec3fdce2a693d065395040276630fd89106c':
Allow null inputs in loadDataWithBaseURL
|
| 3c50ec3fdce2a693d065395040276630fd89106c |
06-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Allow null inputs in loadDataWithBaseURL" into klp-dev
|
| d3ba353f607cdacc3a968c36782732e7190bc00c |
06-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Allow null inputs in loadDataWithBaseURL" into master-chromium
|
| 370194f596d6ed2b410d67a65782e5a6dc24a4e3 |
06-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Post destroy() to UI thread
Fix for bug 10647580, could not reproduce locally.
Change-Id: I2812a448c44da694249f355ad1f20b941b86d3ab
(cherry picked from commit 83db12f61a60a4c7fe8d1cd5bc7770a162c0e078)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 83db12f61a60a4c7fe8d1cd5bc7770a162c0e078 |
06-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Post destroy() to UI thread
Fix for bug 10647580, could not reproduce locally.
Change-Id: I2812a448c44da694249f355ad1f20b941b86d3ab
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 92d07be0d09881cb4f2d7ef6eeb5042408f400c6 |
06-Sep-2013 |
Mikhail Naganov <mnaganov@google.com> |
am ffabf2e1: Enable web layout quirks for apps with targetSdkVersion < K
* commit 'ffabf2e121746d06b9930b1ae8fea243c4f5cb9d':
Enable web layout quirks for apps with targetSdkVersion < K
|
| ffabf2e121746d06b9930b1ae8fea243c4f5cb9d |
28-Aug-2013 |
Mikhail Naganov <mnaganov@google.com> |
Enable web layout quirks for apps with targetSdkVersion < K
BUG=10183494
Change-Id: I00cf59abc99dd22f03004c78e98599309f151638
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 0d88ded1b84a558fe0b5531963006a544460c7fa |
05-Sep-2013 |
Mikhail Naganov <mnaganov@google.com> |
Enable web layout quirks for apps with targetSdkVersion < K
BUG=10183494
Change-Id: I29fea271a88a475ba112132d8849884e62c629db
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| abf6f106651f2aff6e8a554dbe8c17fef05e949d |
06-Sep-2013 |
Ben Murdoch <benm@google.com> |
Merge "Export canvas info via SkCanvasLayerState" into master-chromium
|
| b31ffbc283e353db7e0bbe77dcf451650c72be44 |
06-Sep-2013 |
Ben Murdoch <benm@google.com> |
am 1610a524: Merge "Wire up stylable attributes." into klp-dev
* commit '1610a52469877adaa73b088589f86dfe9d2f00df':
Wire up stylable attributes.
|
| 1610a52469877adaa73b088589f86dfe9d2f00df |
06-Sep-2013 |
Ben Murdoch <benm@google.com> |
Merge "Wire up stylable attributes." into klp-dev
|
| e7771f76137bb319f5825554a1e61c9d59d6d23b |
06-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am 7720b10b: Letting getSettings be called from any thread
* commit '7720b10b55b5db5564a72c2e4c2c23631acbff0a':
Letting getSettings be called from any thread
|
| d11b1288e83a3b74fd07db1fe27842dc18e1c260 |
05-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Allow null inputs in loadDataWithBaseURL
Bug 10636629
We were inconsitently null checking inputs at various places, this
brings them all into one place and consistent with WebViewClassic
Change-Id: Ia08addeaa4027abffd2a02758d7b738e1c9dc8fb
Conflicts:
chromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 7720b10b55b5db5564a72c2e4c2c23631acbff0a |
05-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Letting getSettings be called from any thread
First step in working around bug 10623987
Change-Id: Iee45e3d4638632fc573a947461800d7f902d50b3
(cherry picked from commit 95278543021160239b54daf28f634c131bb91032)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| a06cf97a09739e7ec4ed428b541d0f55c190814e |
06-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Letting getSettings be called from any thread" into master-chromium
|
| 95278543021160239b54daf28f634c131bb91032 |
05-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Letting getSettings be called from any thread
First step in working around bug 10623987
Change-Id: Iee45e3d4638632fc573a947461800d7f902d50b3
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 19bc90be698e6d86ec6c77ea8b43bb6778bcc89d |
05-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Allow null inputs in loadDataWithBaseURL
Bug 10636629
We were inconsitently null checking inputs at various places, this
brings them all into one place and consistent with WebViewClassic
Change-Id: Ia08addeaa4027abffd2a02758d7b738e1c9dc8fb
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 1a8fc63b27ab1573f87722821f87984a84bbbc47 |
05-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
am 4e8f7b0d: Merge "Let getContentHeight be used from any thread" into klp-dev
* commit '4e8f7b0d88d73b1ac77efc24e63ebc731a4c31d9':
Let getContentHeight be used from any thread
|
| 4e8f7b0d88d73b1ac77efc24e63ebc731a4c31d9 |
05-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Let getContentHeight be used from any thread" into klp-dev
|
| c208c19c103686b4cb0635f1e786cdb34511cc85 |
05-Sep-2013 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Revert "Enable web layout quirks for apps with targetSdkVersion < KLP"" into master-chromium
|
| b1dd9b3d137a92fba1fb428ab7539a2f2768611b |
05-Sep-2013 |
Mikhail Naganov <mnaganov@google.com> |
Revert "Enable web layout quirks for apps with targetSdkVersion < KLP"
This reverts commit a104b0ab7508f295eaf26a2b10e2815e7ddd280c.
Change-Id: Iedfc6cf7cee97bb4a09140e0b9fc58f929562297
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 249ba061c9a807de2488170a84b42217d44f5950 |
05-Sep-2013 |
Chet Haase <chet@google.com> |
Change build version from KEY_LIME_PIE to KITKAT
Issue #10631619 Change build version to KitKat
Change-Id: I5aaa61ddb1e1c6046fccf89f7f8be1d09e34ba35
(cherry picked from commit 4129cef2f18b37c9ca55b5240146ad87841fd7ab)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 010146541bf8efc35451f2dd57198358334fdb9c |
05-Sep-2013 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Enable web layout quirks for apps with targetSdkVersion < KLP" into master-chromium
|
| 4129cef2f18b37c9ca55b5240146ad87841fd7ab |
05-Sep-2013 |
Chet Haase <chet@google.com> |
Change build version from KEY_LIME_PIE to KITKAT
Issue #10631619 Change build version to KitKat
Change-Id: I5aaa61ddb1e1c6046fccf89f7f8be1d09e34ba35
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| f0c11c762e9d31b709dc160dffaff82a7f2baf28 |
05-Sep-2013 |
Chet Haase <chet@google.com> |
am 9cd49cbc: Change build version from KEY_LIME_PIE to KITKAT
* commit '9cd49cbc245e07e8e8c360fd22821a2918f99eae':
Change build version from KEY_LIME_PIE to KITKAT
|
| 9cd49cbc245e07e8e8c360fd22821a2918f99eae |
05-Sep-2013 |
Chet Haase <chet@google.com> |
Change build version from KEY_LIME_PIE to KITKAT
Issue #10631619 Change build version to KitKat
Change-Id: Iad11c5c4d2d02d4f2b51333e973853d7ffdbe022
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| e0ee3936c9d92303c594ec6b4992bdf552df15a1 |
05-Sep-2013 |
Ben Murdoch <benm@google.com> |
Merge "Wire up stylable attributes for <select> dialogs." into master-chromium
|
| f92f82a34c01b5cd4367c640171def0a977bed54 |
05-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| b7f8bdb39f5ddfba3394d5335e728d9bf416f0ca |
05-Sep-2013 |
Primiano Tucci <primiano@google.com> |
Adding freeMemoryForTests method to the WebView Chromium glue layer.
This is going to be used by pagecycler tests.
Note, this is part of a multi-project change. See: b/10629847
Change-Id: I22e6b4d7b0d1d6dc25e7a9e608c2ac7b2ef32fc4
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 44058713d8f222aa6e688204e2de8f01fea01fb1 |
05-Sep-2013 |
Primiano Tucci <primiano@google.com> |
Merge "Revert "Hooking memory pressure signal to freeMemory in debug builds."" into master-chromium
|
| 319f820d12f1bc5e1aeaa3dbe3166f23976a94a2 |
05-Sep-2013 |
Primiano Tucci <primiano@google.com> |
Revert "Hooking memory pressure signal to freeMemory in debug builds."
This reverts commit 767c3f7e0a6bffb9f3e17ec565610b178c4a3f95.
Change-Id: I09454cdc4d72baff1b200c8832ea9268e138bd0a
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| a4f187ef3723a330f2145cea5a4f83e486199137 |
30-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Export canvas info via SkCanvasLayerState
Depends on https://codereview.chromium.org/23789003
Change-Id: I19dc412e3019cc1718c638f5f146b99d41f70795
hromium/plat_support/graphics_utils.cpp
|
| 94a8e6a6d7d1b2a6b3718eb91956403ef6b03d9c |
05-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Let getContentHeight be used from any thread
Fix for bug 10594869
Change-Id: I94c9840811abb207c23db8816f2e282e7807c746
(cherry picked from commit a6213458ba6a6342c9ec5e5f2da5da22eb0e7706)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 8d1ed31027f8a554edb8fadbd55fcd090efaa0f9 |
05-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Let getContentHeight be used from any thread" into master-chromium
|
| a6213458ba6a6342c9ec5e5f2da5da22eb0e7706 |
05-Sep-2013 |
Kristian Monsen <kristianm@google.com> |
Let getContentHeight be used from any thread
Fix for bug 10594869
Change-Id: I94c9840811abb207c23db8816f2e282e7807c746
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| e30b18b04b86fbb2ce2d72c2e2f6cd20b1c64211 |
04-Sep-2013 |
Jonathan Dixon <joth@google.com> |
am e27917ca: Merge "Don\'t check thread access for HierarchyHandler methods" into klp-dev
* commit 'e27917ca170c4df6f2a949c58820ac1d841a57e2':
Don't check thread access for HierarchyHandler methods
|
| e27917ca170c4df6f2a949c58820ac1d841a57e2 |
04-Sep-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Don't check thread access for HierarchyHandler methods" into klp-dev
|
| 0e18f7f2e47c3c10a87ad2f35bfad7648488007d |
04-Sep-2013 |
Primiano Tucci <primiano@google.com> |
Wire up stylable attributes for <select> dialogs.
This complements crrev.com/23523025 and overrides the layouts used
for rendering the <select> dialogs using the same ones used by classic
WebView. Clank's default layouts, in fact, can be (graphically) broken
by apps if they override, for instance as happened in b/10549550, the
text color for their alert dialogs and show the WebView in an alert dialog.
Change-Id: I3e7cb1a5422a5457bfe69906f43a43b2eb40a8e0
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values/attrs.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
|
| 8cadb41b83f0af93265913111e89b73a481d19f5 |
04-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 3122b9566b6d55c9d162da50c72bc4b94bdfc44c |
30-Aug-2013 |
Ben Murdoch <benm@google.com> |
Wire up stylable attributes.
This is needed so that we resolve the correct styles for drawables based
on the theme currently in use.
Bug: 10110507
Change-Id: I6c24b42e1912ebac91eb8dfd07c22ff1308d3269
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
|
| b551c947ae8f71f377646af3e49fac83e7f704ca |
03-Sep-2013 |
Jonathan Dixon <joth@google.com> |
am 081c438a: Add tracing for WebviewChromium callbacks
* commit '081c438a8201fe2d1248f487808b3bae6706aa7e':
Add tracing for WebviewChromium callbacks
|
| a66d54c9f62ace5182635c4bf74449fb62f9d464 |
29-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Add tracing for WebviewChromium callbacks
Bug: 10488419
Depends on I5d0d2e253499741c5f9454582988c99e42dc0a81
Change-Id: I92a6477486528b49b7786564d746d69ec4bc8666
(cherry picked from commit 081c438a8201fe2d1248f487808b3bae6706aa7e)
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| f88814c98c0e8312a7d00de2bd38339008c957be |
03-Sep-2013 |
Primiano Tucci <primiano@google.com> |
Merge "Hooking memory pressure signal to freeMemory in debug builds." into master-chromium
|
| 767c3f7e0a6bffb9f3e17ec565610b178c4a3f95 |
02-Sep-2013 |
Primiano Tucci <primiano@google.com> |
Hooking memory pressure signal to freeMemory in debug builds.
This is going to be used by the pagecycler sxs dashboard, to get
more realistic memory usage numbers for Chromium WebView.
Change-Id: I9b630fa59512b15f6edf587685666ff13f0450b0
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| e1b96d1b6dfdff7155c2601d03e1c814544c6a9e |
02-Sep-2013 |
Martin Kosiba <mkosiba@google.com> |
Merge "Increase char limits for time picker strings." into master-chromium
|
| cec49a5fc777ca379bb59b1f6557a955e686bb18 |
02-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| d1ffc88d65afb8216a08d6f7ca86cc2a925a8dd7 |
30-Aug-2013 |
Ben Murdoch <benm@google.com> |
Wire up stylable attributes.
This is needed so that we resolve the correct styles for drawables based
on the theme currently in use.
Bug: 10110507
Change-Id: I42663436e8229dd7d7d4c8c4c1529d2f4e6e6a05
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
|
| 1c461659158e85411f91076b0c81c5e5a72c2106 |
31-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Don't check thread access for HierarchyHandler methods
We don't implement them anyway. I would like to remove the interface,
but not sure if it is worth the trouble with all the branches.
Fix for bug 10545918
Change-Id: Ica17857ab43f9d01640483efdbdfce7feffde9d1
(cherry picked from commit e31af40d99db027e63b70be18f83a481c6a7a967)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| b7a83153a343e3f11289dd3edc175792ab1b39b5 |
31-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Don't check thread access for HierarchyHandler methods" into master-chromium
|
| e31af40d99db027e63b70be18f83a481c6a7a967 |
31-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Don't check thread access for HierarchyHandler methods
We don't implement them anyway. I would like to remove the interface,
but not sure if it is worth the trouble with all the branches.
Fix for bug 10545918
Change-Id: Ica17857ab43f9d01640483efdbdfce7feffde9d1
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 081c438a8201fe2d1248f487808b3bae6706aa7e |
29-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Add tracing for WebviewChromium callbacks
Bug: 10488419
Depends on I5d0d2e253499741c5f9454582988c99e42dc0a81
Change-Id: I92a6477486528b49b7786564d746d69ec4bc8666
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 0596628a9561657d3324c93e6351422901fe3740 |
30-Aug-2013 |
Ben Murdoch <benm@google.com> |
am 5be0edbd: Merge "Implement WebViewChromium.freeMemory." into klp-dev
* commit '5be0edbd27f9402ee53ab7d6dc16a06de540325c':
Implement WebViewChromium.freeMemory.
|
| ec9e70933b6ecfc92c9efa467f217141da8750a1 |
29-Aug-2013 |
Ben Murdoch <benm@google.com> |
Implement WebViewChromium.freeMemory.
This API now an intentional no-op as Chromium will manage
WebView memory automatically.
Bug: 5012874
Change-Id: I0d72a80333704bb88af96e9492a9029b02c93280
(cherry picked from commit d43c55dd91cf7dd1bcd18d01e16acd5e55de0471)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 5be0edbd27f9402ee53ab7d6dc16a06de540325c |
30-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge "Implement WebViewChromium.freeMemory." into klp-dev
|
| ecd48020157a848b54dff3599836f0a4640bde66 |
30-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Revert "Plumb though the performHapticFeedback call"" into master-chromium
|
| b97f7356b22753adffc48679978e63dcb4825987 |
30-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Revert "Plumb though the performHapticFeedback call"
This reverts commit a9383b1f43ef38a94456d434d2b8203a1c42a2be.
Change-Id: I199c6320297578b1f72f1b7eed96a8685cdebdaf
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| df0bfc42b87750a8a85fccab84010ac6b7e2b3e3 |
30-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Plumb though the performHapticFeedback call" into master-chromium
|
| a9383b1f43ef38a94456d434d2b8203a1c42a2be |
30-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Plumb though the performHapticFeedback call
Bug 10287511
This is in preperation for rolling in upstream patch
https://codereview.chromium.org/23050012/
Change-Id: Iacd6a457e87f1a747e4d39223cac0e817d4ee06e
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| c0b9aa3fe9743f8419590635cf6e6573b1da1040 |
30-Aug-2013 |
Selim Gurun <sgurun@google.com> |
am a8d0ef26: DO NOT MERGE Printing API changes for supporting better page layout
* commit 'a8d0ef2693c3bcd4a091cc7fa49b69b54e3472c4':
DO NOT MERGE Printing API changes for supporting better page layout
|
| b084219906d4f011ca3d04b95ef56a3a8b2b4dd0 |
30-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r220549
This commit was generated by merge_to_master.py.
Change-Id: I7a9f835985da6cd2300a185ebff47d16192ebc47
|
| a8d0ef2693c3bcd4a091cc7fa49b69b54e3472c4 |
29-Aug-2013 |
Selim Gurun <sgurun@google.com> |
DO NOT MERGE Printing API changes for supporting better page layout
Bug: 10507857
Change-Id: I4535846d2dfe52c8739cd428a13f2213d5ec786e
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| fc3349b1862297aa7b00dbd684cfa5f86e183f3a |
30-Aug-2013 |
Jonathan Dixon <joth@google.com> |
am 9cf31969: Merge "Fix bug 10533304 - HD Wallpapers access getProgress on wrong thread" into klp-dev
* commit '9cf31969a3e2e33d750b881ac6a4b3e980a5952a':
Fix bug 10533304 - HD Wallpapers access getProgress on wrong thread
|
| 9cf31969a3e2e33d750b881ac6a4b3e980a5952a |
30-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Fix bug 10533304 - HD Wallpapers access getProgress on wrong thread" into klp-dev
|
| 383b5936db2295d299bffa4d3f13ce7ad7cee574 |
29-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
am 3b31fa53: Merge "More diagnostics for methods called from the wrong thread" into klp-dev
* commit '3b31fa53b24614e84d1c04354abc2703391bfb19':
More diagnostics for methods called from the wrong thread
|
| 3b31fa53b24614e84d1c04354abc2703391bfb19 |
29-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "More diagnostics for methods called from the wrong thread" into klp-dev
|
| a0d2245b6e41fabd599513a22ed1f6e00be06284 |
29-Aug-2013 |
Martin Kosiba <mkosiba@google.com> |
Increase char limits for time picker strings.
This increases the string size limits to follow http://crrev.com/23597006
BUG: 10425439
Change-Id: I761f3d8629d1f8a44da24b615a886b4ef8322d53
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| fad276fd1199b127ad10c0735d4d44ae02fbdc36 |
29-Aug-2013 |
Ben Murdoch <benm@google.com> |
am ef6e94b3: Merge "Update CHAR-LIMIT on webviewchromium_media_player_loading_video string" into klp-dev
* commit 'ef6e94b3aca5d82cc786b2e5df29de0eff9bda37':
Update CHAR-LIMIT on webviewchromium_media_player_loading_video string
|
| ef6e94b3aca5d82cc786b2e5df29de0eff9bda37 |
29-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge "Update CHAR-LIMIT on webviewchromium_media_player_loading_video string" into klp-dev
|
| 8d696a5f5813a468ff0f5668ab67976ae2a434bf |
29-Aug-2013 |
Ben Murdoch <benm@google.com> |
Update CHAR-LIMIT on webviewchromium_media_player_loading_video string
Translators have requested more characters, not an issue.
Bug: 10417737
Change-Id: I5d7a54ea4af5fab7d6955789e5c8129a4bfd97f5
(cherry picked from commit 2ee9a9223c543eebbbf5a761abee93dc64f952ad)
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| 2ee9a9223c543eebbbf5a761abee93dc64f952ad |
29-Aug-2013 |
Ben Murdoch <benm@google.com> |
Update CHAR-LIMIT on webviewchromium_media_player_loading_video string
Translators have requested more characters, not an issue.
Bug: 10417737
Change-Id: I5d7a54ea4af5fab7d6955789e5c8129a4bfd97f5
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| ba6b9ea64398b9b0e2ce41a2932177d06504a3fb |
29-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 16f89c0118e5850c78931e5a113509a30c0a9007 |
29-Aug-2013 |
Ben Murdoch <benm@google.com> |
am 9cb4b295: Merge "Change WebView.setNetworkAvailable plumbing." into klp-dev
* commit '9cb4b295387c46126e4dbb2b0035310fa9f27038':
Change WebView.setNetworkAvailable plumbing.
|
| 9cb4b295387c46126e4dbb2b0035310fa9f27038 |
29-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge "Change WebView.setNetworkAvailable plumbing." into klp-dev
|
| b28309c3f6d4527ccf98142468f99d056f137cbf |
29-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge "Change WebView.setNetworkAvailable plumbing." into master-chromium
|
| d43c55dd91cf7dd1bcd18d01e16acd5e55de0471 |
29-Aug-2013 |
Ben Murdoch <benm@google.com> |
Implement WebViewChromium.freeMemory.
This API now an intentional no-op as Chromium will manage
WebView memory automatically.
Bug: 5012874
Change-Id: I0d72a80333704bb88af96e9492a9029b02c93280
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| ae3d324799c5d946c3d073ac8a14b019f03c92c1 |
29-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am 3108e9ae: (-s ours) Import translations. DO NOT MERGE
* commit '3108e9ae2611c0897a48188e45e4106c70e109da':
Import translations. DO NOT MERGE
|
| b8273946b389ebf0904058bd4e8f2630b0539e99 |
29-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-chromium
|
| c0c86c037ea697da375ae28c543cae9b050d6b68 |
29-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Fix bug 10533304 - HD Wallpapers access getProgress on wrong thread
As this value is cached in java in the implementation, we can just skip
the thread check (new apps still get the WebView layer checkThread
exception as intended).
Change-Id: Ic6e75f184a5f73f4841ac6797dfd4f16cf01882f
(cherry picked from commit 82b14b967dab90194bd2ce69539031e46a82dfe9)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 82b14b967dab90194bd2ce69539031e46a82dfe9 |
29-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Fix bug 10533304 - HD Wallpapers access getProgress on wrong thread
As this value is cached in java in the implementation, we can just skip
the thread check (new apps still get the WebView layer checkThread
exception as intended).
Change-Id: Ic6e75f184a5f73f4841ac6797dfd4f16cf01882f
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 58d791cddf0f486401b9814853bd335678ee4feb |
29-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I76fbd0f8d65d772af56179d76613f6a9e57fc7fc
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| 9a547673781e4bd5eb71efd2af4a09eff81eff0f |
29-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ie714e1f265c6a7bd8772c6a91107fadcad06a477
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-az-rAZ/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
|
| 3108e9ae2611c0897a48188e45e4106c70e109da |
29-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8329e0cc877342f32d503899b055cc1ed067c1df
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-az-rAZ/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn-rMN/strings.xml
|
| ab73853ea633a4ada353f5a2321c6bf0e6c108e5 |
27-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
More diagnostics for methods called from the wrong thread
- Add checkThread for constructor
- Throw Exception from both threads
BUG 10428080
Change-Id: Iea350f541953c8af00217acd6f1c93a5f57fd6e3
(cherry picked from commit 8be13fb6c221129a454f0a58d38df7bd75b4be0f)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| b3848ed2fa92a24d3d924115c016875cc795682a |
28-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "More diagnostics for methods called from the wrong thread" into master-chromium
|
| 01a795cf3dd79fcab1f8a125578539ab0e8176ff |
28-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| a104b0ab7508f295eaf26a2b10e2815e7ddd280c |
28-Aug-2013 |
Mikhail Naganov <mnaganov@google.com> |
Enable web layout quirks for apps with targetSdkVersion < KLP
BUG=10183494
Change-Id: I00cf59abc99dd22f03004c78e98599309f151638
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| d25d8211da86353e4cd33d5496fdc076cfba917f |
27-Aug-2013 |
Ben Murdoch <benm@google.com> |
Change WebView.setNetworkAvailable plumbing.
Use new AwContents API for backwards compatibility rather than
informing the network stack.
Bug: 10154677
Change-Id: I85db125c7bbcd7ac8d4fce9e689df519a5ebe365
(cherry picked from commit 0363422b19ca6263dbfbcd0d9daa6d1abe5c6892)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 8be13fb6c221129a454f0a58d38df7bd75b4be0f |
27-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
More diagnostics for methods called from the wrong thread
- Add checkThread for constructor
- Throw Exception from both threads
BUG 10428080
Change-Id: Iea350f541953c8af00217acd6f1c93a5f57fd6e3
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 7c3f69f328705bbcb1868ad895ec7a0a3ac319ed |
28-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am df72e595: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'df72e59525a1a11ea4276e65620c18e21cbc22b2':
Import translations. DO NOT MERGE
|
| df72e59525a1a11ea4276e65620c18e21cbc22b2 |
28-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
| b3f193b8080c983327d9f741ccad93d2ecabca78 |
27-Aug-2013 |
Ben Murdoch <benm@google.com> |
am fe4c5712: Merge "Fix styled attribute resolution in WebView." into klp-dev
* commit 'fe4c571226f77a661de8e3a576ece2d9a314001e':
Fix styled attribute resolution in WebView.
|
| fe4c571226f77a661de8e3a576ece2d9a314001e |
27-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge "Fix styled attribute resolution in WebView." into klp-dev
|
| a43ddf6a451a2d6458535350d6095536abdf5736 |
23-Aug-2013 |
Ben Murdoch <benm@google.com> |
Fix styled attribute resolution in WebView.
We need to correctly style the resource ID for the current app rather
than just extracting the resource from the Theme.
Bug: 10110507
Change-Id: I1d6a90580c95f23fdb36a53557f675bb820b314f
(cherry picked from commit 8a6963ba9b282825e8932e018ab6e2e53ddd9260)
hromium/java/com/android/webview/chromium/ResourceProvider.java
|
| c228c9f8ac589c86af61d541799a505a8b65a6e4 |
27-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
am 57b714b4: Ferrying setBackgroundColor to the UI thread
* commit '57b714b4b5f44c9a385836c7074e4f879ad7a767':
Ferrying setBackgroundColor to the UI thread
|
| 0363422b19ca6263dbfbcd0d9daa6d1abe5c6892 |
27-Aug-2013 |
Ben Murdoch <benm@google.com> |
Change WebView.setNetworkAvailable plumbing.
Use new AwContents API for backwards compatibility rather than
informing the network stack.
Bug: 10154677
Change-Id: I85db125c7bbcd7ac8d4fce9e689df519a5ebe365
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 8a6963ba9b282825e8932e018ab6e2e53ddd9260 |
23-Aug-2013 |
Ben Murdoch <benm@google.com> |
Fix styled attribute resolution in WebView.
We need to correctly style the resource ID for the current app rather
than just extracting the resource from the Theme.
Bug: 10110507
Change-Id: I1d6a90580c95f23fdb36a53557f675bb820b314f
hromium/java/com/android/webview/chromium/ResourceProvider.java
|
| 57b714b4b5f44c9a385836c7074e4f879ad7a767 |
26-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Ferrying setBackgroundColor to the UI thread
It is just a void setter so trivial. Marking getViewDelegate as
threadsafe since it is harder to move that to the UI thread, and
it is safe (just return this).
Finally throwing the thread violation exception on the UI thread
so it will (most likely) kill the app. Creating the exception on
the violating thread so we get the right stack trace.
BUG=10468752
Change-Id: If151594517406952342a64c89caddac334aa255a
(cherry picked from commit fd8af99006b1b5afbc9168994390a9df94e884d2)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| fd8af99006b1b5afbc9168994390a9df94e884d2 |
26-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Ferrying setBackgroundColor to the UI thread
It is just a void setter so trivial. Marking getViewDelegate as
threadsafe since it is harder to move that to the UI thread, and
it is safe (just return this).
Finally throwing the thread violation exception on the UI thread
so it will (most likely) kill the app. Creating the exception on
the violating thread so we get the right stack trace.
BUG=10468752
Change-Id: If151594517406952342a64c89caddac334aa255a
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| f93d42710fdadc511b56bcdc826b7da5ee4ae2d2 |
27-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
am da5db0da: Merge "Fix for b/10428080: Check that apps are calling View methods on UI thread" into klp-dev
* commit 'da5db0dadd27c0fdd3b626b8705cb9b1d91d2da3':
Fix for b/10428080: Check that apps are calling View methods on UI thread
|
| 53e4558c1ccdc263315e9a4fc910877aa019e0b5 |
27-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am 369d3e50: (-s ours) Import translations. DO NOT MERGE
* commit '369d3e508c8468e09d858725a28c453e5dfa3a07':
Import translations. DO NOT MERGE
|
| e2c475ce58ba0e6dc2d72dd876ed863a11c08d9c |
22-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Fix for b/10428080: Check that apps are calling View methods on UI thread
Cherry-pick from klp-dev
Change-Id: If71020921e9f89def38f2fa6399de363b3fb85d4
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 44304d7d7e6bc5177cde8d0daf25cd31d9da6590 |
26-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I08f1ee4d5c241e46e5ed91855161b5ef820426f2
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne-rNP/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si-rLK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| ecfe96308055762cf56365ddfe2e4312b2088b67 |
26-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: If2e0c0ec68661d9c3c4df0a5f240df25ec0a3590
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
|
| a0fbba7e303eaf2a2a49e8936006416bc89c5a55 |
26-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 78f9ee964b191168c5d443e87806e0a3f71adc60 |
23-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I4e2fe7735513ae28fd3da64e555a29a135e21628
Auto-generated-cl: translation import
Conflicts:
chromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
chromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne-rNP/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si-rLK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| e7724b41b327660a3b3d6d4f0580da7cbe03be64 |
15-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Temp fix for bug 10152369: Broken SW draw with multiple layers
We didn't know this was possible. For now just early out with null.
Change-Id: I9bce3130dc79c32e28c96a4755101d0dd5218126
(cherry picked from commit a77d0c1c7ac335e66004daf977fa86840f063304)
hromium/plat_support/graphics_utils.cpp
|
| 1f76368786ae12898311d148b0057403db2fb36a |
15-Aug-2013 |
Martin Kosiba <mkosiba@google.com> |
Hook up requestChildRectangleOnScreen.
Bug: 8272756
Cherry-pick from master-chromium
I121d9d4ac847f7db41763f92ba3eef406f06134f
+ conflict manually resolved
Change-Id: I121d9d4ac847f7db41763f92ba3eef406f06134f
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| e3145d2889cb61b5baee0752c007ef0430cb8b33 |
24-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Hook up requestChildRectangleOnScreen." into master-chromium
|
| da5db0dadd27c0fdd3b626b8705cb9b1d91d2da3 |
23-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Fix for b/10428080: Check that apps are calling View methods on UI thread" into klp-dev
|
| 369d3e508c8468e09d858725a28c453e5dfa3a07 |
23-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I4e2fe7735513ae28fd3da64e555a29a135e21628
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et-rEE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy-rAM/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka-rGE/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km-rKH/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo-rLA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms-rMY/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne-rNP/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si-rLK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| 1288703e083815c825376c060171dd1c02e2563e |
23-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r219274
This commit was generated by merge_to_master.py.
Change-Id: I2487728d1c9912295dd837af62d9c67374f2b6ab
|
| 2cac4acbd23318acbf6d6c0aa7bd58f622882ffe |
22-Aug-2013 |
Tao Bai <michaelbai@google.com> |
Use evaluateJavaScriptEvenIfNotYetNavigated for loadUrl JavaScript:
This will initialized a empty document if there is no existing one.
Bug: 10123053
Change-Id: Id404822e76e3742a88dbe7a6934a9d06ecf143ae
(cherry picked from commit 71e5c429c0e4cf5deacc79b03e30d139024c67f2)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| ae75b6aaa9b8373fd2411dd893db33a438ed2e5a |
22-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am 89e6a8b8: (-s ours) Import translations. DO NOT MERGE
* commit '89e6a8b8a356d0bd3046dc3abd74b3dd7896a9e5':
Import translations. DO NOT MERGE
|
| 462ed83b91b655327ff2f41f2ad2d181658b9438 |
22-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ibf78c4d481e2f994187bb09c0f84c9aa00899fca
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| c030ba318a7c7470facbf77a802533675a905d25 |
22-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I401b4913b6ffac093204ffcdc90e3443da5771a9
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| 89e6a8b8a356d0bd3046dc3abd74b3dd7896a9e5 |
22-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I899ae6ee0a3b24b6a554e22c484069a7315a722b
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ar/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-bg/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ca/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-cs/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-da/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-es/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-et/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fa/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-in/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ja/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ka/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-km/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ko/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lo/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-lv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ms/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ne/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ro/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-ru/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-si/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sk/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sv/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-th/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-tr/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-vi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-zu/strings.xml
|
| 62389e2d66a99e936652092333782947e363241d |
22-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Fix for b/10428080: Check that apps are calling View methods on UI thread
Change-Id: If71020921e9f89def38f2fa6399de363b3fb85d4
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| cdf8926cd597c0059515694f6f53bcf66493d8c2 |
22-Aug-2013 |
Tao Bai <michaelbai@google.com> |
Use evaluateJavaScriptEvenIfNotYetNavigated for loadUrl JavaScript:
This will initialize an empty initial document if there is no existing one.
Bug: 10123053
Depends on change Ic7c99f9bedf3c8bed74b1e5b8ff8b8f388be8330
Change-Id: Id404822e76e3742a88dbe7a6934a9d06ecf143ae
(cherry picked from commit 71e5c429c0e4cf5deacc79b03e30d139024c67f2)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 7f72c0a7236af1de256c10dace5e13b6e75b66bf |
22-Aug-2013 |
Tao Bai <michaelbai@google.com> |
am 3d52163e: Use evaluateJavaScriptEvenIfNotYetNavigated for loadUrl JavaScript:
* commit '3d52163e1c466860651414670c59762f5bdd269f':
Use evaluateJavaScriptEvenIfNotYetNavigated for loadUrl JavaScript:
|
| 3d52163e1c466860651414670c59762f5bdd269f |
22-Aug-2013 |
Tao Bai <michaelbai@google.com> |
Use evaluateJavaScriptEvenIfNotYetNavigated for loadUrl JavaScript:
This will initialize an empty initial document if there is no existing one.
Bug: 10123053
Depends on change Ic7c99f9bedf3c8bed74b1e5b8ff8b8f388be8330
Change-Id: Id404822e76e3742a88dbe7a6934a9d06ecf143ae
(cherry picked from commit 71e5c429c0e4cf5deacc79b03e30d139024c67f2)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| aee0179dc7910546069b7af05f2fec033b93f343 |
22-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am aa8a8f95: (-s ours) Import translations. DO NOT MERGE
* commit 'aa8a8f953177bc3ffa493e2bee69e9062a209bd7':
Import translations. DO NOT MERGE
|
| 3b3fae8c1360699564bc1c4cb3695f5949a41686 |
21-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I5bda190f6782ad557702a289d02f35d0953c8639
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
|
| 97e6dc556d8571e784216d5ca5b1a77c13c8f020 |
21-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I3cd2445f57e1ee86fb7779124fa325c8b639db96
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
|
| aa8a8f953177bc3ffa493e2bee69e9062a209bd7 |
21-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I91157dcaacac22a93f029157995ed6ced69751e5
Auto-generated-cl: translation import
hromium/overlay/frameworks/base/core/res/res/values-af/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-am/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-az/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-de/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-el/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-fi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hi/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hu/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-hy/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-it/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-iw/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-mn/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nb/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-nl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-pt/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-sl/strings.xml
hromium/overlay/frameworks/base/core/res/res/values-uk/strings.xml
|
| a1e8f98db9b49c2c45ac8b9e416c13617544bc27 |
21-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 307a2740a4425c9714da2a5c007d0cccb4810429 |
21-Aug-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Added the callback signal to the glue layer." into klp-dev
|
| 54a6e3d0cc566df6cec6807c0c03f05664de0a55 |
20-Aug-2013 |
Selim Gurun <sgurun@google.com> |
Added the callback signal to the glue layer.
Bug: 10190508
Change-Id: Ic5ce72dc6dcdd2fe0cb7d4d6a15f9245f3dec18f
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 5206bdea751a8cda430d3e3d058fe73a34f22730 |
19-Aug-2013 |
Ben Murdoch <benm@google.com> |
Show visible feedback that private browsing not supported.
As well as a message in logcat, provide visual feedback that the
WebView no longer supports private browsing when an app attempts
to create one.
Bug: 7390806
Change-Id: I9c66bcf9e55f4c085475ab462a0d6e846c55e4dc
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| 33e1eeae98299666b8c2d1e879f92d1c83fe33fb |
19-Aug-2013 |
Ben Murdoch <benm@google.com> |
Show visible feedback that private browsing not supported.
Cherry pick of
https://googleplex-android-review.googlesource.com/#/c/345036/
As well as a message in logcat, provide visual feedback that the
WebView no longer supports private browsing when an app attempts
to create one.
Bug: 7390806
Change-Id: Ife5af3968bd830bedc49fe217df523a05bcd016d
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| afe5469e29b3c0e7ffab2e684ee6e2335d5ff3f0 |
15-Aug-2013 |
Martin Kosiba <mkosiba@google.com> |
Add resources for the new time picker dialog.
Depends on http://crrev.com/22921005 rolling down.
Change-Id: Ic23da55790ea4677f5a221b1628d06a655834ed0
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_multi_field_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| b87ddad878e77275661c84451328e04db83e8739 |
15-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Temp fix for bug 10152369: Broken SW draw with multiple layers
We didn't know this was possible. For now just early out with null.
Change-Id: I9bce3130dc79c32e28c96a4755101d0dd5218126
hromium/plat_support/graphics_utils.cpp
|
| e9542c07dd10a17adf5df9dbb421a99db05083ce |
16-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Temp fix for bug 10152369: Broken SW draw with multiple layers" into klp-dev
|
| a77d0c1c7ac335e66004daf977fa86840f063304 |
15-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Temp fix for bug 10152369: Broken SW draw with multiple layers
We didn't know this was possible. For now just early out with null.
Change-Id: I9bce3130dc79c32e28c96a4755101d0dd5218126
hromium/plat_support/graphics_utils.cpp
|
| 9d2ccda49368f5167c8204cacfca053bea8ae963 |
15-Aug-2013 |
Martin Kosiba <mkosiba@google.com> |
Hook up requestChildRectangleOnScreen.
BUG:8272756
Change-Id: I121d9d4ac847f7db41763f92ba3eef406f06134f
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 126cdadb8fedc010c557f3eae23a08edf8223606 |
14-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r217147
This commit was generated by merge_to_master.py.
Change-Id: I39350d277f792083d8412a95bc3daa24a9abda85
|
| 315d507e3242f9dfe51560349c940717f9c0b40b |
14-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into klp-dev at r217147
This commit was generated by merge_to_master.py.
Change-Id: Ib9ed4d2689a50f8ab75be4ff69ac4c709be02c9b
|
| 3e4e8cf37dfb631bbdf1aa5b04410bf038065fe6 |
14-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Follow up fix for bug 10154699
My last fix hangs the UI thread as this is different on the old
and new WebView.
Change-Id: I95675d2735f62ab06644c7d6edf1525b4266e58f
(cherry picked from commit fa824b4e111b53fb0981eb0dec3d254bf2c300ee)
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| fa824b4e111b53fb0981eb0dec3d254bf2c300ee |
14-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Follow up fix for bug 10154699
My last fix hangs the UI thread as this is different on the old
and new WebView.
Change-Id: I95675d2735f62ab06644c7d6edf1525b4266e58f
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 993c840007024478a23ad2dd612edc5c6f8313df |
13-Aug-2013 |
Selim Gurun <sgurun@google.com> |
Correctly specify the content type for post data.
Bug: 10188709
The webview classic sets the content type to application/x-www-form-urlencoded
for all posts. Keep the same behavior.
Change-Id: I1d154b4e9681403d26bb405de9b7b2ca6d321d38
(cherry picked from commit b8281877c710018a3bc8066be17b1e11822be015)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 9cdb871719cf8c695e829eacdb24c50b1bd884cf |
14-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Fix for bug 10154699, debug popups" into klp-dev
|
| f7c51728c43a6d0a981492f7f40bff313fc0401a |
14-Aug-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Correctly specify the content type for post data." into klp-dev
|
| b8281877c710018a3bc8066be17b1e11822be015 |
13-Aug-2013 |
Selim Gurun <sgurun@google.com> |
Correctly specify the content type for post data.
Bug: 10188709
The webview classic sets the content type to application/x-www-form-urlencoded
for all posts. Keep the same behavior.
Change-Id: I1d154b4e9681403d26bb405de9b7b2ca6d321d38
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 33e0aee95766f7091948865f4753eae3ed6f6306 |
13-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Fix for bug 10154699, debug popups
Classic WebView had a state with a null webchromeclient, and did
not show alerts when that was the case.
Change-Id: I7f48dca440f1f6e61ad19c43e9e9d9769d30b581
(cherry picked from commit 384082f8b157276c85b658d8dc254e3489f8f944)
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 384082f8b157276c85b658d8dc254e3489f8f944 |
13-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Fix for bug 10154699, debug popups
Classic WebView had a state with a null webchromeclient, and did
not show alerts when that was the case.
Change-Id: I7f48dca440f1f6e61ad19c43e9e9d9769d30b581
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| bc67697213d7982da70a12b666d6b33e56c58d35 |
13-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into klp-dev at r217092
This commit was generated by merge_to_master.py.
Change-Id: Ib1d5cd124d5f797fe0fc6a691292fb324c887956
|
| dfff2ed377011d5cfdce1feff942ffede31c2c2e |
06-Aug-2013 |
Selim Gurun <sgurun@google.com> |
Add the webview glue layer API for exporting pdf
Bug:10190508
Note that this does not implement the call to the upstream logic
yet. That is for a follow up CL.
(cherry picked from commit 49a1a6f9f27b63687edc1d98f842627d4719a327)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| b7cc3fedfb448316e47ed77f6389cefd86f5d3ff |
06-Aug-2013 |
Selim Gurun <sgurun@google.com> |
Add the webview glue layer API for exporting pdf
Bug:10190508
Note that this does not implement the call to the upstream logic
yet. That is for a follow up CL.
(cherry picked from commit 49a1a6f9f27b63687edc1d98f842627d4719a327)
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 5fab542d36a1708295ea802401708ba393eae026 |
12-Aug-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Add the webview glue layer API for exporting pdf" into klp-dev
|
| 49a1a6f9f27b63687edc1d98f842627d4719a327 |
06-Aug-2013 |
Selim Gurun <sgurun@google.com> |
Add the webview glue layer API for exporting pdf
Bug:10190508
Note that this does not implement the call to the upstream logic
yet. That is for a follow up CL.
Change-Id: I59f74139f0d41a51bf2f3b038564a4fbcd50a2e6
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 0b5ed0e44197e2e2876e560c4b4582516d2b6fa0 |
12-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r216972
This commit was generated by merge_to_master.py.
Change-Id: I26f30df29dc8409a6a4cc79bd308d70f1078adee
|
| 1f32af5a938f7b2921470e1b92a857d426d586c6 |
12-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into klp-dev at r216972
This commit was generated by merge_to_master.py.
Change-Id: Id8e25bc6127fbdfb9d0ad7d2ac839b68440aa871
|
| 01bba97b4e1c324a356c40038358809c4fc843b2 |
12-Aug-2013 |
Martin Kosiba <mkosiba@google.com> |
Merge "Hook up scrollbar support." into master-chromium
|
| 7eaa46dc95f9461cdb5f04c574c6b94a64fd4fbb |
12-Aug-2013 |
Ben Murdoch <benm@google.com> |
WebView Automerger - don't try to merge googleurl anymore.
the googleurl project is now part of the main chromium project
and not pulled via DEPS anymore. Remove it from the merge script.
Change-Id: I984e338f7e3c60eacb59baf810e7ce688b46ea21
(cherry picked from commit 1877218f76a9fd423566d653593083bc9ea8fd13)
hromium/tools/merge_common.py
|
| 1877218f76a9fd423566d653593083bc9ea8fd13 |
12-Aug-2013 |
Ben Murdoch <benm@google.com> |
WebView Automerger - don't try to merge googleurl anymore.
the googleurl project is now part of the main chromium project
and not pulled via DEPS anymore. Remove it from the merge script.
Change-Id: I984e338f7e3c60eacb59baf810e7ce688b46ea21
hromium/tools/merge_common.py
|
| 5f1ac8eddb1a91c53453b05d9530b783f3c6e07d |
11-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into klp-dev at r216896
This commit was generated by merge_to_master.py.
Change-Id: I79327905d3e1aee7359b4146f1981233af5e2518
|
| 364e97a049927e74db4888d19c2f4cee17e91a27 |
11-Aug-2013 |
Jonathan Dixon <joth@google.com> |
Remove use of obsolete clip_region
To allow it to be removed upstream in a single patch, switch to using
memset(0) rather than explicitly zeroing the obsolete members.
Change-Id: I632699a2d6bdde8649e0b116756d6dafee8232c9
hromium/plat_support/graphics_utils.cpp
|
| 5c324e7af9e99afec4caf6cd48aecf2d1a596b28 |
25-Jul-2013 |
Jonathan Dixon <joth@google.com> |
Use new config and clip representation
Follow up to https://codereview.chromium.org/20234002/ to fill in the
new clip and config representations.
Change-Id: I081d1eb3ffa0454340caa67389f98bd61b2b2d29
hromium/plat_support/graphics_utils.cpp
|
| bd819ca872a1711e4607ef11cd8b0b2156241897 |
06-Aug-2013 |
Martin Kosiba <mkosiba@google.com> |
Hook up scrollbar support.
This hooks up scrollbar support.
BUG:4591822,6702676
Change-Id: I476e0d010298202c1b38ef5c385791d9b4544d69
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 0ee6d7260f3280f620f5d7943e9def20147ade0c |
08-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r216370
This commit was generated by merge_to_master.py.
Change-Id: I9998d225b1d460f03c25dc5fb6407d4a464f0cfc
|
| d0b852900b559eabbeaa2136d69c89b68f59f449 |
07-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge scripts: allow merging to non-master branches." into master-chromium
|
| 0514f684d6c9e6212990287746aa8f58f7f43c57 |
07-Aug-2013 |
Martin Kosiba <mkosiba@google.com> |
Merge "Add the super_getScrollBarStyle InternalAccessAdapter method." into master-chromium
|
| 6adc8a2e72d90b3a5c1cf7cf7ec7be2f6c974851 |
07-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: allow merging to non-master branches.
Add a --target parameter to merge_to_master.py to allow merging code
from master-chromium to any target branch which was branched from
master (such as a -dev branch).
Change-Id: I4d318d1d9650489b2abe2faf7076675fd01a90d8
hromium/tools/merge_to_master.py
|
| 0088640069ac3ed389f4d78582966248b0869ce9 |
06-Aug-2013 |
Martin Kosiba <mkosiba@google.com> |
Add the super_getScrollBarStyle InternalAccessAdapter method.
This will be required once http://crrev.com/22456002 lands.
Change-Id: Idb1d8853535a987598fc93fe17229d69b6ee9f0c
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 3e91eeea13105385f4952498c68ad39280862122 |
07-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r216133
This commit was generated by merge_to_master.py.
Change-Id: I97303bdea972656e8cdfd0f47436fe0b32782a64
|
| e20af1033cdbf091333cad7b359ed9d25fc6fcbb |
07-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Fix for bug 10152391: Apps using loadDateWith... on other threads" into master-chromium
|
| a125e0eeade22bc4b7a998e8f0e732c0f965663f |
05-Aug-2013 |
Kristian Monsen <kristianm@google.com> |
Fix for bug 10152391: Apps using loadDateWith... on other threads
Posting it to the UI thread for them. Tempted to do it proactivly
for a few other methods as well.
Change-Id: I9ef050e4aac66af2157bb46a018aa9e5d71d0b1f
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 19b22dbf30aec2f35bfbdbc80f9fa01e98d563e8 |
06-Aug-2013 |
Ben Murdoch <benm@google.com> |
Fix up NPE in onNewPicture from onPageFinished.
Some apps are relying on a non-null Picture still. So to enable
wider dogfooding, don't crash them.
BUG=b/10141739
Change-Id: Idbd477373b81e3ece8ec3157670d76b1098adb45
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| a855818f1f97b3c2fed994b3216ea2cb42d53f8c |
06-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r215849
This commit was generated by merge_to_master.py.
Change-Id: I078ac3ca0d2507894ac3cd02fafeb25f3cdb9338
|
| 7fd1d813e7f206ff7a25ee8fca36c4cbe860b361 |
05-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: actually print the generated review details.
The push in frameworks/webview outputs the review URL from Rietveld;
spit this output out as "info" so that it's actually displayed; debug
logging is invisible by default.
Change-Id: I6024797f35ead734c2ad8f24724603ffb27c7cbf
hromium/tools/merge_to_master.py
|
| 1e75039b37d8dfcda69451c7d51436e06125905c |
05-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r215573
This commit was generated by merge_to_master.py.
Change-Id: Ic3e42ff848e8452c4714fa04c6d8af0f2c16718b
|
| 3ec6f231ebe47f01e8fada97209d1b888d757615 |
05-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Automerger: generate makefiles before checking licenses.
When an upstream third_party directory is removed, it may still exist in
our downstream checkout because of previously generated makefiles,
breaking the license checks. Fix this by splitting the license check
into a separate step, and doing it after makefile regeneration.
Change-Id: I871c22eda5954cdb643cac5b35783192ed61d3a7
hromium/tools/merge_from_chromium.py
|
| 2a120ba09921dbb1e8354ecbc4a6e063ec891101 |
01-Aug-2013 |
Martin Kosiba <mkosiba@google.com> |
Hook up computeScroll.
This hooks up the computeScroll call.
Change-Id: If5b86e3e858f0476b95ad9415ca52dcbca6c4f5a
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 6cf242319657b4162c49afee070bf780b4be5f48 |
01-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge "Add Colour picker border resources." into master-chromium
|
| 6c29f2c2125858406c6e2562deab6e0a35fe746a |
31-Jul-2013 |
Ben Murdoch <benm@google.com> |
Add Colour picker border resources.
Depends on https://chromiumcodereview.appspot.com/19690009/
rolling down.
Change-Id: Ia6dcd47120c39d420d478d314f5da2ece84fa49d
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_border.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/colors.xml
|
| 58324375a4ba319e7b114f3afece23a98de3f373 |
31-Jul-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: automate more of merge_to_master.
Allow merge_to_master.py to be given the path to a repo.prop file (from
the build system). This will be used to detect the revision of chromium
to merge automatically, and will also be used to create and upload a
merge CL for review for frameworks/webview. Also, update all the remotes
explictly when running the script to remove the need to sync both master
and master-chromium first; you can now just run the script on a
master-chromium checkout.
Change-Id: Ie812bac3f23864dde64ceebedb443e7afbe0571f
hromium/tools/merge_to_master.py
|
| fe1e1418b6c6d4d9492feb627aa2af5fadd8eb53 |
31-Jul-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge new libjingle repo.
Chromium rearranged the libjingle checkout; start merging the new one.
Change-Id: Ie86f6514b6448177361d257a0d98d9833e2575d7
hromium/tools/merge_common.py
|
| 70bf4c997ea13320710f74e098d943e1d0f3fdda |
31-Jul-2013 |
Torne (Richard Coles) <torne@google.com> |
Remove libjingle from the project list.
libjingle has moved upstream; stop merging it for now until we've
created the new project (or removed this dependency).
This reverts commit a20a107b5f4470d7fe1a483a493729220e8ba216.
hromium/tools/merge_common.py
|
| 6d2f72223f8036926797aee7e0933429907e64c2 |
31-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium to master at r214391.
|
| 5097893bd11146baf8822d7b422f407f8e7b9624 |
31-Jul-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Fix possible race deadlock in webview chromium init" into master-chromium
|
| 72db47d0508d6733072c38ee44883ecfaf612ca6 |
31-Jul-2013 |
Jonathan Dixon <joth@google.com> |
Fix possible race deadlock in webview chromium init
Bug: 10094744
Don't block waiting on UI thread to do work that needs to take the lock
we're already holding.
Change-Id: Ia37f5c6e29899c99e17342c9c065c88429323cd0
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| d325a24d20a3ea8ddddd6c0cacf00efd8a9a74b4 |
30-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r214332.
|
| 932b3026584bbdff8795737e1bf766ee56fb9662 |
30-Jul-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge "Revert "Fix Automerger"" into master-chromium
|
| a20a107b5f4470d7fe1a483a493729220e8ba216 |
30-Jul-2013 |
Torne (Richard Coles) <torne@google.com> |
Revert "Fix Automerger"
This reverts commit 9f110615014e3a578fab6b60c2f24e16e5a8866a.
Change-Id: I7d15a4c31fa80af0ecab80bd270a15d63b51258d
hromium/tools/merge_common.py
|
| a8d8bbaa5a77896298b5e65a9980a92d15e0276f |
30-Jul-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Fix Automerger" into master-chromium
|
| 9f110615014e3a578fab6b60c2f24e16e5a8866a |
30-Jul-2013 |
Selim Gurun <sgurun@google.com> |
Fix Automerger
Fixing automerger problem that was created due to
https://codereview.chromium.org/21020006
Change-Id: Iea40d2420ae5576d75569fb02a928bb44494845c
hromium/tools/merge_common.py
|
| d90e51a1f7579f6b6a4f85493fc0d62cf56cb1de |
26-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium to master at r213780
|
| 2841152693d0410f8e8c309aae514329f008a612 |
25-Jul-2013 |
Martin Kosiba <mkosiba@google.com> |
Add a comment to setOverScrollMode.
This explains why mAwContents can be null in that method.
Change-Id: I6350f8e65258dea462bb3ce5496d2af2bea271ae
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| f6bf9fff6ed4b8ba55f2b172e48dba96f26d578e |
25-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge "Hookup setOverScrollMode." into master-chromium
|
| ab5398debe64d34306b0f709a93d840078ae181d |
23-Jul-2013 |
Martin Kosiba <mkosiba@google.com> |
Hookup setOverScrollMode.
This hooks up the setOverScrollMode API.
BUG:6946454
Change-Id: Ied414e1ec61e9d687f774389388d84086a1b62de
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 8d2df5c7de263d7661178a90a2c97956338aeb1a |
25-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium to master at r213605.
|
| 2d3cf4af11b27d517757345562014ed8eda602ba |
24-Jul-2013 |
Torne (Richard Coles) <torne@google.com> |
Remove v8-i18n from project list.
This project is no longer required/used upstream.
Change-Id: I9efe87507b6a9f33c2ec4b0de9a9fed36a45845e
hromium/tools/merge_common.py
|
| 1152d437f4b8f94368befdee8250af897014b0ab |
24-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium to master at r213371
|
| e82e60cfe4df180d0a5b0ec1f40187c4b1dbcaed |
24-Jul-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Hookup WebViewChromium.setBackgroundColor" into master-chromium
|
| a93cffea924aee015b0fce2672f7a1923d63339c |
23-Jul-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Fix rendering error when Canvas has a layer" into master-chromium
|
| 52dbec0d199461e4631cec25f8f0706c8ece3029 |
23-Jul-2013 |
Jonathan Dixon <joth@google.com> |
Fix rendering error when Canvas has a layer
Bug: 9953588
We were using the top device to access bitmap (good) but then using the
aggregate layer-stack of matrix and clip (bad).
Now consistently uses the top layer to get all this information.
Change-Id: Ia093cd334965e338ff2714cc023330836ffac27a
hromium/plat_support/graphics_utils.cpp
|
| efea4d8fe88696d8ced7711192e8471eabd7c3d8 |
22-Jul-2013 |
Ben Murdoch <benm@google.com> |
Fix handling of non-data: base-URL loads.
When faced with a non-data:scheme base URL, the classic WebView
would simply dump the data string into the WebView (using the passed
mime type) without performing the usual URL loading steps such as
decoding URL encoded entities.
Fix the WebViewChromium implementation to also have this behavior -
prior to this CL we would load all data (regardless of the base URL)
passed to loadDataWithBaseUrl as a data: URL. This meant that inside
the Chromium stack we'd treat these loads as regular URL loads and
perform the URL entity decode. Some apps relied on this decode not
happening so this is primarily a backwards compatibility quirk.
Bug: 9894754
Change-Id: I942634a09dbcf6db799a1daf64ba334757b1fa79
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 12cd3222435091dadc435481620acd7d5d144ac7 |
23-Jul-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Address proguard warnings." into master-chromium
|
| 2b1125696365cdbac1b6641ac0ad06ca3952ad75 |
23-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium to master at r213057.
Merge commit '245b3a6a2a7850a46536a423594286e04e702006' into merge-to-master
|
| a27370cb104cb70b8da4d0c3c749b0fab1f271dc |
20-Jul-2013 |
Selim Gurun <sgurun@google.com> |
Address proguard warnings.
Explicitly keep the classes that proguard generates warnings for.
These classes are parameters to methods of entry points.
Change-Id: I08bced014af760a9b871ddb84b6225e02695cc24
hromium/proguard.flags
|
| 058714d7ae16bbfc096d9b4e0423efeb897bae68 |
20-Jul-2013 |
Jonathan Dixon <joth@google.com> |
Hookup WebViewChromium.setBackgroundColor
Change-Id: Ie22b18beef01a4a6d539adf3579d56615de7a820
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 245b3a6a2a7850a46536a423594286e04e702006 |
19-Jul-2013 |
Jonathan Dixon <joth@google.com> |
Add tracing for client callbacks
This should be useful for app compat and perf tracing
Change-Id: I878bee4971c8a15746f189ee5e2d922c80d268bf
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 31e978773bcbc1dd93c2795b042e4a073d21a1eb |
17-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r212014
|
| 6ef347a29d692df672aaf59ee4926a476288476a |
16-Jul-2013 |
Ben Murdoch <benm@google.com> |
Backwards compatibility for loadUrl and JavaScript URLs.
Apps targetting <= JBMR2 should not have the content replaced when
loading a javascript: URL for backwards compatibility with the
classic WebView. Apps targetting K or higher should use the new
WebView.evaluateJavaScript API instead of loading a javascript:
URL (WebView API to be added in a later CL).
BUG=9814043
Change-Id: I5209a61694ad4250c6e3000ec6f97b83db27eeab
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| cea1472db7958488e2fe7822250f4d1eba6cfd2c |
16-Jul-2013 |
Primiano Tucci <primiano@google.com> |
Adding memreport.py for postprocessing memdump output on WebView.
This is a fork of upstream chromium's memreport.py (see go/memdump)
customized for analyzing memory performances of both classic and
chromium WebView.
Change-Id: I3f12d0311972d9a9931e87929f068672ec2ce081
hromium/tools/memreport.py
|
| d892da7b96ede661d549be446c6f4c4dd884ed0c |
11-Jul-2013 |
Ben Murdoch <benm@google.com> |
Parse Cookie URLs before passing into into android_webview/
The classic cookie manager would do some parsing on the url supplied
to the CookieManager methods to get it into a reasonable shape if
necessary. Apps rely on the fixing up, so replicate it for the
Chromium Cookie Manager.
Change-Id: I942f0946ef85f717ddb845c9a280575113469773
hromium/java/com/android/webview/chromium/CookieManagerAdapter.java
|
| 1e5325bde6fb074ce556a4e2833114d890ed21f3 |
11-Jul-2013 |
Jonathan Dixon <joth@google.com> |
Enable WebView GL mode.
Turn on GL be default. It can still be disabled via
--disable-webview-gl-mode if needed.
Change-Id: I1b07ad7757dcb2cf90410e13d1df7fb68cf23b71
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 5551da5c81a34d899e4cbb6a01d2e34e52f1fe65 |
10-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge master-chromium into master at r210036.
|
| ade6d4efff010f977b95945fa3d7aa5b92862e80 |
09-Jul-2013 |
Martin Kosiba <mkosiba@google.com> |
Add autofill_popup_window resource.
This adds the missing mapping for the new autofill_popup_window
resource (added in http://crrev.com/18207004)
Change-Id: Ie2b15abbb1fc48041d4fff499290a484d2614cf7
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/values.xml
|
| 3951fbadf5157dd3fe73decc879f9b763e780b09 |
05-Jul-2013 |
Martin Kosiba <mkosiba@google.com> |
Overscroll hookup [2/2]
This adds the InternalAccessAdapter implementations needed by
https://codereview.chromium.org/18717002/.
Change-Id: Ied89661e26e804b2d00452bde36c8b53809e54a8
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 2a5e561c09bd9fc7b369d99c9166fa588e20ed38 |
28-Jun-2013 |
Martin Kosiba <mkosiba@google.com> |
Overscroll hookup [1/2]
This adds the InternalAccessAdapter implementations needed by
https://codereview.chromium.org/18717002/.
Change-Id: I108ad7b0b36de8d357c36011f25fd0c3ac75f933
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| a6f2939f98aeaf67533a7fd3f5c999f207451f1c |
29-Jun-2013 |
Selim Gurun <sgurun@google.com> |
Remove deprecated static method.
Remove deprecated getInstance() method from HttpAuthDatabase. Depends
on https://codereview.chromium.org/18051014/.
Change-Id: I984451b102126b861f360af8cb2911e78d124f04
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java
|
| 743e12bea37cd90ecba611e55632acfb7d0ef625 |
02-Jul-2013 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Trivial fix to unlock the automerger." into master-chromium
|
| 3d35289789339fbe14c141542499fd11d83bf394 |
02-Jul-2013 |
Primiano Tucci <primiano@google.com> |
Trivial fix to unlock the automerger.
http://crrev.com/18051014 broke the automerger.
Change-Id: I7c5dde6c9bc192f63e4439cbf7091d0449f7f7ab
hromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java
|
| ffa63216ba3a69255af88d436feb2f7d758cc321 |
01-Jul-2013 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Ensure that the description in onReceivedError is not null." into master-chromium
|
| 3740f51cc627b7e9274f8614fe78962f259547b8 |
28-Jun-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Add ui resources mapping for autofill" into master-chromium
|
| bbef8de5696d48fc6458c926026fc524a62814e1 |
01-Jun-2013 |
Selim Gurun <sgurun@google.com> |
Add ui resources mapping for autofill
Add mapping for ui resources to the glue layer. This CL depends
on https://codereview.chromium.org/16212007/.
Bug: 5013406
Change-Id: Ia5a51b1f2fbaafa63efebbc5f2c25ce8ffa53527
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-ldpi/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background.xml
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_down.9.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_up.9.png
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_autofill_text.xml
hromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
|
| 5c990caf9c0237064dab94059f6c46fc2d51cd97 |
05-Jun-2013 |
Ben Murdoch <benm@google.com> |
Plumbing for new Accessibilty implementation.
Plumb WebViewProvider.getAccessibilityNodeProvider through
to AwContents.
Change-Id: I426ca76d23722e8afcdfe1d910b675c16153c238
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 3b4cf9095f99043d4261ddd502f3384e524bd8c1 |
24-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge "Revert "Revert "Merge third_party/angle_dx11 replacing third_party/angle""" into master-chromium
|
| c057d5bb4006c946b148106e1536a0570047e84f |
24-Jun-2013 |
Bo Liu <boliu@google.com> |
Revert "Revert "Merge third_party/angle_dx11 replacing third_party/angle""
This reverts commit f85152d3feb7e2102312d3fbc60cbd3d633237ad.
Switch to angle_dx11 happened in chromium r208191 again.
Change-Id: Ie6521f85b0aff9f2513dc767ed995a7746210060
hromium/tools/merge_common.py
|
| 4dcabaef9151384b571327b62234409b31caef38 |
21-Jun-2013 |
Jonathan Dixon <joth@google.com> |
Provide softer fallback for legacy apps attempting private browsing
Bug: 7390806
Rather than throw an exception on pre-KLP apps, vend a DOA WebView
instance. This ensures no privacy info can leak through the app
misusing a 'normal' functioning instance.
Change-Id: Id6afd4639ce4b0cc076e1fa03d96e94194fc5a0d
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| c3d28c85f3c7710e9af4a8c404426aac2a3721b1 |
20-Jun-2013 |
Ben Murdoch <benm@google.com> |
Rename resource IDs in the month picker and add week picker* resources.
The sanity that exists in resource loading is restored.
* week picker is disabled behind a flag in chromium for the time being.
Change-Id: I295818989271fc760f59656a09845682281b7b5b
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_month_picker.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_two_field_date_picker.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| c8a03efcd8addbebb32b708b67efa869591e8ef7 |
20-Jun-2013 |
Ben Murdoch <benm@google.com> |
Allow automerger to merge down new resource id names.
Remove runtime check that resources are mapped so that WebView
can start up, but don't try and open a month picker :0
Change-Id: Idc433d7f9e5c5c041effdf9c0c993c46f7415024
hromium/java/com/android/webview/chromium/ResourceProvider.java
|
| aebd981be40d09f23ba829896b8a4c7a2f0917fc |
20-Jun-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Revert "Merge third_party/angle_dx11 replacing third_party/angle"" into master-chromium
|
| f85152d3feb7e2102312d3fbc60cbd3d633237ad |
19-Jun-2013 |
Bo Liu <boliu@google.com> |
Revert "Merge third_party/angle_dx11 replacing third_party/angle"
This reverts commit 25b96b14b9f77ae4317836b6501149715f489263.
Upstream reverted due to incorrectly using codesite svn that cannot handle the load of all of chromium. Should have used GoB mirror instead.
http://src.chromium.org/viewvc/chrome?revision=207244&view=revision
Change-Id: Ia0fb2f72317cddfaadd932bc62bdf8c6958fb170
hromium/tools/merge_common.py
|
| 4dcbb827bc7831dcaf655c7b9746f7eefb1346ad |
19-Jun-2013 |
Ben Murdoch <benm@google.com> |
Fix Advanced Colour Picker
Used the wrong resource id for the text label.
Change-Id: I6b563891f6d9fc7797c3b815e82f49c7d8d68c1e
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_advanced_component.xml
|
| fa552a5749ebb6c19a5dabdb1d6e4b679b1bcd94 |
19-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r207203.
Merge the corresponding framework code for Chromium r207203 into
master.
|
| 25b96b14b9f77ae4317836b6501149715f489263 |
19-Jun-2013 |
Bo Liu <boliu@google.com> |
Merge third_party/angle_dx11 replacing third_party/angle
Change-Id: Iab9ef13c0a0ffb652e6d6a4e27e5ebf0ee94cda6
hromium/tools/merge_common.py
|
| 11f7c1b02e49a6a8eaec26111f08edec45feb01a |
12-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Revert "Load the JNI code in a static initialiser."
This is too magical an approach; put it back how it was in preparation
for a new implementation.
This reverts commit cf95a6ca0ef9d9f6f4721cfc76805ce624808a1a.
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 22698156cb046f2a2d6874d952548835fdbe8588 |
17-Jun-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Fix for popup blocker" into master-chromium
|
| bbfef40e5fc625f4821f012fae7f16468b7308cf |
15-Jun-2013 |
Jonathan Dixon <joth@google.com> |
Fix for popup blocker
Some applications are known to send a null WebView as the child
view to block popups, so add support for this.
Depends on http://crrev.com/206516
Bug: 8267689
Change-Id: I32a97caee1a3499c08fabfca55988787c2af0fa2
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 68b88aabcf7e24e16e8c1f9080a8f7925663342d |
03-Jun-2013 |
Ben Murdoch <benm@google.com> |
Import resources needed for colour chooser.
Bug: 7621527
Change-Id: I15c0dae203913fb76fb8cad33406f1d811c77fb9
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_advanced_select_handle.png
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_border.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_advanced_component.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_title.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
|
| c66fe1cfbed1364a7ba75193badd8edd850d747a |
11-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r205548.
Merge the corresponding framework code for Chromium r205548 into
master.
|
| e9cac3ca0e6fe66ff5bcb31b7443737ebd775225 |
11-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Enable building webviewchromium on MIPS.
Bug: 9384563
Change-Id: I3c5c7ef32485bdab90a6122002c9116b94e76100
ndroid.mk
|
| 21f1d751f5d8f16d0a1e2c14192340fa518105ef |
11-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Re-enable merge thread mode.
Turn merge thread mode back on in master, to match the current state of
master-chromium.
This reverts commit 96b16605df8e49b2445dc99725aa532446635b59.
Change-Id: I1a03305078566ff1600170564edaf4c8fd7dbf98
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| a298cb2f0cb0482170680d03116f8e7de5e75f83 |
11-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r205460.
Merge the corresponding framework code for Chromium r205460 into
master.
|
| 2ad1105953c418b574ecffa8b002d41d0564e9d7 |
10-Jun-2013 |
Ben Murdoch <benm@google.com> |
Add third_party/mesa/src to automerger project list.
Change-Id: I1c7d091c4fcc15ec2bb22a836e0132b954ab2943
hromium/tools/merge_common.py
|
| f59e61882976fad4c6841df6df68d5a50f64cbef |
10-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge "Rename jar package whitelist to be clearer." into master-chromium
|
| 33e9055015929d90928f8d81d5340c21d9de132a |
10-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Add more missed parts of proguard config.
Missed one of the package renames in the previous CL to fix the proguard
config.
Change-Id: If917b11890c3cf1b2b8e853b7d81a757744f5dc6
hromium/proguard.flags
|
| 527aec2b7316d7d7c088156af8e118b525dc48bd |
10-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Rename jar package whitelist to be clearer.
Rename the whitelist to jar_package_whitelist.txt to make it a bit more
obvious what it's for.
Change-Id: Ie955d7aece848a1ce1db42749536462716e3197a
hromium/Android.mk
hromium/jar_package_whitelist.txt
hromium/package_whitelist.txt
|
| 1ed100ccfc76c08f4da2ce6f8a3a41e572622854 |
10-Jun-2013 |
Ben Murdoch <benm@google.com> |
Merge "Add tool to check that we jarjar'ed everything." into master-chromium
|
| a49d97a96d209b0dc5e69febacd7554cc3a36265 |
07-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Fix proguard config after jarjar rule changes.
The jarjar rules got changed to rename packages differently, causing
proguard rules to no longer match. Update them to reflect the new
package names.
Change-Id: Ibda2e796106eaf3965d5b56496cf4a55915d7816
hromium/proguard.flags
|
| 1d6f99d5c9c776f5cfc638b0e020fb08dd536dca |
07-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Add tool to check that we jarjar'ed everything.
Add a tool to verify that after jarjar has run, all the classes
remaining are in whitelisted packages. This will ensure that we don't
accidentally introduce a conflicting class definition into the system
classpath by failing to rename a new dependency. Make the built module
depend on this check step so that the build will fail if the check
doesn't pass.
Bug: 8030113
Change-Id: I92fc75eeee644a3eb05a13799ae398be20c286b3
hromium/Android.mk
hromium/package_whitelist.txt
hromium/tools/jar_check.py
|
| 33470360726fbd7073e0ff8d039603794b72c082 |
05-Jun-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Return the GraphicBuffer stride in bytes instead of pixels." into master-chromium
|
| 21924076a888ad00382329c8689dda28222844b0 |
05-Jun-2013 |
Kaan Baloglu <kaanb@google.com> |
Return the GraphicBuffer stride in bytes instead of pixels.
Change-Id: I4691c62ecda2dac88a46ff3423cc6488c7b031db
hromium/plat_support/graphic_buffer_impl.cpp
|
| cf95a6ca0ef9d9f6f4721cfc76805ce624808a1a |
04-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Load the JNI code in a static initialiser.
Rather than wait until an instance of WebViewChromiumFactoryProvider is
constructed, load the JNI libraries in that class's static initialiser
instead. Static initialisers are run while preloading classes into the
zygote, so this change means that the JNI library can be preloaded by
adding this class to the list.
Change-Id: I31aea43a6faf6d084439760f4f7617991d7306ed
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| db0a02ee4b43d63bb3ae9b42989f57d3ea3496d5 |
04-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge "Enable jarjar for webviewchromium." into master-chromium
|
| a92695363c0578f14a809f61b657f009564985c0 |
03-Jun-2013 |
Ben Murdoch <benm@google.com> |
Refactor ResourceProvider.verifyFields.
Tidy up the code the resource provider uses to check for unmapped
resources brought in from Chromium.
Change-Id: I56c8e6ab95b8ac96065f926f1878c3997086ba1c
hromium/java/com/android/webview/chromium/ResourceProvider.java
|
| 8a25a8e322e8699b0d3f756465fee5a66ab4dc82 |
29-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Enable jarjar for webviewchromium.
When building webviewchromium.jar, use jarjar to rename classes in
accordance with the rules file checked into the Chromium tree. The same
rules must be used on both sides as the JNI generator needs to also
rename its class references when building native code. The proguard
rules must also reference the renamed classes, as jarjar runs before
proguard - we keep both sets of names in the proguard config so that
jarjar can be disabled if needed without disabling proguard.
Change-Id: Ib5675ead752c5c3cd62c9ae7bbf84106f4454288
hromium/Android.mk
hromium/proguard.flags
|
| a7fba41c5661cb61b41c8a4ff2d69e5153666f7f |
03-Jun-2013 |
Ben Murdoch <benm@google.com> |
Implement WebViewChromium.shouldDelayChildPressedState
Trivial implementation of shouldDelayChildPressedState. Always return
true as the WebView may scroll. Classic WebView does the same; this
doesn't need to be part of the WebViewProvider interface as the default
implementation also just returns true. Once we track master we can
remove entirely.
Bug: 9230062
Change-Id: If8b74356730d35b3e23bd5533b31a069988deceb
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 159e17dc3f086ade558a728838ffaa33a9515d88 |
01-Jun-2013 |
Bo Liu <boliu@google.com> |
Do not skip runhooks on tot bot
Change-Id: I76d140906aa41ce333eee5c8dc8df5cbbbaded12
hromium/tools/buildbot/webview_buildbot_functions.sh
|
| d52d6a84a5dc0ba5264915b2e1524f65d1841b3b |
31-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: add LASTCHANGE.blink.
Create build/util/LASTCHANGE.blink when merging, containing the last
version of Blink merged into third_party/WebKit. This is used to
generate version header files.
Change-Id: I3ddf5be9081d06541c48713db88a47ca0d37b33e
hromium/tools/merge_from_chromium.py
|
| c03217fbee001280f4d23fa67f07496c219aeac0 |
31-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Improve proguard configuration.
1) We should explicitly keep the native methods in
com.android.webview.chromium as well, since the plat_support library
will crash if they are removed. This wasn't actually broken as they were
references anyway, but being explicit is better.
2) Using a single "keep" statement for the org.chromium JNI interface
causes all classes in that package to be kept even if they don't have
JNI members. Instead, we should have a separate "keepclasseswithmembers"
for each of the kinds of JNI interface to keep only classes that have
at least one of those methods. This allows a few more classes to be
removed entirely (along with their constructors) and prunes a small
amount of extra code as a result.
Change-Id: I7ce4dd7bdca36af49a306838bb567317e5314f4f
hromium/proguard.flags
|
| 53527087680509612ee5d1a5ab34244fd3de368d |
31-May-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Make findAll call through to the async version" into master-chromium
|
| f37548d6d8e2a73c65d675a26706a38f52960800 |
31-May-2013 |
Jonathan Dixon <joth@google.com> |
Make findAll call through to the async version
Required for upstream change https://codereview.chromium.org/16231015
Change-Id: I2f1295adeac386f0424e14026d1913c650a02d4f
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| ac2530ca1b3791854af1d7284ed31384f8550789 |
30-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Enable proguard.
CTS tests appear to pass at the expected rate with proguard enabled, so
turn it on for now so that we can get some thorough testing. Revert this
if it appears to be causing problems and you can't work out what to add
to the flag file to fix it.
Change-Id: I15e0d0d5b31861ddd0eef4bf21163df2e0d9a7fd
hromium/Android.mk
|
| 9eea229e384e9aeee1d36a38f3130d96e1510667 |
30-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Add proguard config file (not enabled yet).
Add a proguard config file with a minimal working set of flags to keep
the code we actually need. This commit does not enable proguard yet.
Change-Id: If578bbd2473113220b2731d84e6317f5b79e4443
hromium/Android.mk
hromium/proguard.flags
|
| 55809b524523f9aa9428892c5977d2ba3c31f65e |
30-May-2013 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Make WebSettings.{get|set}DefaultZoom a no-op" into master-chromium
|
| 96b16605df8e49b2445dc99725aa532446635b59 |
29-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Revert "Temporarily enable merge thread mode"
Merge thread mode is not yet ready for master; continue to use the old
readering mode for now.
This reverts commit 4da292028d64b1df39a43abc83b397cc8583bb55.
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| bf5042175b50ae1df08f80f7f49dedfaaf798d6c |
29-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r202854.
Merge the corresponding framework code for Chromium r202854 into
master.
Change-Id: Ic479dc3336fd116445c94567da119730131df665
|
| a9381cc42091886e65a8875d66ac682e77787790 |
23-May-2013 |
Mikhail Naganov <mnaganov@google.com> |
Make WebSettings.{get|set}DefaultZoom a no-op
See the bug for the discussion.
Bug: 9004875
Change-Id: Ie5e08f2eacec4b75fa2979095ff08392b6023ec7
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| d615e65ec4238b60b624f2e7753b94e3967c2f66 |
28-May-2013 |
Jonathan Dixon <joth@google.com> |
Disable testFindNext
This is the only test failing in new gfx architecture, so disabling
it to allow earlier switch over to this mode.
Change-Id: Id2ff6d02bc77cc1cb8fe47f2e7adc3cb5b9f2a95
hromium/tools/run_webview_cts.py
|
| 02b52edd613b1571525707b25b2770a74fb5a618 |
26-May-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Temporarily enable merge thread mode" into master-chromium
|
| 4da292028d64b1df39a43abc83b397cc8583bb55 |
26-May-2013 |
Jonathan Dixon <joth@google.com> |
Temporarily enable merge thread mode
Doing a trial enable of the new (Software) render mode to gather data on
test stability.
Change-Id: I59cb8e932e4f3063afafedcd1d5261ca4ae8d8ef
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 2c0afc23189728c1ada18beaaf6e09e664ce3043 |
24-May-2013 |
Mikhail Naganov <mnaganov@google.com> |
Mark flaky android.webkit.cts.WebHistoryItemTest#testWebHistoryItem as failing
BUG=9121594
Change-Id: I6c1dbf2d12f50e4a059f60d13bf92bd99c114189
hromium/tools/run_webview_cts.py
|
| 48acb21fe0fd3cc579c7c5deb2e7eb7599b3a733 |
23-May-2013 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Mark flaky android.webkit.cts.WebViewTest#testRequestImageRef as failing" into master-chromium
|
| ceb1d02ed464e88d1cc0c49bd49ae35ad26f3e3b |
23-May-2013 |
Mikhail Naganov <mnaganov@google.com> |
Mark flaky android.webkit.cts.WebViewTest#testRequestImageRef as failing
Change-Id: I3a6be4eead522cd39a6757399a20af57a027e8a8
hromium/tools/run_webview_cts.py
|
| 06efec92ac4c561f015d5d71bfffbf55e8e07daa |
22-May-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Fix platsupport GetPixels() to use the top device" into master-chromium
|
| 180eb4e3cdced9486534148b388de3250c3e78d5 |
22-May-2013 |
Jonathan Dixon <joth@google.com> |
Fix platsupport GetPixels() to use the top device
This should make it respect Canvas layers applied for View Alpha.
Change-Id: I9559ab0f515983d072b5d07e59f4cb1325fecce8
hromium/plat_support/graphics_utils.cpp
|
| 0e9d14779a1d1b7646d2065b82ba24e39f887d66 |
22-May-2013 |
Primiano Tucci <primiano@google.com> |
Merge "Fix makefile for WebViewShell apk." into master-chromium
|
| 25e9b72ff8ea3106d97cfee01dd9cb3ad5ec2c82 |
20-May-2013 |
Primiano Tucci <primiano@google.com> |
Fix makefile for WebViewShell apk.
Using first-makefile-under (which is recursive)
instead of all-makefiles-under.
Change-Id: Id09e9577b318ed5f5de6a71ff60a3241734e4385
hromium/Android.mk
|
| 1cc1c4153a26307948af9f1ee6d9cde7a7103b94 |
21-May-2013 |
Kaan Baloglu <kaanb@google.com> |
Use a public enum to pass in the map mode instead of an int. Fixes b/8633434
Change-Id: Ifbe7c7752effe3fe3e9ca722b9c5c611819fc5e6
hromium/plat_support/graphic_buffer_impl.cpp
hromium/plat_support/graphic_buffer_impl.h
hromium/plat_support/graphics_utils.cpp
|
| 97481221b4e9b3d8e9e94011266cf1a74835e3f3 |
21-May-2013 |
Ben Murdoch <benm@google.com> |
Merge "Update CTS expectations for Chromium WebView." into master-chromium
|
| e0c65920d8ea6bae23b9be8508dbac54697727c7 |
21-May-2013 |
Ben Murdoch <benm@google.com> |
Update CTS expectations for Chromium WebView.
WebSettings.get[set]SaveFormData has been implemented.
Bug: 6335434
Change-Id: I61bdb68ef54ba2b8009fcc737a9b5661aa8bce7a
hromium/tools/run_webview_cts.py
|
| e74bdcc6ff29af67432f96a3b7066a4adc98b868 |
21-May-2013 |
Ben Murdoch <benm@google.com> |
Change --screenshot-on-ui-failure to --screenshot-on-failure.
Flag was renamed and CTS runner doesn't accept arguments it
doesn't recognize.
Change-Id: I5f6f3515e6b2edb009efe7717fe386f429dcb0ab
hromium/tools/run_webview_cts.py
|
| d67c30feffc8d7c68e7dde2eca1f5e8302cbf7bd |
20-May-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Make function pointers in DrawGLFunctionTable all NULL before we change the method types" into master-chromium
|
| fd26b08cf356142dbdd1ea2274b24988f013fe53 |
18-May-2013 |
Kaan Baloglu <kaanb@google.com> |
Make function pointers in DrawGLFunctionTable all NULL before we change the method types
Change-Id: Ie7bd4d792c38c198e425efe3b9812c4475802c58
hromium/plat_support/graphics_utils.cpp
|
| fe5174cf1ef1aab1071aa2f10e45e1bfc7e57d1c |
17-May-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Enable [get/set]SaveFormData Apis" into master-chromium
|
| f2036938bc8f731e42e69d1956a490b607cf865f |
16-May-2013 |
Selim Gurun <sgurun@google.com> |
Enable [get/set]SaveFormData Apis
Bug: 6335434
Change-Id: I5064b14b3b2a42f64e5a32a15875eb9beba4938e
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| b7b706b2ed5cbb77dd690f5405b626a429989714 |
16-May-2013 |
Ben Murdoch <benm@google.com> |
Hook up WebViewChromium.performAccessibilityAction correctly.
Bug: 8482000
Change-Id: Ic92b2fed8a9a78d28e2f3c70128b688e5b722ed1
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| b99a1d8cc56abac2340cbd6c5c46b52fcd730a59 |
15-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r200144.
Merge the corresponding framework code for Chromium r200144 into
master.
Change-Id: I930da05d29421b7fbb7bb1efc85bdb06e2349327
|
| 284fa4d183e7f9d2db180c1ffd76d894d2c94c2d |
14-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge scripts: update merge_to_master." into master-chromium
|
| aee9ed59e6aee1df39473dda7d5affaa6a283972 |
14-May-2013 |
Primiano Tucci <primiano@google.com> |
Merge "Fix webview_command_line script." into master-chromium
|
| a1155018c970e3a7f16ad28c719e083d6fdd8a41 |
14-May-2013 |
Primiano Tucci <primiano@google.com> |
Merge "Add telemetry_apk app for running WebView telemetry scripts." into master-chromium
|
| e1a149c76208a84c7595203a465ae1218ded9d34 |
09-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: update merge_to_master.
Update merge_to_master.py to work with the new separate history
projects; also add support for merging a specific chromium revision
using the archived revisions on the server.
Change-Id: Ifaf3aefe0b88936e98c9a7db2605417e89accbe9
hromium/tools/merge_to_master.py
|
| 2747a3bb134e3e5431e0c333d1c600c59fe53941 |
13-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master at r199464.
Merge the corresponding framework code for Chromium r199464 into
master.
|
| a62fc1d995af45fe687ab0c655d458039cd1da95 |
09-May-2013 |
Primiano Tucci <primiano@google.com> |
Add telemetry_apk app for running WebView telemetry scripts.
A simple apk that creates a blank WebView instance, which is hooked by
telemetry scripts.
BUG:8885150
Change-Id: I030d5630aea85185e8b3f332675d224563e80efa
hromium/Android.mk
hromium/tools/WebViewShell/Android.mk
hromium/tools/WebViewShell/AndroidManifest.xml
hromium/tools/WebViewShell/res/drawable/ic_launcher.png
hromium/tools/WebViewShell/res/layout/activity_telemetry.xml
hromium/tools/WebViewShell/res/values/strings.xml
hromium/tools/WebViewShell/src/com/android/webview/chromium/shell/TelemetryActivity.java
|
| 4a7dc8d6b49938abd8bcfbaed41cdf0574d2e757 |
13-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium into master.
Merge the corresponding framework code for Chromium r198571 into master.
|
| 961066b0d942b7708d4472d18d532f21987085db |
09-May-2013 |
Selim Gurun <sgurun@google.com> |
Implement hasFormData api
Bug: 6234236
Change-Id: Ieb35d03aa12c1a83216090bb7af416968acf1949
hromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java
|
| 80dc82497c6ce3f7855b65f725575054e5d57960 |
09-May-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Implement WebViewDatabase.clearFormData API" into master-chromium
|
| f6f00ae3a6bece2b90c099f0e6ef3bcc6d6a02b3 |
08-May-2013 |
Primiano Tucci <primiano@google.com> |
Fix webview_command_line script.
CommandLine.initFromFile expects a binary name as first argument
(which is subsequently stripped off).
Prepending "webview " string when creating the webview-command-line
file.
BUG:8357127
Change-Id: I0a3553f73bcc205e192bc9ae70d3b4784625bf54
hromium/tools/webview_command_line
|
| 2a365e86836ab9512d75cfe570520eefb5dd4565 |
08-May-2013 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Switch zoom settings to AwSettings" into master-chromium
|
| 7962d3fa1b66ed25aba03a2d48f6c47528d7d95c |
07-May-2013 |
Primiano Tucci <primiano@google.com> |
Switched WebView command line to use file instead of system property.
Removed the former |webview.chromium.flags| system property.
Now WebView startup paths load the command line arguments from
/data/local/tmp/webview-command-line (if the file exists).
Adding also the webview_command_line script for getting/setting the
file contents (like adb_content_shell_command_line).
BUG:8357127
Change-Id: Ic8962d88e7d8895f04897fb34303abf8517fc560
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/tools/webview_command_line
|
| 49ff1a6656a115852ee45955985f791429e23527 |
03-May-2013 |
Primiano Tucci <primiano@google.com> |
Added support to load command line flags from external file.
If the system property |webview.chromium.flags| evaluates to an existing file, WebView startup paths will init the command line using the contents of the file.
BUG:8357127
Change-Id: I5c819e0f41d94bbca40caf6c80254a08ced90a35
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 420c0da3a4e06e1ac5574091e7c9c286ef012369 |
03-May-2013 |
Mikhail Naganov <mnaganov@google.com> |
Switch zoom settings to AwSettings
ContentSettings are no more used in WebView!
Depends on https://codereview.chromium.org/14840011/
BUG=8296421
Change-Id: I2aa90c4b6550e8f8092a023ea24e3d5551c4298b
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 3b1480d1d7d07cb989630cd5767f439dd3f5fabd |
02-May-2013 |
Torne (Richard Coles) <torne@google.com> |
automerger: push archived revisions and fix a bug.
When we push a merge successfully, also push a new ref under
refs/archive/chromium-* with the revision number. This allows specific
past merge points to be checked out across all chromium_org/* projects
correctly. We were also incorrectly using git push -f even for pushing
to master-chromium, which could cause downstream changes to be lost;
instead of using -f just specify the + prefix on the refs we want to
allow non-fast-forward updates.
Change-Id: Ide846f2213228b721f90db544f33be268f47759b
hromium/tools/merge_from_chromium.py
|
| 9612201c958e023b34f25b5401e90990b39bba5b |
30-Apr-2013 |
Ben Murdoch <benm@google.com> |
Update test expectations.
Update bug numbers for CTS tests and add testFlingScroll as a
failure.
Change-Id: Ifd5b7d317e2f51470b31308d714dd18471b32081
hromium/tools/run_webview_cts.py
|
| 1f39fd6f96da9ebacdf3462306f3aef6dec2ec0b |
30-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge tool: pass "all" to gyp_webview.
In preparation for changing gyp_webview to only generate makefiles for
one platform by default, pass it "all" from the merge script to tell it
to generate all of them. It currently doesn't use its arguments so this
is safe.
Change-Id: I6d6b020fc009dbcd78e353fde9ca0ae3cc4c5945
hromium/tools/merge_from_chromium.py
|
| 91211061b2b94878b701a70dc94d456c3d5391f4 |
29-Apr-2013 |
Ben Murdoch <benm@google.com> |
Merge "Revert "Stub out pause/ResumeTimers until b/8639231 is resolved."" into master-chromium
|
| 98c49cd8d9e1ebba49e508ca516ece4f76753e3f |
26-Apr-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Cleanup onDraw() method" into master-chromium
|
| 7ab33360e331e04f515d532064670e210d174a7a |
23-Apr-2013 |
Tao Bai <michaelbai@google.com> |
Cleanup onDraw() method
Removed logic were pushed to AwContents.onDraw.
Change-Id: I89cfea2db8f9d507331d04c0970d8efed46fb696
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 669bb1a0d4a4acef0729688f96eb3da001725d9a |
26-Apr-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Set no-merge-ui-and-compositor-threads by default." into master-chromium
|
| 9a8890d7bb7257b46f38b36d19a5b94fead8cc04 |
26-Apr-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Calling 2-param onShowCustomeView()" into master-chromium
|
| 531e68a2b50a5e542eeede13907f29e463a99ebf |
26-Apr-2013 |
Ben Murdoch <benm@google.com> |
Revert "Stub out pause/ResumeTimers until b/8639231 is resolved."
The bug is now fixed.
This reverts commit 06f656d1143ad9c738eff35a0a8c557adf036362.
Change-Id: I6bf37969a096af64ddbd30b85aa0cb2e9d52c279
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/tools/run_webview_cts.py
|
| bbe58198e8cce0c35c42809aebc965aa2b476e1c |
26-Apr-2013 |
Tao Bai <michaelbai@google.com> |
Calling 2-param onShowCustomeView()
Change-Id: I2937a115c10c1b8b532b7283d566d43d0c75ee31
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| b62d1940b66f8d7cc1bf8cd8874f4340249e0ff3 |
26-Apr-2013 |
Mikhail Naganov <mnaganov@google.com> |
Update CTS tests expectations
Mark as failing:
android.webkit.cts.GeolocationTest#testSimpleGeolocationRequestReject
Change-Id: I7c4041f58df286463b47c681fb4edd2b0bee0bc5
hromium/tools/run_webview_cts.py
|
| e93e0ed2f9e288e09d89bd17bdab8886b6703f78 |
26-Apr-2013 |
Mikhail Naganov <mnaganov@google.com> |
Update CTS test expectations
Mark the following tests as passing after the fix:
https://codereview.chromium.org/14060019/
android.webkit.cts.CookieManagerTest#testAcceptCookie
android.webkit.cts.CookieSyncManagerTest#testCookieSyncManager
android.webkit.cts.CookieManagerTest#testClone
android.webkit.cts.CookieManagerTest#testCookieManager
android.webkit.cts.CookieManagerTest#testRemoveCookies
android.webkit.cts.CookieManagerTest#testb3167208
android.webkit.cts.CookieManagerTest#testGetInstance
Mark this one as passing too, alhough there wasn't any specifix fix for it:
android.webkit.cts.GeolocationTest#testSimpleGeolocationRequestAcceptOnce
BUG=8707883
Change-Id: I9db28e95e3f676027e10863d4619d91777573bfa
hromium/tools/run_webview_cts.py
|
| 0657abeb9374dfb8c49010c08d8da417f22d8e21 |
26-Apr-2013 |
Tao Bai <michaelbai@google.com> |
Set no-merge-ui-and-compositor-threads by default.
Change-Id: I0c0b7206c0ad0f28e12e7712c9d8e4acdf840ea2
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| a74f09e2e4f2801677feee63ffdd741fb9acae61 |
25-Apr-2013 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Switch over to AwSettings in ContentSettingsAdapter" into master-chromium
|
| 84a656a92c3010f01e720d919c684202a8dbf0fd |
25-Apr-2013 |
Mikhail Naganov <mnaganov@google.com> |
Update CTS tests expectations
Remove passing tests:
android.webkit.cts.WebViewTest#testRequestImageRef
android.webkit.cts.WebViewTest#testFindNext
android.webkit.cts.WebViewTest#testFlingScroll
Add failing tests (b/8707883)
android.webkit.cts.CookieManagerTest#testAcceptCookie
android.webkit.cts.CookieManagerTest#testGetInstance
android.webkit.cts.CookieManagerTest#testClone
android.webkit.cts.CookieManagerTest#testCookieManager
android.webkit.cts.CookieManagerTest#testRemoveCookies
android.webkit.cts.CookieManagerTest#testb3167208
android.webkit.cts.CookieSyncManagerTest#testCookieSyncManager
Change-Id: I20d9eddc6162709af12e6eb016d36d8c1f21b95a
hromium/tools/run_webview_cts.py
|
| 7e95adfc55c15741a208b5543449535101eeb295 |
25-Apr-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Fix for bug 8322948: implement default JS dialogs" into master-chromium
|
| 23e94607a704794a85b4ed55ecf98b0675e07ac6 |
24-Apr-2013 |
Ben Murdoch <benm@google.com> |
Update test expectations.
Change-Id: I20762f441523e2d330e72d7419e93b5717a7f178
hromium/tools/run_webview_cts.py
|
| d6b56ff89338d0b3a6ba0cb413b1fe559d6284e0 |
24-Apr-2013 |
Mikhail Naganov <mnaganov@google.com> |
Switch over to AwSettings in ContentSettingsAdapter
Depends on https://codereview.chromium.org/14271024/
BUG=8296421
Change-Id: Ic49dc42a541949f36d2cad1a3f52a25d8f276f82
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 6832aa63c94ee9ea1ebbee7e7e40b7d2dda0e820 |
04-Apr-2013 |
Kristian Monsen <kristianm@google.com> |
Fix for bug 8322948: implement default JS dialogs
Using the new JsDialogHelper
Change-Id: I7c6be7b4e195e2cc7228706f1a7b60e1ef655c2a
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 09e718bac5900c84b8402b774d306dca7f7fdf09 |
22-Apr-2013 |
Selim Gurun <sgurun@google.com> |
Implement WebViewDatabase.clearFormData API
Bug: 6234236
Implement WebViewDatabase.clearFormData for chromium based webview.
Change-Id: Ia86905b090bdc5062b41fee04abd5bc8a1f7c837
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java
|
| 06f656d1143ad9c738eff35a0a8c557adf036362 |
23-Apr-2013 |
Ben Murdoch <benm@google.com> |
Stub out pause/ResumeTimers until b/8639231 is resolved.
Change-Id: Ie0d3b3648a3cf237e4a7a952aff3c1e5204ecf81
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 51f7cf16cd02f14050bb723175a2a57570e8486d |
23-Apr-2013 |
Tao Bai <michaelbai@google.com> |
Allow compositor to request a GL functor callback outside of draw cycle
This is the first patch, and provide a way for AwContents to requestDrawGL.
Change-Id: I8ed54849befcc678482a56f89383ee7c5f1f9249
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| c6fd5b4baea9c6c5bbf28635152ce7f9a5ef89ef |
19-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge script: fix function reference.
Need to refer to GetCommandStdout with a qualified name now that the
calls are not in merge_common.
Change-Id: Icf613d263a81338b656738fb679526dc78e577fd
hromium/tools/merge_from_chromium.py
hromium/tools/merge_to_master.py
|
| 30db034ab809175e0bd58047003416d924c8689a |
19-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge tool: update merge_to_master for new projects." into master-chromium
|
| 9bf6038aae13d5b9b4ac202efa046735646f4c5c |
19-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Revert "Disable building on Mac again."
Mac builds are now fine.
This reverts commit bd30019ef43699a933f5965a5e078bb1a15aa8b8.
Bug: 8326522
ndroid.mk
|
| 09ead754abd2cfcffea54040b1c9ac98db8af834 |
19-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge tool: update merge_to_master for new projects.
merge_to_master needs just one trivial change to actually do the merge
correctly. To make pushing work, we stop sharing the implementation of
PushToServer between the two scripts as they are increasingly different
and the sharing is just making it harder to understand.
Change-Id: Ib04d6e2f6621c98a72ad157ba7ed6238d542bf5a
hromium/tools/merge_common.py
hromium/tools/merge_from_chromium.py
hromium/tools/merge_to_master.py
|
| 86ba4c3b3e059bdddcace47df9c47723b4fb3abc |
19-Apr-2013 |
Ben Murdoch <benm@google.com> |
Remove import that was deleted upstream.
Change-Id: Iff6e292f843720f264a5d7a3a08d3a3ba7014a27
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 28044758ff5b9c97fbe1f48d586dc7444895c036 |
17-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge "Update merge script to use new local-mirrored repos." into master-chromium
|
| 2b8b247b4f69989baf2b403c2a25676d431ca9cf |
17-Apr-2013 |
Ben Murdoch <benm@google.com> |
Fix setting of Chromium command line via System properties.
We need to read system properties set via adb shell setprop
from android.os.SystemProperties, not java.lang.System.
Change-Id: If58f03a3427d5fdd6b3f127619cd73050e62f0a0
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 4465da421aa5ee3d2f6a016b961c301040f0fa23 |
16-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Update merge script to use new local-mirrored repos.
We have local mirror branches of chromium and webkit now; use these in
the merge script instead of fetching directly from upstream, and push
the full history specifically to the history projects.
Change-Id: I6a222cbf1a305408efe8096c2a8b7d7ea2f889dc
hromium/tools/merge_common.py
hromium/tools/merge_from_chromium.py
|
| 8bf180fa7b50180291ae4670f450ae9b09097c43 |
17-Apr-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Implementation of the graphic buffer interface for cc" into master-chromium
|
| c5cde8c18df853e11d1ec528508fd0fe2e742d5c |
22-Feb-2013 |
Kaan Baloglu <kaanb@google.com> |
Implementation of the graphic buffer interface for cc
Change-Id: Ic023e690448abbbae8689d13b3357ec497808ea7
hromium/Android.mk
hromium/java/com/android/webview/chromium/GraphicsUtils.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/plat_support/graphic_buffer_impl.cpp
hromium/plat_support/graphic_buffer_impl.h
hromium/plat_support/graphics_utils.cpp
|
| e0fb01c3390243fc189e12c64c2ab8a2d6872178 |
16-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Dummy change to force build.
A manifest change didn't trigger a build; force one.
Change-Id: I2e6bc41780895c1d790fbf5c98c5aafd9a21854e
|
| 433ded206933365c7f999afdab80774fb137a5fd |
12-Apr-2013 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Print synced chromium revision on ToT bot." into master-chromium
|
| f043671dc25b5046a94a604b1549cda2cf66a2ae |
11-Apr-2013 |
Marcin Kosiba <mkosiba@google.com> |
Print synced chromium revision on ToT bot.
Since we're pulling ToT and not BUILDBOT_REVISION it seems like a
good idea to print out what we've just synced to.
Change-Id: Ib9f1fddc3b890d0962c2920ef5e321954766f27a
hromium/tools/buildbot/webview_buildbot_functions.sh
|
| bef5c8e29d2693c07fa32952088de0e46059c461 |
11-Apr-2013 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Generate local manifest to local_manifest.xml." into master-chromium
|
| 77dcb868f0fea4f37e49fc38b9fff18bbac21784 |
11-Apr-2013 |
Marcin Kosiba <mkosiba@google.com> |
Generate local manifest to local_manifest.xml.
Looks like the webview-tot bot is running with an old version of
repo (probably the one from depot_tools) which is still looking
at .repo/local_manifest.xml rather than .repo/local_manitests/*.xml
Change-Id: I9887ca04915d0acbe8068d856be6e0166ed4eac6
hromium/tools/generate_local_manifest.py
|
| c7f7a70355fc5688335648a8e887e4ad75cb0a55 |
11-Apr-2013 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Change the webview_tot script to not use the merge script." into master-chromium
|
| 9533e41b4f869b9aff2402d73fcdaa34afa7f576 |
11-Apr-2013 |
Marcin Kosiba <mkosiba@google.com> |
Change the webview_tot script to not use the merge script.
Running the ToT bot with the merge script doesn't work because of
upstream forking WebKit.
To mitigate the problem the build script has been changed to simply
checkout the upstream tree. This is achieved by removing the existing
chromium_org projects using a local manifest and checking out a full
upstream tree using the git submodules flow.
Change-Id: I9405e7851716f300136e80a06f71eeb83973be09
hromium/tools/buildbot/bb_webview_tot.sh
hromium/tools/buildbot/webview_buildbot_functions.sh
hromium/tools/generate_local_manifest.py
hromium/tools/sync_chromium_repos.sh
|
| 63739cfbd3d746a715b11cb4138598764b7a7149 |
11-Apr-2013 |
Marcin Kosiba <mkosiba@google.com> |
Remove unused resource.
The only reference to this resource was removed in
I12a0d9758a4eaf75618b8d180203f94d8612abac
Change-Id: I7c5d6466d662059ee5f4b916305cbdbb181b7843
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/webviewchromium_official-command-line.xml
|
| b873835a4c4b17a0962f92b9f9158476c96c6c1f |
11-Apr-2013 |
Marcin Kosiba <mkosiba@google.com> |
Remove references to removed resource.
This fixes the build break caused by https://codereview.chromium.org/13862016.
Change-Id: I12a0d9758a4eaf75618b8d180203f94d8612abac
hromium/java/com/android/webview/chromium/ResourceProvider.java
|
| 82e61dd79e147076444acc16664368338904dc04 |
10-Apr-2013 |
Ying Wang <wangying@google.com> |
Add liblog
Bug: 8580410
Change-Id: I8f49c65c501698b69f9fe28e7f63e67ea2d26052
hromium/Android.mk
|
| 3394999544f374769e32cb564fffd125db64cc63 |
09-Apr-2013 |
Ben Murdoch <benm@google.com> |
Merge "Warn about unchecked casts and treat them as errors" into master-chromium
|
| 3ea7e2214406c213fc5612886e78e41bed64f3d5 |
08-Apr-2013 |
Kristian Monsen <kristianm@google.com> |
Warn about unchecked casts and treat them as errors
Change-Id: I6f9081b518a77539e7f6c2cc55c54302e9c07c48
hromium/Android.mk
|
| 075c4696421fc54a5c21c746c900b9281e7ae476 |
08-Apr-2013 |
Bo Liu <boliu@google.com> |
Fix unchecked operation in WebBackForwardListChromium.java
Change-Id: Ifba1a5dd0b3ce7608ff837755818a462adc868c8
hromium/java/com/android/webview/chromium/WebBackForwardListChromium.java
|
| be2a57c401cf1bb65d541b0bef30d71962d22488 |
03-Apr-2013 |
Tao Bai <michaelbai@google.com> |
Plumb WebChromeClient.getDefaultVideoPoster.
Change-Id: I95ae5ddc91b8f07671f95182684662e7d32c9980
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 620a7a1015b0a1cbd029d5b9d507b43fe350e287 |
02-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium branch of frameworks/webview into master.
Second merge to pick up build fixes.
Change-Id: Ibee3ea03e5217dce8129935021a49a93b6d9eafe
|
| 5b636587610c88fe2316b78c4ee58ca32119f2d9 |
02-Apr-2013 |
Torne (Richard Coles) <torne@google.com> |
Remove unused google-common dependency.
We don't actually need google-common and it breaks building in open
source branches where it doesn't exist, so remove the dependency.
Change-Id: Ib8ae9ad748da9d8be46896be67500348f99c616b
hromium/Android.mk
|
| c3716ed7c818292fad946647afe3a230cc743fcb |
02-Apr-2013 |
Ben Murdoch <benm@google.com> |
Fix WebView build.
After https://codereview.chromium.org/12939021/
LibraryLoader.getLibraryToLoad no longer exists.
Remove our only call to it as it's only used in an exception
message.
Change-Id: If170629dd0e9e3aaaf743ef9495e18adb6601cd4
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 8dad8ce44efeb25d5780d4d6f28b45b95ad194c4 |
29-Mar-2013 |
Jonathan Dixon <joth@google.com> |
Merge "WebIconDatabase -> no-op" into master-chromium
|
| 4e6a034f041cbb629386a6f4dd45f1cdbd6e1abf |
28-Mar-2013 |
Jonathan Dixon <joth@google.com> |
WebIconDatabase -> no-op
Bug: 7331507
This is deprecated, and its only useful function was to enable favicon
downloading, which chromium webview does automatically.
Change-Id: I0e864fb7bb29f58fc31fa9d3cfbcd0baa66e3fca
hromium/java/com/android/webview/chromium/WebIconDatabaseAdapter.java
|
| 054e1ba8d8d7d542f0d7419eefb6ca5805ab13e9 |
28-Mar-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge master-chromium branch of frameworks/webview into master.
Merge the Chromium-powered WebView glue layer into the master branch
so that both implementations will be included in roms.
|
| f909ca91bfefe7344f9a0e2c684150df1376d9a4 |
28-Mar-2013 |
Jonathan Dixon <joth@google.com> |
Remove ContentViewClient dependency
This is in preperation for AwContentClient no longer extending
ContentViewClient. See upstream patch
https://codereview.chromium.org/13136002
Change-Id: Iee9355d18eff132dae2e353b8aaa2f02275a9a1e
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 782fea892aaa4a0867547697d49f6a1dd265d437 |
27-Mar-2013 |
Tao Bai <michaelbai@google.com> |
Plumb WebChromeClient.onHideCustomView().
Change-Id: If35d31865645432b6a8b4f700462c2e0a78d064e
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 1c4024c9be1f6bcc04c76d7e4fa50b2072536967 |
19-Mar-2013 |
Ben Murdoch <benm@google.com> |
Merge "Update expectations" into master-chromium
|
| c5a9a033eee106f93203df4d04e4ccf00521aacf |
18-Mar-2013 |
Ben Murdoch <benm@google.com> |
Update expectations
WebViewTest#loadDataWithBaseURL now passing.
Bug: 7907196
Change-Id: I3755aebb9e02e0d3f0e68d45c2a4c92aef90fe26
hromium/tools/run_webview_cts.py
|
| bd30019ef43699a933f5965a5e078bb1a15aa8b8 |
18-Mar-2013 |
Torne (Richard Coles) <torne@google.com> |
Disable building on Mac again.
Mac builds are still broken; turn them off again until someone can
investigate this manually on a mac.
Bug: 8326522
Change-Id: I3a3b901164e8becf3dd732be8dc2f81f7dff4d38
ndroid.mk
|
| e478bc775f7f0804009e89325a91e6a88374b62d |
13-Mar-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Implement touch icon functionality" into master-chromium
|
| 7da9c0c080655cfd18bb4ab0937d89be4c2ca659 |
12-Mar-2013 |
Marcin Kosiba <mkosiba@google.com> |
Ensure that the description in onReceivedError is not null.
This is identical to the code in BrowserFrame.onReceivedError.
Change-Id: Ifd6c293b2c22e9e3203ed9ae0e4266bd492b74c8
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 6c5865ac0ad41a50a5b70596167518a3b241f496 |
12-Mar-2013 |
Ben Murdoch <benm@google.com> |
Merge "Update expectations." into master-chromium
|
| c74c2a453ae62d7753afb4f03df64e112554906c |
12-Mar-2013 |
Ben Murdoch <benm@google.com> |
Update expectations.
WebView.pause/ResumeTimers now fixed.
Bug: 7010205
Change-Id: I51247d0629388d3cd30978624da030777180116e
hromium/tools/run_webview_cts.py
|
| 690b7c64c2aaae62680d137fca34c7fac5176ed2 |
12-Mar-2013 |
Selim Gurun <sgurun@google.com> |
Implement touch icon functionality
Bug: 6295380
Change-Id: If70a5157f11158b080bbdad60d4331f9e710317d
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 7cb3dd1c0aca371b628b80afa69c58638de30fa1 |
11-Mar-2013 |
Martin Kosiba <mkosiba@google.com> |
Use AwContents methods directly instead of using ContentViewCore.
This removes all references to the ContentViewCore type from WebViewChromium.
Depends on https://codereview.chromium.org/12611008/.
Change-Id: Ia6bb975482cbbedda26c1237a4ee383103cf0646
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 4cd5b417e632944c16061c086b637eb1a6dffcb1 |
11-Mar-2013 |
Torne (Richard Coles) <torne@google.com> |
Disable webviewchromium on MIPS.
We don't generate MIPS makefiles yet, so for now just disable the build
on that platform.
Change-Id: Iaa53a6058e6e19a0fe9e7ad5fcb69a8687dafe5d
ndroid.mk
|
| 2729ce59ec2479c72f2422f49c2f0f0a121ee5b4 |
07-Mar-2013 |
Tao Bai <michaelbai@google.com> |
Plumb WebChromeClient.getVideoLoadingProgressView
Change-Id: I2414a6e538962aee4ef272054c3f37546f946a82
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 59ea422728fe99062eedf4c3b56e2116478b552d |
07-Mar-2013 |
Ben Murdoch <benm@google.com> |
Merge "Update expectations." into master-chromium
|
| 7feb3d70e606bf0c0871f060d0eb3cfcadef6148 |
07-Mar-2013 |
Ben Murdoch <benm@google.com> |
Update expectations.
WebViewTest#testStopLoading now passing.
Bug: 8271980
Change-Id: I3bcd1ccc2776374649034022d998a7afc104b024
hromium/tools/run_webview_cts.py
|
| 5cc4057b3fdf00edfa10678c02f5dc3478150ea3 |
07-Mar-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Use AwBrowserContext in the glue layer" into master-chromium
|
| aa8b39f3e3f208586f3750d7278f1239a09ebd32 |
07-Mar-2013 |
Kristian Monsen <kristianm@google.com> |
Use AwBrowserContext in the glue layer
Change-Id: I9b1491768ca99396cdea2d133524e2de0bc34960
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 7113a884c4b0cf3d78d77648e9724145fa24e82c |
05-Mar-2013 |
Tao Bai <michaelbai@google.com> |
Plumb WebSettings.set/getMediaPlaybackRequiresUserGesture.
Bug: 6842070
Change-Id: Iacaa35c487d2a596efff1460936acf25a9d8c880
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 296cde1d62eec4f1fe5f28d92fb2d67e40ba85a2 |
05-Mar-2013 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Plumb WebView.setInitialScale" into master-chromium
|
| e6f03adfbde60e4786255d826cb944d394dbf168 |
04-Mar-2013 |
Ben Murdoch <benm@google.com> |
Merge "Update CTS expectations." into master-chromium
|
| 4962a2c38a8273493072ca074f355a99f99704bf |
04-Mar-2013 |
Ben Murdoch <benm@google.com> |
Update CTS expectations.
Bug 8280368 is now fixed.
Bug: 8280368
Change-Id: I24e7ff042541b510c56221e54bcd70fff7a4f797
hromium/tools/run_webview_cts.py
|
| 3520eb778d668dc76ca4541c69abd568b9d02691 |
08-Feb-2013 |
Mikhail Naganov <mnaganov@google.com> |
Plumb WebView.setInitialScale
Also, make sure that WebView.getScale and WebViewClient.OnScaleChanged
doesn't take into account device screen density, for legacy compatibility
BUG=5012880,5012790
Change-Id: Iaaaee588728464b5a003a2292141c780a9f17577
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 4a0a38f783cb93f6a600da3ab296b72499239ffb |
02-Mar-2013 |
Jonathan Dixon <joth@google.com> |
Comment out computeScroll logging
Bug: 6029133
This is too noisy in everyday use. But keeping the function call in the
code (not-commented out) for easy grepping and tracking.
Change-Id: Ic6c760fcd53da1c27f320b70122b23e9b889c7e7
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 6a72d0b9821d4b547f6c4c34902685965e9645b1 |
01-Mar-2013 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Plumb WebSettings.loadWithOverviewMode" into master-chromium
|
| 8f616eb13a6382fd65d9a8a2149b2adcedbd18b4 |
01-Mar-2013 |
Ben Murdoch <benm@google.com> |
Merge "Update Expectations." into master-chromium
|
| 261c8f4b926b3fd8e514d688d00760912595ce99 |
01-Mar-2013 |
Ben Murdoch <benm@google.com> |
Update Expectations.
testDatabaseEnabled has been removed.
Bug: 8231270
Change-Id: Iddba569d160b89c9e22e5a0cdced6fe2b5789c07
hromium/tools/run_webview_cts.py
|
| d97646176837536731ca7747dfdf506482c853c7 |
28-Feb-2013 |
Mikhail Naganov <mnaganov@google.com> |
Change 'use fixed layout mode' setting in sync with 'use wide viewport'
Change-Id: Ica0c23dcd9d8125c6e4fb01b09548d751c53e8cd
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 4a2dbffec6475c4685eafcc83e7a4a03d6c1bdcd |
06-Feb-2013 |
Mikhail Naganov <mnaganov@google.com> |
Plumb WebSettings.loadWithOverviewMode
No CTS tests for this setting.
Change-Id: I87f4bc45038410901014342d9d23207cfcdc5b4e
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 444af6a43c45255ea1cb0baa68906d9ae32670d0 |
28-Feb-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Enabling DCHECKs - logging only for now." into master-chromium
|
| 970a2065df4f96ceaa9bc38d82caea9221dfa4c9 |
24-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Enabling DCHECKs - logging only for now.
Bug: 8263274
still need:
- install report handler to actually make it assert
- fixing the failing DCHECKs!
Change-Id: I2a650eec4a6eed1ce3478e7a77c640a83ea3f767
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| a38ea3d6b965188517b330ae184c4d30348efb62 |
27-Feb-2013 |
Ben Murdoch <benm@google.com> |
WebViewTest#testSetNetworkAvailable failing on bots.
Disable the test until we figure out what's up.
Bug: 8280368
Change-Id: Ib48dafecf58d0d7ed8718a9841f52c57ff276de1
hromium/tools/run_webview_cts.py
|
| a958325232a499a348471b159796bbb2c80c08b2 |
27-Feb-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge "Add --sha1 option to merge_from_chromium.py" into master-chromium
|
| 40eccfbdc8efc3219a81d3044a2b9ceb2f75a834 |
27-Feb-2013 |
Ben Murdoch <benm@google.com> |
Update expectations.
Bug 8276976 is now fixed. Turns out to be a force close dialog
stealing our input events.
Bug: 8276976
Change-Id: I1ef9ae4a0b0d3a314f636e70c88d9cd8be05f82a
hromium/tools/run_webview_cts.py
|
| 0d521727d7f2b57de718fe455b881d1cc7b3ba64 |
27-Feb-2013 |
Ben Murdoch <benm@google.com> |
Add --screenshot-on-ui-failure option to CTS script.
When we fail due to INJECT_EVENTS not being allowed, grab a screenshot
so we can better see what's going on.
Bug: 8276976
Change-Id: Icddc63b60a3a08bc39ef5228e6341bbc39715775
hromium/tools/run_webview_cts.py
|
| 96a4d8da950d3398a1d7c8fe5c42a632ffef7541 |
27-Feb-2013 |
Ben Murdoch <benm@google.com> |
Add spreadsheet reminder
Change-Id: Ieedb90ea9d24d0fa45a80284c5879765a11060bb
hromium/tools/run_webview_cts.py
|
| b3dc8b7350df220220a0e0f830bd1272cd72d629 |
27-Feb-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge tool: force push to temp branch.
If the real push failed we can be left in a state where the temporary
branch includes commits not on the real branch, which causes future
pushes to fail. Force push to the temp branch, as nobody checks it out,
to avoid this.
Change-Id: Ib2e0f866fc7df035fbd698da9ecb9d6f9faadef2
hromium/tools/merge_common.py
|
| bc894f165022100f31f4e53461cff0cc6728af7f |
27-Feb-2013 |
Jonathan Dixon <joth@google.com> |
Disable 3 failing tests
Bug: 8276976
Change-Id: I5ea689079e263992a75996c533482a824aab78d9
hromium/tools/run_webview_cts.py
|
| 77ed7692c7eb1d2734ed1de76ac6b8eebafc7b93 |
26-Feb-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Remove ssl tests from failures" into master-chromium
|
| 74827620c5f9a35e725e8c83609b4bd4a157b5be |
26-Feb-2013 |
Selim Gurun <sgurun@google.com> |
Remove ssl tests from failures
Bug: 6204287
Change-Id: I006afbeb37b9a06ea1d5fb49d8578b220adc898c
hromium/tools/run_webview_cts.py
|
| 3977434d5c3aafc00eaae0d2e78fa8ddd72536f3 |
09-Feb-2013 |
Bo Liu <boliu@google.com> |
Add --sha1 option to merge_from_chromium.py
The tot bot polls one of the Chromium git branches and can provide the
exact sha1 to the merge script to match up information such as
blamelists. This is the first step to making making this happen.
Change-Id: I85a768198902ba7961b60382a00ff59b9226d137
hromium/tools/merge_from_chromium.py
|
| 1b05bd67b2b2118b8de9089edd265b14735fbac0 |
26-Feb-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Implement onReceivedSslError" into master-chromium
|
| ece6e461209efdbe0efca59cca9056cfc505b65c |
26-Feb-2013 |
Torne (Richard Coles) <torne@google.com> |
Allow webviewchromium to be built on all platforms.
We have working makefiles for x86 and mac hosts now, so allow
webviewchromium to build by default on all platforms.
Bug: 7556801
Change-Id: Iba945dec097a657e354fd5788b96cdfb96bde9d7
ndroid.mk
|
| b455389686a6d4225f9270c4a2f63e03a8c0f6cd |
26-Feb-2013 |
Torne (Richard Coles) <torne@google.com> |
Add yasm to the projects to merge.
We need to merge third_party/yasm to be able to build media on x86.
Bug: 7556801
Change-Id: I0186b62ebb64836c3b9c633180343541f9f96585
hromium/tools/merge_common.py
|
| 6f0462d7f9823471f64087345b22f5a6e1c9cef7 |
26-Feb-2013 |
Ben Murdoch <benm@google.com> |
Merge "No-op ContentSettingsAdapter.setAppCacheMaxSize." into master-chromium
|
| 652dff60810f6f60981ccaefdb55e905d3e70625 |
26-Feb-2013 |
Ben Murdoch <benm@google.com> |
Merge "Fix build." into master-chromium
|
| edb98e3c667e37b00f338b51fb2e5d6bece4c447 |
26-Feb-2013 |
Ben Murdoch <benm@google.com> |
Fix build.
PictureListener changes are now targetting JB MR2 and the K constant
no longer exists.
Change-Id: If403e69d072cf27ee780644d3828ec51e4f882b1
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 5ad9b56f2db23760d3096476916f6ee9ad25747d |
25-Feb-2013 |
Ben Murdoch <benm@google.com> |
No-op ContentSettingsAdapter.setAppCacheMaxSize.
This is not planned to be implemented.
Bug: 6294639
Change-Id: If308ccba3640b656427b6648a88d722bad83bd32
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 9405536501747e2d7b4fc46a33e5f0a1e7fd47ac |
23-Feb-2013 |
Jonathan Dixon <joth@google.com> |
Mark more methods that won't be implemented as no-op.
Bug: 7331507,5012890
Most of the WebIconDatabase is planned to be a no-op on chromium.
Likewise save/restorePicture will not be supported.
Also, wire up getFavicon.
Change-Id: Ibe0558f771e61c08ea288ea7f0fdd52a077c74d7
hromium/java/com/android/webview/chromium/WebIconDatabaseAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 810dbede330745ea00d2d1d746d39d6e8cd3c16b |
25-Feb-2013 |
Ben Murdoch <benm@google.com> |
Plumb WebSettings.get/setDomStorageEnabled.
Bug: 6295301, 8260794
Change-Id: I676642c2e94a3f2400da51237d30c023f139aa3b
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 62c1f9e94fbc64193ded0449b96dd2a44f810061 |
01-Feb-2013 |
Selim Gurun <sgurun@google.com> |
Implement onReceivedSslError
Bug: 6204287
Change-Id: I68529ceef8ec1a3e9f03ba30ffcb02a481db7fe3
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 5d20093562806fbce9cc0d3eb4a411ed6c5ce1c0 |
23-Feb-2013 |
Bo Liu <boliu@google.com> |
Hook up WebStorageAdapter methods
Change-Id: Ie61645920c0a6f5ae1535d628c4fb1ce833fbc8a
hromium/java/com/android/webview/chromium/WebStorageAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| e20e0bd1b2dc12d23f64b9ba6df26b58f38ad374 |
22-Feb-2013 |
Ben Murdoch <benm@google.com> |
Update test expectations.
Bug 8209022 is fixed.
Bug: 8209022
Change-Id: I2fe83fa672da37c1cf708e5c20f805649aabba81
hromium/tools/run_webview_cts.py
|
| 508b86bb5ed5dfbd047f0171756cd853048af4a4 |
22-Feb-2013 |
Ben Murdoch <benm@google.com> |
Update CTS expectations given recent investigations.
Change-Id: I5929de7a3a87454e8c55d2d6f3d9819fa680b697
hromium/tools/run_webview_cts.py
|
| e51e2365d481a173bd2275e2b3f8d62f0d99898d |
21-Feb-2013 |
Ben Murdoch <benm@google.com> |
Fake an onNewPicture callback after onPageFinished.
The new upstream rendering path altered the timing on onNewPicture
callbacks such that some of the CTS tests became flaky, timing out
waiting for pages to load. Re-introduce a hack in the glue layer that
will fake an onNewPicture callback at the time the CTS tests expect
to deflake them.
Bug: 8208948
Change-Id: I21f20880099dd3d5f06079ba8662981764991455
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 6b5f3d1546ae2a9c712cde60c54ec027582bc4e6 |
21-Feb-2013 |
Martin Kosiba <mkosiba@google.com> |
Use getContentHeight/WidthCss methods from AwContents.
This switches WebViewChromium to use the newly exposed width and height
getters.
Change-Id: Ia21921e8bcdd604a11a030810b741f134a57ec82
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 71ba007061e20af4f58c74f00067c155c4ffcbcd |
20-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Update test expectations after landing geoloaction
I think this is due to software rendering making the tests
flaky or failing when they should not.
Change-Id: I9786c40cc2b3ec3e5d36ff9c36b0e6d07b93097b
hromium/tools/run_webview_cts.py
|
| ebeaef778ad1703817402c2e4463e8779ea63a5c |
19-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Enable geolocation for the chromiumpowered webview." into master-chromium
|
| ff2704e614eb490baea0acb5c8ab22e061033694 |
09-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Enable geolocation for the chromiumpowered webview.
Previously this change caused bug 7929330, I will monitor
the bots after landing this and revert if it happens again.
It is not reproducible locally.
Change-Id: Id1290f6fd28328e197088250f0c9c6982ce1c933
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/tools/run_webview_cts.py
|
| 0ded546f96eddc12d342a419e78e335463a0e55d |
19-Feb-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge tool: change commit message." into master-chromium
|
| cb12295daa313fcefcfff1681c30f3fe935e762e |
19-Feb-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge tool: change commit message.
When removing directories according to the known_issues list, change the
commit message to refer to them as "unwanted" instead of "incompatible"
as we are now going to use this list to also prune code/headers that we
don't want to depend on inadvertantly.
Change-Id: I67feda171350f545b17d5023f48a9ff888c60731
hromium/tools/merge_from_chromium.py
|
| 1e2928bab700c1a4c5a99d4e8c87e259866beb1d |
18-Feb-2013 |
Ben Murdoch <benm@google.com> |
Plumb WebChromeClient.onReceivedIcon.
Bug: 6295041
Change-Id: I5810b01aec831632e83f3550c2aa66007511647d
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 09d178c3fcae5bb8ab8a7806f3730b94abeba548 |
15-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Create geolocationpermissions when creating a webview" into master-chromium
|
| 8166110add693878f19ab0551c630a22caa2e30c |
15-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Create geolocationpermissions when creating a webview
It can be used inside the webview, so it cannot be lazily created.
Change-Id: If8754c6c7d999291b2d4295db1dcaf37b1190cef
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 86417b31b19f32d6ffcb8114babc92ad40d34f62 |
15-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Fix for b/6295008 Implementing setGeolocationEnabled" into master-chromium
|
| 4cbf0be8e001507485515c1341e9b90e2c39000a |
15-Feb-2013 |
Ben Murdoch <benm@google.com> |
Merge "Update CTS test expectations." into master-chromium
|
| c73e3c1872975eec939841f8cf9d6b5842ecfade |
15-Feb-2013 |
Ben Murdoch <benm@google.com> |
Update CTS test expectations.
Change-Id: Iaf0efa10e3e73b9ac417636b20c12699de67e47e
hromium/tools/run_webview_cts.py
|
| 7dd19d26947b4aec3e97bc360c7f9a333e224b49 |
15-Feb-2013 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Plumb WebSettings.setTextZoom for non-text autosizing layout modes" into master-chromium
|
| 1d48c7210b6a3bbf9cc9dd16d6bd36522e3952ce |
15-Feb-2013 |
Mikhail Naganov <mnaganov@google.com> |
Plumb WebSettings.setTextZoom for non-text autosizing layout modes
BUG=7873666
Change-Id: Icb4078f2a06f40dea08982229a1d4776671ee8c5
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 37495d9c1479f71f702ca3587a5952c133c35878 |
15-Feb-2013 |
Ben Murdoch <benm@google.com> |
Merge "Revert "Revert "Implement WebSettings.[get|set]DatabaseEnabled""" into master-chromium
|
| f7bb780599aea67773e11763850892a6de69b4f0 |
15-Feb-2013 |
Leandro Gracia Gil <leandrogracia@google.com> |
Merge "Enable the capturePicture API." into master-chromium
|
| e10a89c002f0d4699bc9ab64f37a3fc62ce2a7b6 |
15-Feb-2013 |
Ben Murdoch <benm@google.com> |
Revert "Revert "Implement WebSettings.[get|set]DatabaseEnabled""
The required patch from upstream Chromium has landed into
our downstream branch, so now downstream code can depend
on it.
This reverts commit 1b1de1da02cd1a8140b1dbb589cd71e23b46caf0.
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 1b1de1da02cd1a8140b1dbb589cd71e23b46caf0 |
15-Feb-2013 |
Ben Murdoch <benm@google.com> |
Revert "Implement WebSettings.[get|set]DatabaseEnabled"
We need to wait for the requisite patch to land upstream first, and
merge down.
(https://codereview.chromium.org/12194033/)
This reverts commit ba70f865080c28469dafe3639948f358bb2e34f9.
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 3a6311ba5c2f60d56ca04c06c415bdc8804cb313 |
15-Feb-2013 |
Ben Murdoch <benm@google.com> |
Merge "Add Chromium content/ resources overlay." into master-chromium
|
| 5d225eb06da31d8536d5239ad8445bc501d9795d |
15-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Fix for b/6295008 Implementing setGeolocationEnabled
Hooking it up to the chromium webview settings.
Change-Id: I523ed8700b677ba39c2ed41bcff240bdc196c035
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 1a801894ce6b0a86d58f1f768db7b2c48b4d6bc7 |
15-Feb-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Implement WebSettings.[get|set]DatabaseEnabled" into master-chromium
|
| 0b3d6b3eed98293d3509b05241071ad7ffe76bf1 |
14-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Removing parameter not used inside the constructor of AwContents" into master-chromium
|
| d441624dc5747bee621b07ba2017b0122ce0f601 |
08-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Removing parameter not used inside the constructor of AwContents
Create the native window separatly. Can be done since
https://codereview.chromium.org/12225090/
has landed.
Change-Id: I352ab7883cc3c701673550aabcc1af649cc79407
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| e98a8a77d3f27ef6f5d34a17c845b66b1998fc06 |
13-Feb-2013 |
Bo Liu <boliu@google.com> |
Plumb through onShowCustomView callback
Original patch by acleung@google.com
Change-Id: Ibac9c402600300d3f89ff6db93b31235813e6ef9
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| fccd74a2465bd15eba279fb99cadc21a6b20fb21 |
13-Feb-2013 |
Ben Murdoch <benm@google.com> |
Merge "Copy localised paks into system image." into master-chromium
|
| ba70f865080c28469dafe3639948f358bb2e34f9 |
05-Feb-2013 |
Selim Gurun <sgurun@google.com> |
Implement WebSettings.[get|set]DatabaseEnabled
Bug: 6294786
Implement Websql database. Also implement no-op methods for
[get|set]DatabasePath.
Change-Id: I7dd9161d12aaac34b6a14e4b53f8df5acee6e6a1
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 665ce1d6252cfbc029dd90422a93f1434e708674 |
13-Feb-2013 |
Bo Liu <boliu@google.com> |
Mark some failing cts tests as expect fail
Offending cl: crrev.com/12210132
Upstream bug: crbug.com/172786
Change-Id: I4178dcfe901c0ebed6ea5db0e381395c8fa82515
hromium/tools/run_webview_cts.py
|
| 099c3617e70ea15c77e6c63abfb715d9f1fa3db5 |
12-Feb-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Disable newly added websql database tests." into master-chromium
|
| 37956d064e28105d2d21e334e6efae60fc657fca |
12-Feb-2013 |
Selim Gurun <sgurun@google.com> |
Disable newly added websql database tests.
We do not have websql database enabled yet. We will enabled these once
the tests are added.
Change-Id: I97dc5f3e43b24decf9ebbe8cd5ce918bb5f5df3d
hromium/tools/run_webview_cts.py
|
| e396494c3962a9625ba61472b56d20472258544a |
07-Jan-2013 |
Ben Murdoch <benm@google.com> |
Add Chromium content/ resources overlay.
This CL introduces a resource overlay for the Chromium
powered WebView. These resources are imported from
upstream chromium.org and renamed with a "webviewchromium_"
prefix.
At build time, they will be injected into the
com.android.internal.R namespace so that they can be
referred to in code.
Bug: 7908547
Change-Id: Ifa00bae10118659c03c049d2a51f350144fe56a7
hromium/chromium.mk
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_ondemand_overlay.9.png
hromium/overlay/frameworks/base/core/res/res/layout-land/webviewchromium_date_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_picker_dialog.xml
hromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_month_picker.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
hromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
hromium/overlay/frameworks/base/core/res/res/values/dimens.xml
hromium/overlay/frameworks/base/core/res/res/values/strings.xml
hromium/overlay/frameworks/base/core/res/res/values/webviewchromium_official-command-line.xml
|
| 617a9fdc247d2bb599f94f1ae267df82b8e66ab6 |
11-Feb-2013 |
Ben Murdoch <benm@google.com> |
Copy localised paks into system image.
Make the Chromium webview build depend on localised paks to get
them into the system image.
BUG=7510463
Change-Id: I52f4ae4223fda540e2b418b041c2d1e4935d1800
hromium/Android.mk
|
| f06e9bc7c6e4e8f2b76e4baba8353a9c669c4314 |
09-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Remove hittest and unhandledKeyEvent from expect fail" into master-chromium
|
| 397c9a4f770a04a99b9ca5d341381adfaf53a27f |
09-Feb-2013 |
Bo Liu <boliu@google.com> |
Remove hittest and unhandledKeyEvent from expect fail
Change-Id: Ic3157ab6f916d1a18d8948ad5b524ecca4790b43
hromium/tools/run_webview_cts.py
|
| 96ee10cad186df4cc46eabf38ef37773eed75fef |
07-Feb-2013 |
Ben Murdoch <benm@google.com> |
WebSettings.setRenderPriority -> no-op.
As discussed in the bug, implementing this as a no-op for
Chromium WebView.
Bug: 6335436
Change-Id: I2ca615cdcf5d6c3da416ddc6cc378b1b48c2b880
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| b8ca3b2f5e893995542f08433289fbce9fe1283a |
07-Feb-2013 |
Ben Murdoch <benm@google.com> |
Merge "Plumb WebViewDatabaseAdapter.clear/hasHttpAuthUsernamePassword." into master-chromium
|
| b28c1d4a675b413827067961110b55c02f507038 |
07-Feb-2013 |
Ben Murdoch <benm@google.com> |
Merge "WebSettings.get/setSavePassword --> no-op." into master-chromium
|
| e21ee6e79c57596d44737139b97c093167b58808 |
06-Feb-2013 |
Ben Murdoch <benm@google.com> |
Plumb WebViewDatabaseAdapter.clear/hasHttpAuthUsernamePassword.
These methods have been implemented upstream, we just need to plumb
them.
BUG:6234236
Change-Id: I387b8d2a953342121328fffb5f1e0ae7676ffcb1
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java
|
| 94fff0308975ad0d5b19c744d4b3a5a700692638 |
06-Feb-2013 |
Ben Murdoch <benm@google.com> |
WebSettings.get/setSavePassword --> no-op.
WebViewChromium does not support the WebView APIs for inferring
and storing usernames and passwords used in web forms, so turn
the setting accessors into no-ops.
BUG: 6335194
Change-Id: I9c9695654cb48067f784506b4da02f31328560cb
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 7f2e765819ddf5283ab25c9d07cb037de5405573 |
07-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Not using unused parameter private browsing when create AwContents" into master-chromium
|
| a1f818cfa81f35795e5806671116cc5fe25ee035 |
06-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Not using unused parameter private browsing when create AwContents
Change-Id: Icea2ca5e6a982fe2498ed526daa5b6e40413c680
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| d270f7d415388df553e5d3d57e00258fe8ef969b |
06-Feb-2013 |
Leandro Gracia Gil <leandrogracia@google.com> |
Merge "Update the onNewPicture callback to support external native SkPictures." into master-chromium
|
| 98955223101eb30c5d820d14827e9047c9182f4f |
06-Feb-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Revert "Hookup Resources on video views"" into master-chromium
|
| fd04fd7bd39559bae780324aed460f5b6685c477 |
06-Feb-2013 |
Jonathan Dixon <joth@google.com> |
Revert "Hookup Resources on video views"
This reverts commit 5ac5a8b4d70f29100dc140bfdcd4c3ed0c2c1a38
Change-Id: Ie0f2b6fe2cbfad2aa91d4507060352b6da62f3a7
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| de851dfb391f9a259cdb211dc930e9c505a2ff4b |
06-Feb-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Hookup Resources on video views" into master-chromium
|
| 5ac5a8b4d70f29100dc140bfdcd4c3ed0c2c1a38 |
29-Jan-2013 |
Alan Leung <acleung@google.com> |
Hookup Resources on video views
Change-Id: I53e72f695941a7f81cc39f78422fa72647ad643e
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| f15e28c8d30c2ccea58871c9d22f8b47e53d6ea4 |
09-Jan-2013 |
Leandro Gracia Gil <leandrogracia@google.com> |
Update the onNewPicture callback to support external native SkPictures.
Needs to be landed after https://codereview.chromium.org/11823027/ .
Change-Id: I1febd5330e61e84733d11b835142cb05cf21795e
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/plat_support/graphics_utils.cpp
|
| a611c7e365068e2130b6de87b2b14e3b75ae1d4e |
01-Feb-2013 |
Bo Liu <boliu@google.com> |
Add option to get the svn HEAD revision
Not directly querying the svn server using svn info because we are
tracking the git-svn mirror which may be minutes behind.
Instead use existing parsing logic to get the svn revision from git.
Need to add a quiet option since it was printing out a log message.
Change-Id: Ib4e556916e75f3c2fab8b645b430f306d1268733
hromium/tools/merge_from_chromium.py
|
| 606709d4b1cd2a512db3ffc3fa6667fb76ac5509 |
01-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Part of fix for bug 6295008
Removing not implemented from setGeolocationDatabasePath. No plans
to let the user set this individual path, and storing the data in
a chromium webview shared preference.
Change-Id: I8996adfc48f67e0af80fedfd83248d60c769056b
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 8979b2e6bf3b6b9236c949e0566ab710beb01b5b |
28-Jan-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Wire up WebViewClient.onReceivedLoginRequest" into master-chromium
|
| 48e8d7bc6b971ae8a75713cc16c620385fa02705 |
28-Jan-2013 |
Kristian Monsen <kristianm@google.com> |
Merge "Hook up getVisitedHistory updated callback" into master-chromium
|
| 9f5a8b643ea40b09da933562eadef48fda8238d9 |
22-Jan-2013 |
Kristian Monsen <kristianm@google.com> |
Updated test expectations with testOnUnhandledKeyEvent failing
Filed crbug.com/171485 to track and fix this failure
Change-Id: I2b38fc9ae15ce9f4ec6047414819e43e0160fbec
hromium/tools/run_webview_cts.py
|
| 6d4097cfa188a95c95fd5d0c86238c91f817c3ed |
18-Jan-2013 |
Ben Murdoch <benm@google.com> |
Plumb WebView.showFindDialog
Implement in terms of android.webkit.FindActionModeCallback.
Requires framework change: Ic3156eb50f99033a17ba3f83d0b4f39ba992afa8
BUG=5006564
Change-Id: Ic0b9a1a0f3c55b7a4339b3e2716279ac19a58db2
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 34f6f8b237be5b481edd02143c673dc20d2015d4 |
18-Jan-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Add a provider method to be added in framework." into master-chromium
|
| fde8dae44f74be3de69ce6dd07b0023279b485a0 |
18-Jan-2013 |
Ben Murdoch <benm@google.com> |
Add a provider method to be added in framework.
This avoids us breaking the glue layer when the
frameworks/base change lands.
(see Change-Id: Ic3156eb50f99033a17ba3f83d0b4f39ba992afa8)
Change-Id: I5b5c2985d47ec10497675b8b4764824076c77906
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 97a5fe19fb8224fd8ce867edf6692eceb5fd70d1 |
18-Jan-2013 |
Bo Liu <boliu@google.com> |
Wire up WebViewClient.onReceivedLoginRequest
Change-Id: I2dcf67a1f2900f817356792cad86b0a991c0926f
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 809cfd05f0ac95dda1a754b0a3b6283112f12def |
16-Jan-2013 |
Bo Liu <boliu@google.com> |
Hook up getVisitedHistory updated callback
Change-Id: Ifeb861338f7f5210528b9acd7d85db667eeb9f01
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 10e88eb5c30d54aa9dbc588a84fb04a2b5fedb7c |
16-Jan-2013 |
Kristian Monsen <kristianm@google.com> |
Catching generic Exception to get the automerger rolling
Change-Id: If7a58e524093e6acd8433551c41485e14fe4794b
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 979b73ce2c37f98f70f482489b3977876ea2e6fa |
16-Jan-2013 |
Kristian Monsen <kristianm@google.com> |
Fix build break
Change-Id: I7f4b414be983a3688833c7c357d32e0f69949ab4
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| e59502f680ec71d2df3af0bab59d4ec3778052ae |
15-Jan-2013 |
Bo Liu <boliu@google.com> |
Fix build after
onEvaluateJavaScriptResult was removed from the AwContentsClient
interface in
http://src.chromium.org/viewvc/chrome?view=rev&revision=176773
Change-Id: I772b6674ed92b2e571eced59f087236d686509ec
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 52b029e1492481071624d91db3b26c08bba755cf |
14-Jan-2013 |
Jonathan Dixon <joth@google.com> |
Merge "No-ops for some methods that won't be supported" into master-chromium
|
| ac1e2a49d2eeafc14061069bce1c686dbe3b592c |
14-Jan-2013 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Update cts test expectations" into master-chromium
|
| 12b814589024ccd7df83163a67338a4f0d6ccd84 |
14-Jan-2013 |
Bo Liu <boliu@google.com> |
Update cts test expectations
Some tests were removed, some newly passing
Change-Id: Ife3cbfd9a2b095313ee9dc28072e5de168b518e4
hromium/tools/run_webview_cts.py
|
| aa809da5632b10fa87d385c434a24eb64d8ce334 |
14-Jan-2013 |
Marcin Kosiba <mkosiba@google.com> |
Update test expectations.
The following 4 tests were consistently passing for more than 10 builds:
android.webkit.cts.WebViewTest#testSavePassword
androidid.webkit.cts.WebViewTest#testFindAddress
android.webkit.cts.WebSettingsTest#testAccessSavePassword
android.webkit.cts.WebViewTest#testSaveAndRestorePicture
Change-Id: I61f67865da032ac19a2e30e7e7a54e0b67bafdc7
hromium/tools/run_webview_cts.py
|
| c991423af549558cc959aaf7b920d5dd40175241 |
14-Jan-2013 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Implement WebView.onMeasure" into master-chromium
|
| 71678822f1ec93ebcee1e917fa5b52ff37ce65d4 |
12-Jan-2013 |
Jonathan Dixon <joth@google.com> |
No-ops for some methods that won't be supported
Bug: 6295357, 6295308
getEnableSmoothTransition
setEnableSmoothTransition
getNavDump
setNavDump
getUseWebViewBackgroundForOverscrollBackground
setUseWebViewBackgroundForOverscrollBackground
Change-Id: I490979b014a133dfecfef78462e6498e2b37c1da
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 14c985bb8bea1ed45638d07fd72734dac7f818a0 |
11-Jan-2013 |
Selim Gurun <sgurun@google.com> |
Merge "Provide no-op implementations for deprecated APIs" into master-chromium
|
| adc6c4d74c77a617100bdfeb174ab0c314b24ea8 |
11-Jan-2013 |
Selim Gurun <sgurun@google.com> |
Provide no-op implementations for deprecated APIs
Bug: 5012826
Change-Id: Icfd13d14f5d41876a29c0e51e62759aa466d0b72
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java
|
| d7bf6ab0cd8cc4005b112e4358eb797bb178a85f |
02-Jan-2013 |
Marcin Kosiba <mkosiba@google.com> |
Implement WebView.onMeasure
Use the AwLayoutSizer to implement onMeasure.
Change-Id: Ieeed7cc20f713d139d66f4c62d4134d5b0c2a5a9
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 5e5e4c68d3bdf49d684cbd0cbc437b6dec34074f |
11-Jan-2013 |
Marcin Kosiba <mkosiba@google.com> |
Merge "Use AwContents.InternalAccessDelegate." into master-chromium
|
| 6861e6a860586938a127ed1f4c0c30043279594c |
04-Jan-2013 |
Mikhail Naganov <mnaganov@google.com> |
Plumb WebSettings.{get|set}UseWideViewPort
BUG=6295354,6946506
Change-Id: I800a571889a25dd9a16f9ba76dc043c719545280
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/tools/run_webview_cts.py
|
| 9c5a40623b62737244deb2d04a98830d7ffa8404 |
28-Dec-2012 |
Leandro Gracia Gil <leandrogracia@google.com> |
Enable the capturePicture API.
Change-Id: I90a00045c07b5653ac868b01ce64f98e09fd42e8
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 4702a6de6031477029de5e6f5777c8b3e7846d35 |
10-Jan-2013 |
Marcin Kosiba <mkosiba@google.com> |
Use AwContents.InternalAccessDelegate.
This migrates WebViewChromium over to using AwContents.InternalAccessDelegate.
This change also adds an implementation of the setMeasuredDimension
callback which is required to implement onMeasure.
BUG=7380310
Change-Id: I6dda0ef01c6ce82fb92817de6afbe01c1b208f80
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 36bc7b31b703081e48b6e4f56bbe50e1e3b32c45 |
09-Jan-2013 |
Leandro Gracia Gil <leandrogracia@google.com> |
Merge "Remove the scroll correction introduced in preDispatchDraw." into master-chromium
|
| 0b528e4924a7c14687181185bc66173ad18f00ea |
08-Jan-2013 |
Leandro Gracia Gil <leandrogracia@google.com> |
Remove the scroll correction introduced in preDispatchDraw.
This is an obsolete workaround that was previously needed to make the defunct
TextureView (child-view) based render path work.
Change-Id: I22423fb9e67bbb93a5d15345f51403d548f8e1bc
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 8bbbdb9f5c4119e3fcb7a058026e88728ae1d74f |
09-Jan-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Minimal get/set UserAgent implementation" into master-chromium
|
| ba03529fdf8d5cfed0e2d8c0fe81eb1028a5b4ca |
05-Jan-2013 |
Jonathan Dixon <joth@google.com> |
Minimal get/set UserAgent implementation
Just adding the minimum to keep basic backward compat.
Bug: 6212306
Change-Id: I6b0f4f02616bbce6c5795804d0527673c72d424d
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 4098e8316ddaa5b20fd8f97438fd063a5468db0e |
08-Jan-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: add missing log message.
The message about generating makefiles got lost at some point, so
failures at this stage look like they are caused by the generation of
LASTCHANGE (the previous message). Restore the message to make this
clearer.
Change-Id: Id152c3f4850b9d8a19ae797548326423bfe72e4a
hromium/tools/merge_from_chromium.py
|
| d2a42d0b062f4c9bb4c3fefc80cde98350b5974e |
08-Jan-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: detect no changes to merge case.
Add a new option to merge_from_chromium to use in a script, which
specifies an exit code to use when there were no changes to merge.
Defaults to 0 (success) as that's the current behaviour.
Change-Id: I9a155b5f03beef4cd343f1fd9d0d74f6322ed98c
hromium/tools/merge_from_chromium.py
|
| 9fb672be51066b51a372885377cc0eff78e1a34c |
07-Jan-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge script: add an option to just retrieve LKGR.
Add a command line option that just prints the current LKGR, for scripts
to use.
Change-Id: I5b38bf10b88f65e81f2995fccb8375d4b9cccb78
hromium/tools/merge_from_chromium.py
|
| fd78e9893f4e67ddde0309154093a5b1e08a5b3c |
04-Jan-2013 |
Mikhail Naganov <mnaganov@google.com> |
Remove mentions of removed WebSettingsTests.
Change-Id: I1bc02c4f00641e309af2defaf91909f82e1ed702
hromium/tools/run_webview_cts.py
|
| 424a662ac1e640a72b14616a02e6e938a496f88e |
03-Jan-2013 |
Ben Murdoch <benm@google.com> |
Merge "Throw exception when entering incognito mode with WebViewChromium." into master-chromium
|
| 9d18f71cd72e86382c4df71a8de70e27f69793fc |
03-Jan-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Re-attempt at refctoring libary loading" into master-chromium
|
| 5a25477f4323996be9d5cc32935066c73b47061b |
03-Jan-2013 |
Ben Murdoch <benm@google.com> |
Throw exception when entering incognito mode with WebViewChromium.
BUG:7908757
Change-Id: I4b9d1e688b9540b76fe5d7637f3aa6e0f2b9f457
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 93cadfddb94f7c4d91d2671b7fdca3745c995aeb |
02-Jan-2013 |
Jonathan Dixon <joth@google.com> |
Merge "Change repo smartsync to sync -s" into master-chromium
|
| 23f362e96b2c4d63cefbdc3119e5658f9cf1f2ba |
02-Jan-2013 |
Bo Liu <boliu@google.com> |
Change repo smartsync to sync -s
Change-Id: Ic7b01b45a6ea7a68ce0560b425957aea5edcc2e4
hromium/tools/buildbot/webview_buildbot_functions.sh
|
| 58d5e9da9756274fa2cede82ab12723555ef0ed3 |
02-Jan-2013 |
Leandro Gracia Gil <leandrogracia@google.com> |
Merge "Override onNewPicture in preparation of the incoming new abstract method in AwContentsClient." into master-chromium
|
| f3e3e4e6b6c5798f435c1d14379edeb479e3b25d |
02-Jan-2013 |
Jonathan Dixon <joth@google.com> |
Re-attempt at refctoring libary loading
This is a reworked version of https://googleplex-android-review.googlesource.com/#/c/255006/
- that CL never stuck due to unrelated problem it exposed with the
GeolocationPermissions (see Bug 7929330).
The original patch does not apply now so this picks out the important parts,
switching to use AwBrowserProcess to control the startup flow.
Change-Id: I818297a503a3bab82cdf0653ad26e0b32294a930
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 5ca5f5c6e538735aa0d0c840eb745cdc4e4a34bb |
31-Dec-2012 |
Leandro Gracia Gil <leandrogracia@google.com> |
Override onNewPicture in preparation of the incoming new abstract method in AwContentsClient.
Change-Id: I07fd14d4c899eca370386768dbb211bcd5911519
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 99c797fce63d081079efb964bb01047f76efdf62 |
31-Dec-2012 |
Martin Kosiba <mkosiba@google.com> |
Merge "Fix NPE when visibility is changed before initialization has completed." into master-chromium
|
| 151ee73066d5ae9caa8afb828befd9cfbc199b62 |
31-Dec-2012 |
Ben Murdoch <benm@google.com> |
Merge "Implement binding for HttpAuthHandler.useHttpAuthUsernamePassword." into master-chromium
|
| 0df758101bdd74c264b69ca69a397088833b8cbb |
30-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Work-around for bug 7929330
Bug: 7929330
For some reason returning non-null GeolocationPermissions breaks many
other CTS tests (on the bots only)
Change-Id: I4098443fbfc5fa1a69019d55abfe0050752beaee
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 50a184c1e058bc62f659fb80e09e7507ef13d6c9 |
29-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Remove spurious mGeolocationPermissionsAdapter field
re-landing parts of If4b52eb6442c0c5a0d4ec19ba1de2183a753c324
incrementally.
Change-Id: I317bf0989024474261ad496166f19ac94e32bc1b
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 9aa44b4e29be9f4b271edb3f4d438d806d4cc176 |
29-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Roll-back libary loader refactoring
There's still a problem that is causing the CTS tests to fail on
bots so this effectively rolls the file back to prior to change
If4b52eb6442c0c5a0d4ec19ba1de2183a753c324
Change-Id: Ie854798d142b9049ca4cbe6043bd68233c7187c6
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| f0bc6659b31dd5a3ed4a3f9eda7bdd4d291881b6 |
29-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Second attempt at getting the CTS bot happy
Change-Id: Ie228e7b3e871156fd22ced9373b742ff21a213a4
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 7b77b2fb0f7148bc31e23cabadb234231699ff93 |
29-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Trial fix for CTS failures
Ensure the webview library is loaded (on main thread) prior to
configuring path service.
Change-Id: I8644ee6be23300a8e533d3d1093e058367299b5a
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 72ef17f90661d3631e8bc9e0d7b116a8c5498494 |
29-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "re-land "Simplify the library load, and prepare for zygote"" into master-chromium
|
| f0f355514e4420755c15491fe3b21a2eeaa42654 |
19-Dec-2012 |
Jonathan Dixon <joth@google.com> |
re-land "Simplify the library load, and prepare for zygote"
Relanding patch now https://codereview.chromium.org/11665023/
has rolled into the android tree
This reverts commit e49b38ed53e1b3be1530e4eb1b49ce6ba6f62db1.
Change-Id: If4b52eb6442c0c5a0d4ec19ba1de2183a753c324
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 049667de06aaf4efd4570eccfdeb1bc9cc67c997 |
27-Dec-2012 |
Kristian Monsen <kristianm@google.com> |
Merge "Implemted the frameworks/webview part of GeolocationPermissions" into master-chromium
|
| 080d899eedfd61a16a89e089351d8388cb94f561 |
27-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Update CTS expectation
2 more tests passing:
UNEXPECTED PASSES (update expectations!):
android.webkit.cts.WebViewTest#testAccessHttpAuthUsernamePassword
android.webkit.cts.WebViewTest#testGoBackAndForward
Change-Id: I9ed181ffc5cfe791c0a85c5bf44ba277b4ac8d39
hromium/tools/run_webview_cts.py
|
| 885c764368483b3082be2eccfab3c8a9f72f95b1 |
27-Dec-2012 |
Kristian Monsen <kristianm@google.com> |
Implemted the frameworks/webview part of GeolocationPermissions
Change-Id: I2a1714a91e3b92e5c75100aa233d6a3763afbafb
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 991b0c63bb8c0b0d8577a255b026117e9f37cece |
27-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Revert "Revert "Connect up DrawSW interface""
This re-lands Ie9e6a28213167e0e7eaf9d91668466935d14fe38 as the dependent change has now rolled into android tree.
Change-Id: I121d7de9c1428e773fde54653d7e60fa898c7acd
hromium/Android.mk
hromium/java/com/android/webview/chromium/GraphicsUtils.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/plat_support/draw_gl_functor.cpp
hromium/plat_support/graphics_utils.cpp
hromium/plat_support/jni_entry_point.cpp
|
| d72ea1e90563e7d3056eef86c3c7dd0c526b718f |
26-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Revert "Connect up DrawSW interface"
This reverts commit 8a8a1f9b5ea238437196790b89f4dbec78fda4e9
The dependent patch hadn't yet rolled into Android tree - will re-land this one when it does.
Change-Id: If4241162a9c26997cdd6636b17cbd4182ac85096
hromium/Android.mk
hromium/java/com/android/webview/chromium/GraphicsUtils.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/plat_support/draw_gl_functor.cpp
hromium/plat_support/graphics_utils.cpp
hromium/plat_support/jni_entry_point.cpp
|
| 8a8a1f9b5ea238437196790b89f4dbec78fda4e9 |
22-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Connect up DrawSW interface
Depends on https://codereview.chromium.org/11665020
Provides the underlying code with direct access to native bitmap
pixels that back the java Canvas.
Change-Id: Ie9e6a28213167e0e7eaf9d91668466935d14fe38
hromium/Android.mk
hromium/java/com/android/webview/chromium/GraphicsUtils.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/plat_support/draw_gl_functor.cpp
hromium/plat_support/graphics_utils.cpp
hromium/plat_support/jni_entry_point.cpp
|
| d32343c77868461af07738ac7abd802000490d3d |
21-Dec-2012 |
Ben Murdoch <benm@google.com> |
Implement binding for HttpAuthHandler.useHttpAuthUsernamePassword.
Query the AwHttpAuthHandler for whether this is the first
auth attempt for this request.
BUG:7034995
Change-Id: I081969d2900aeec17878fdae47a1baf22120f734
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| c346a83062dfbf50ac2275813ccb2e36f9e778e9 |
07-Dec-2012 |
Martin Kosiba <mkosiba@google.com> |
Fix NPE when visibility is changed before initialization has completed.
Becasue WebViewChromium uses a two-step initialization mechanism it is
possible for an instance of the class to receive method calls from the
view system before it is fully initialized.
Fortunately it is safe to ignore onVisibilityChanged callbacks if the
AwContents hasn't been created yet.
BUG=7622923
Change-Id: I50fdfc4cd194c21cc64506a1f9aa6f3a38a19173
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 037e86f2095d1ca3fc1dff8e4ee82457257e8ea0 |
21-Dec-2012 |
Ben Murdoch <benm@google.com> |
Merge "Wire up WebSettings#setNeedInitialFocus" into master-chromium
|
| d5f17bbd8703a56ac084a64b1ce2f673f67bd72d |
20-Dec-2012 |
Kristian Monsen <kristianm@google.com> |
Renaming org.chromium.android_webview.CookieManager to AwCookieManager
Part 2, first part here:
https://chromiumcodereview.appspot.com/11614014/
Change-Id: Iafe7e7f68002d2cf32b8e6f4408233b65d212ceb
hromium/java/com/android/webview/chromium/CookieManagerAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 4cee3bf50c125a52a49323aa999f4b619fa18c10 |
20-Dec-2012 |
Ben Murdoch <benm@google.com> |
Wire up WebSettings#setNeedInitialFocus
Wire up the setting we need to determine if we should give focus
to the first element in the DOM when we get the WebVuew#requestFocus
API call.
Change-Id: Ia39f14c31c7ba5c5c976c91a2b9486571d55f1f1
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 72724a6d44b1f9ebc7e122045a72f3502185844d |
18-Dec-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: fix stringification error.
The exception needs to be explicitly converted to a string before it can
be concatenated.
Change-Id: Ie18a55480e5c16233fc9967f4000039ca21cc422
hromium/tools/merge_from_chromium.py
|
| e49b38ed53e1b3be1530e4eb1b49ce6ba6f62db1 |
18-Dec-2012 |
Bo Liu <boliu@google.com> |
Revert "Simplify the library load, and prepare for zygote"
This broke a bunch of cts tests.
This reverts commit 3053d8bc3be48b0cbc6f33e1975c03a10ac303a5.
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| fc21d2e7a06dcdbe43f35f1ba20d9e8770738339 |
18-Dec-2012 |
Ben Murdoch <benm@google.com> |
Add third_party/opus/src project to merge script.
Change-Id: I6c35c8f7b3bdeaf3a8b6ed36f20593b2dc17b7c1
hromium/tools/merge_common.py
|
| 46e06376d64605bfae5337fbd2588537c8a1f982 |
18-Dec-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: add eyesfree repository.
Start merging third_party/eyesfree into the Android tree.
Change-Id: If626e333989d55cc482b437dc949a17eed0f57ba
hromium/tools/merge_common.py
|
| f5abbf577ce5deb1ad906a713e23a27d97a2d2f3 |
18-Dec-2012 |
Ben Murdoch <benm@google.com> |
Merge "Pass encoding as charset for data: URLs." into master-chromium
|
| 85b4c793416fb9674ac026fa11389c18a0f8f73e |
14-Dec-2012 |
Mikhail Naganov <mnaganov@google.com> |
Plumb WebSettings.{get|set}LayoutAlgorithm
BUG=6294649
Change-Id: If5b838dfbc8ef31edb4145570c5250c26deefc13
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/tools/run_webview_cts.py
|
| e81c29ecd0a1429b00a86622e86c1184062ff336 |
18-Dec-2012 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Remove unneeded stubs from ContentSettingsAdapter" into master-chromium
|
| 3053d8bc3be48b0cbc6f33e1975c03a10ac303a5 |
30-Nov-2012 |
Jonathan Dixon <joth@google.com> |
Simplify the library load, and prepare for zygote
Depends on https://codereview.chromium.org/11416226
Change-Id: Iefe025d73e22e5540feaddf0e1e0c26680806d31
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| 7f85cf77a1e97aa6816e2ae75c3a5c240050cae1 |
18-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Hook up WebViewClient.doUpdateVisitedHistory" into master-chromium
|
| 59b28f7ffcc57f460e22162ca01eb660b94d3151 |
18-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Fix build - resolve error
Change-Id: Iccc71bbe92acee430febe7a9264b341fe96060be
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| bdc62fb18c751c2149ffa582e6568905f26d608d |
18-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Add workaround for http://b/7697782" into master-chromium
|
| b41273d0be7e2355603c963fd29fdf41ef4699fa |
18-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Wire up CookieManagerAdapter.flushCookieStore" into master-chromium
|
| aadb04e4198e1f0dce390e9434cb189603b8e713 |
17-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Add missing singletons in the WebView Factory
This more or less completes the skeleton implementation of webview chromium.
Change-Id: Id048aaba565a1a8b64988b7b671312afcd924921
hromium/java/com/android/webview/chromium/GeolocationPermissionsAdapter.java
hromium/java/com/android/webview/chromium/WebIconDatabaseAdapter.java
hromium/java/com/android/webview/chromium/WebStorageAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java
|
| c9b9de39c2ff74490e48c4c445cd57541bfb13ca |
17-Dec-2012 |
Kristian Monsen <kristianm@google.com> |
Merge "Adding the frameworks/webview part of GeolocationPermissions" into master-chromium
|
| d9a46d19e7b63bf43999b0e4d2d20d053a581e7d |
17-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Add onScaleChange to WebViewContentsClientAdapter" into master-chromium
|
| e3b7ae477e13bf3d8355767fc301389de77e418d |
07-Dec-2012 |
Mikhail Naganov <mnaganov@google.com> |
Remove unneeded stubs from ContentSettingsAdapter
These getters/setters are empty methods in WebSettings.java,
no need to override.
Change-Id: I12be1c7683d2eb931dd28d8eadd8e9a50b6d09c1
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 1127e126a25f26d7d255c73e19d2e07f1c854781 |
13-Dec-2012 |
Ben Murdoch <benm@google.com> |
Pass encoding as charset for data: URLs.
To maintain backwards compatibility with the legacy WebView,
WebViewChromium should use the |encoding| value passed into the
loadDataWithBaseUrl API to set the charset of the data: URL it loads.
Bug=7379767
Change-Id: I19ace9ca6052f1f94bea6f9a1ece93eccd5da4bb
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| fb1277af94531bf587ebef0d04eebc1e2ce3c116 |
17-Dec-2012 |
Ben Murdoch <benm@google.com> |
Merge "WebChromeClientTest#testWindows is now passing." into master-chromium
|
| 3c4cc4ad5269837048ffabfa3e749a30b6d17e25 |
28-Nov-2012 |
Alan Leung <acleung@google.com> |
Add onScaleChange to WebViewContentsClientAdapter
Change-Id: I42a7d43ba09fb8ae097904f7d606e0ed60f6868a
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 41add43530356824dda62932a8b723c427052146 |
15-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Remove JB branch workarounds" into master-chromium
|
| 2735b74c930c17d39cb6510c0c2c0a43df1d181a |
14-Dec-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: preserve the gyp errors.
We were accidentally throwing away the gyp output when converting the
exception into a TemporaryMergeError; copy the output into the new
exception.
Change-Id: I1e9361000ec14fdeec9c831393655474e97d0d14
hromium/tools/merge_from_chromium.py
|
| c59b3c38490ed42e9d16c3c2617dcbc2a44add7a |
14-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Implement isPrivateBrowsingEnabled" into master-chromium
|
| d2dcef4d9edfb7af7abff85b0867c3d6a363feb7 |
14-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Remove JB branch workarounds
Change-Id: I060a1380e2983f6d279ab31e155483c5262b0cc5
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 6d58f78e7fc0412a58b163559cb8e9c4af5c6fe1 |
14-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Implement isPrivateBrowsingEnabled
Bug: 5012966
Just a trivial getter for webview chromium
Change-Id: Ia63b86b01d1d34bab38d69eb249deca65657d6b6
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 9050d6419e4b8a5b1182054eeed3db32b6f45077 |
12-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Wire up CookieManagerAdapter.flushCookieStore
Bug: 6952852
This is still accessible via CookieSyncManager.sync()
Depends on https://codereview.chromium.org/11553042/
Change-Id: I150b2fdbeaab55bf8bb07d066cb27cdc92d1829f
hromium/java/com/android/webview/chromium/CookieManagerAdapter.java
|
| 5e59ff9ab94d503528ef61ccd1c71adb887b5e01 |
14-Dec-2012 |
Bo Liu <boliu@google.com> |
Hook up WebViewClient.doUpdateVisitedHistory
Also update cts test expectation. testAccessLightTouchEnabled was
removed.
Change-Id: I3585aab66c47e818fd7b1db5d5970246f1f54000
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
hromium/tools/run_webview_cts.py
|
| 50de8bf74a15b4db17dcc0aee998ee3e39013eae |
13-Dec-2012 |
Ben Murdoch <benm@google.com> |
Merge "Wire up WebChromeClient#onRequestFocus" into master-chromium
|
| 7bc1fd3e42c1a731a7891043f0f8ee96be1b598c |
13-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Remove NullWebViewClient.mContext" into master-chromium
|
| fe742c86d6f6e12bd339c9c2efd947d55c910e2d |
13-Dec-2012 |
Bo Liu <boliu@google.com> |
Remove NullWebViewClient.mContext
Change-Id: I1aead0c85523130970e476d243ebb225db6c9f09
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 798497deb835ed2270e3d25143926ad7b7659c25 |
13-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Wire up content intent" into master-chromium
|
| 3e9ca893bb8fb7e0038c04bd04ae78f40233db4f |
12-Dec-2012 |
Bo Liu <boliu@google.com> |
Wire up content intent
WebKitClassic behavior is if client is set, then simply call
WebViewClient.shouldOverrideUrlLoading. If client is not set,
fire the intent directly.
Change-Id: Icdb1c9faa75fd80d0cc6b4e5c724af1ed0406874
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| dbf5fb6a16fdda89f80bc2c4b71bc3cabfa07c37 |
12-Dec-2012 |
Selim Gurun <sgurun@google.com> |
Merge "Implement lighttouchenabled API." into master-chromium
|
| bb0c065b8521a51a13127d917970f5b91205ac40 |
12-Dec-2012 |
Selim Gurun <sgurun@google.com> |
Implement lighttouchenabled API.
Bug: 7683972
The lighttouchenabled API is a no-op in webview classic, therefore
we also provide a no-op implementation.
Change-Id: I7e090c8f00e4e22808a3cd89dc25ac6b6c933715
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 1d7cfad47ef1c2d002ea59f0a78eef4a921af26d |
12-Dec-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge "Don't lose cts run if interrupted" into master-chromium
|
| cba0ba700f5f7da9795ec8de677a4a8930e67524 |
12-Dec-2012 |
Bo Liu <boliu@google.com> |
Don't lose cts run if interrupted
Send INT signal down to the subprocess and exit gracefully
Change-Id: I8a8d52d4d32ee933ba937cf1de1d942d0b4e07bf
hromium/tools/run_webview_cts.py
|
| 862edb04ee66c65ce977d9b14b8809aad40749ac |
12-Dec-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: allow automation to be smarter.
1) Use a branch with the revision number in the name, so that if
something goes wrong we can try again at a later revision without
overwriting the previous branch, in case someone wants to look at it.
2) Split out the code to retrieve LKGR into a separate function that can
be reused, so we don't have to try and do the merge before discovering
there is nothing new.
3) Introduce a new exception, TemporaryMergeError, which specifically
identifies problems that may be fixable by just retrying the merge with
a later revision. Use git reset --hard to clean up broken states when we
are going to raise this.
Change-Id: Ib32a4c211447abeb3daefa5fcc61360e13f704fc
hromium/tools/merge_common.py
hromium/tools/merge_from_chromium.py
|
| d7fde5118cb6e238163c9755ab581b82eea47dba |
12-Dec-2012 |
Ben Murdoch <benm@google.com> |
Wire up WebChromeClient#onRequestFocus
BUG=6295042
Change-Id: I7c96be1c0ef5dbb7e561e147214b98e6b13725d1
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 3411fdf2737f3f0dd0c1fa20045356cf89f34edd |
12-Dec-2012 |
Bo Liu <boliu@google.com> |
onMeasure workaround for failing cts tests
This is in response to crrev.com/172173 which no longer adds a childview
to WebView and we are no longer getting minimum size for free.
WebKit will not run javascript on 0x0 views.
BUG=7380310
Change-Id: I3e91c2b125c8a251fb7aa3a3857bb5a4a545a260
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| f369c63029afd1c5fd846bf3e058f67ef41be0e9 |
11-Dec-2012 |
Ben Murdoch <benm@google.com> |
WebChromeClientTest#testWindows is now passing.
BUG=6295413
Change-Id: I86395a1c882aa204b46db1105f16f2144e1be324
hromium/tools/run_webview_cts.py
|
| 009ed27511c4606dcd16b352489b2d3f70b4b513 |
28-Nov-2012 |
Kristian Monsen <kristianm@google.com> |
Adding the frameworks/webview part of GeolocationPermissions
Change-Id: I3b44ad56951ccb1e43801c513f2ed3b89c01219a
hromium/java/com/android/webview/chromium/GeolocationPermissionsAdapter.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| fab94847d0333e73c12d568f61f1532caba853d6 |
10-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Plumb through long press event" into master-chromium
|
| ebf3772d08779f136eef48c45e8b286b27b21132 |
30-Nov-2012 |
Ben Murdoch <benm@google.com> |
Clean up .pak dependencies.
We now only need to include the webviewchromium paks in
the system image.
Change-Id: Ibfc497e7fda9f4054ba7daa352743556de85296f
hromium/Android.mk
|
| decc147cebc8f73d355c024d92c60d3f727cab31 |
08-Dec-2012 |
Bo Liu <boliu@google.com> |
Plumb through long press event
Change-Id: I7b3351e9588ff1fab3e451e0a93f10c56cd54fa7
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| b5d9eb0196b542499722ffcc8ede41c0eae53516 |
08-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Add workaround for http://b/7697782
Always skip sending system key events to WebKit. This retains compatibility
with WebViewClassic but note this differs from the chrome app, which has a
more focused list in ContentViewClient.shouldOverrideKeyEvent.
BUG: 7697782
Change-Id: I8bcca749f11797a5dfee9132204abf64004040f4
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| ea844f60b1b559788566fe6e004b1eeca53a8039 |
08-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Fix build - addPossiblyUnsafeJavascriptInterface
Signature needed a specific Class<> type passed through
Change-Id: Iccd3093be4500da58eb96006cbe5c4a2e5ecdfef
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 67988f46dfb22493cf36759f44a5ab41c0c66a35 |
08-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Wire up JavascriptInterface annotation" into master-chromium
|
| d24d0bb5a8823918dcab4d40f21a3e49fe2e56e5 |
07-Dec-2012 |
Bo Liu <boliu@google.com> |
webview-tot bot fixes
Call smartsync after envsetup and lunch.
Speculatively turn off clobber and try applying Torne's patch locally
without commit.
Change-Id: I505fa9322959a29c23ba13016596d2795f8d7be7
hromium/tools/buildbot/bb_webview_tot.sh
hromium/tools/buildbot/webview_buildbot_functions.sh
|
| 906c63fedd69124511a31d3b54cabf147e739dbc |
06-Dec-2012 |
Bo Liu <boliu@google.com> |
Improvements for webview-tot bot
Always clobber to avoid bison issue.
Do not need to build cts tests.
Change-Id: Ib5fc85c8ba36d0e4c5b169a88db10d0a7cde1963
hromium/tools/buildbot/webview_buildbot_functions.sh
|
| 151d96785dabd743c5e168c765bd4f13331f0b7f |
05-Dec-2012 |
Siva Chandra <sivachandra@chromium.org> |
Webview ToT buildbot scripts.
Change-Id: Id867301f584430fa2e0a2f97134d7ce612a20426
hromium/tools/buildbot/bb_webview_tot.sh
hromium/tools/buildbot/webview_buildbot_functions.sh
|
| 2a438e9fa259a9d6053b224f924b4b644bb63959 |
27-Nov-2012 |
Kristian Monsen <kristianm@google.com> |
Print unexpected passes/fails before and after stdout
On cmd line it is most useful on the end, for the buildbot in the
beginning, so doing both.
Change-Id: I476d75cd2a7d31b8fd35538bd1ab8303ed8978a4
hromium/tools/run_webview_cts.py
|
| 1583cada17c99a4dea5747c0d34fa47de4bdf900 |
05-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Re-implement setDownloadListener" into master-chromium
|
| b266e67bf5abe52c474de8420f0616a74ed5ff1d |
05-Dec-2012 |
Bo Liu <boliu@google.com> |
Add script for syncing master-chromium repos to tot
Change-Id: I3f3c7986e02ec35f21c084d6997443aa139c5bbf
hromium/tools/sync_chromium_repos.sh
|
| 4320e428efc3bf69387f3b9d5a0589b2b8746409 |
04-Dec-2012 |
Bo Liu <boliu@google.com> |
Re-implement setDownloadListener
Change-Id: Iffef094f82d4f586353450d3caf7322ca3c4ffba
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
hromium/tools/run_webview_cts.py
|
| c0a814a28b62aca8d9055fe67337182f2b8b2b0d |
05-Dec-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge "Add --svn_revision=HEAD to merge from tip of tree" into master-chromium
|
| 012a79d6f21e286f63d3c2f98f305b1ec91b0560 |
27-Nov-2012 |
Mikhail Naganov <mnaganov@google.com> |
Wire up setAppCacheEnabled and setAppCachePath in the glue layer
Update CTS tests status
Change-Id: I82e9d44bc56c0b535c1e94feda4bc368d1cc478c
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/tools/run_webview_cts.py
|
| 9536a5e5660bc0745d1f5f2f6a6468fa53ffa639 |
04-Dec-2012 |
Bo Liu <boliu@google.com> |
Add --svn_revision=HEAD to merge from tip of tree
Change-Id: Ieed83a3be148cb5725d25dd668398cedca27200c
hromium/tools/merge_from_chromium.py
|
| 7db34d3dcaac936566f912e1b0b21f3f103029ff |
05-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Wire up JavascriptInterface annotation
Must be landed in lock step with rolling in https://chromiumcodereview.appspot.com/11308356/
Change-Id: I3ced900b5c8caf9cec00f8ea0b6cbe472ae1204e
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 9603a306419f9c05086fcd8ccac7cc5bb582f75a |
04-Dec-2012 |
Mikhail Naganov <mnaganov@google.com> |
Mark cts.WebViewTest#testGetZoomControls as passing
Passes locally and on the bot.
Change-Id: I3a89f2409291d5dceebc8aaf45880effcae94870
hromium/tools/run_webview_cts.py
|
| ac12a6df0bcf708921aa049836f330f423083c7a |
04-Dec-2012 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Add more plumbing into ContentSettingsAdapter" into master-chromium
|
| fbe84bd523a5a2891d84e62b89f3e7a3091ceccf |
03-Dec-2012 |
Ben Murdoch <benm@google.com> |
Merge "Hook up WebChromeClient.onCloseWindow" into master-chromium
|
| 6083bf7436b99ec8b3826d7da28fc4e9eb450960 |
03-Dec-2012 |
Mikhail Naganov <mnaganov@google.com> |
Add more plumbing into ContentSettingsAdapter
Update CTS tests status.
Change-Id: I660ba756c1596fa25259cf775d792b9a6fdfd09b
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/tools/run_webview_cts.py
|
| e46b6c952a60e1c033df8e40a83d3d877dd61e47 |
03-Dec-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge scripts: support pushing via a temporary branch." into master-chromium
|
| d988b42ca3f28aea23dc968b2f7ed79dae868fc6 |
05-Nov-2012 |
Ben Murdoch <benm@google.com> |
Hook up WebChromeClient.onCloseWindow
Landing without @Override in preparation for:
https://codereview.chromium.org/11418292/
to roll downstream. Once it's rolled we can add
the Override back in.
Change-Id: Ia4eab3913334504829b3abd582fdc71063e4077f
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| bda7cff5dd92725ba000fe95d9434f81a7af486e |
29-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: support pushing via a temporary branch.
Push to a temporary branch first in order that the server has already
got a copy of all our objects when we push to the real branch, in an
effort to reduce skew between repositories. Move Push into a seperate
function also, so that it can be called from other scripts without
needing to duplicate the branch configuration.
Change-Id: I8eec01db5d0e1439e391b185b7250bbc23c3e3e3
hromium/tools/merge_common.py
hromium/tools/merge_from_chromium.py
|
| ffb968aa50f4adb20ce9e9c2ab5ab9c94885cb40 |
03-Dec-2012 |
Ben Murdoch <benm@google.com> |
Merge "onCreateWindow callback plumbing part 2" into master-chromium
|
| 1ee9dd0420198429115c3fe8cf0b0502fab9cf62 |
13-Nov-2012 |
Ben Murdoch <benm@google.com> |
onCreateWindow callback plumbing part 2
Support the "true case" i.e. that the user would like to display
the pop up window and has provided us with a new WebView to do so.
Change-Id: Ib6c6aa4cf88b5942feba9671c0904533cb403b67
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 14eb8f683fbd806e5e02d3e38b4c9e200c21a531 |
01-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Fix settings getter mistake" into master-chromium
|
| 7290b5e6b264a4e4190b890afc2e384bec97c4d9 |
01-Dec-2012 |
Jonathan Dixon <joth@google.com> |
Fix settings getter mistake
Change-Id: I7b4c217589f828d090e28f74f9c559f55c8d5dea
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| d16a7a7a0b743ebc75764dbca92f82f8f7f6b3ed |
30-Nov-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Provide trivial implementation of getZoomControls" into master-chromium
|
| 2c40515299f338409d8bfe3d14a7fe23c56e5104 |
30-Nov-2012 |
Martin Kosiba <mkosiba@google.com> |
Remove testWebHistoryItem from expected failures list.
The test started passing thanks to I196756cbd99e4ef08ed4736740234f750194f355.
Change-Id: Ic7ff4634ba600365505bb34c86ff3d51a13278e5
hromium/tools/run_webview_cts.py
|
| 684596c717508ce6e4d3ecc68c38f42b257c0613 |
30-Nov-2012 |
Martin Kosiba <mkosiba@google.com> |
Mark testBlockNetworkLoads as expected fail.
The test started failing consistently, failure tracked by
crbug.com/163599.
Change-Id: If1521c0b543915f0ca4c99412b73a101ea8afebb
hromium/tools/run_webview_cts.py
|
| e78d6e40e4e78671e6621ba8cf49835568704899 |
30-Nov-2012 |
Jonathan Dixon <joth@google.com> |
Provide trivial implementation of getZoomControls
BUG: 5012841
Change-Id: Ie07c5d45a567d3ce924ed0e8949a78bb411db9f9
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 5d65b76f6747f51bb623d00205aca85581ad4d91 |
29-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: use logging instead of print.
To make it easier to reuse the merge functionality, output using logging
instead of printing to stdout, and configure logging to behave the same
as print normally would by default.
Change-Id: I780675c2fa01640f45e001535158587090f4dff3
hromium/tools/merge_common.py
hromium/tools/merge_from_chromium.py
hromium/tools/merge_to_master.py
|
| 59b88571f67675514569ed5e76a418b817cff2c0 |
28-Nov-2012 |
Martin Kosiba <mkosiba@google.com> |
Add testFlingScroll to failing tests.
Test has been consistently failing. Cause is crbug.com/162967.
Change-Id: Ibf4251d95141c96631c9e0d149726d75bd4aed13
hromium/tools/run_webview_cts.py
|
| 918ba3750a2e67cff705d8cd0d577bd40ba10088 |
27-Nov-2012 |
Martin Kosiba <mkosiba@google.com> |
Update run_webview_cts expectations.
The testSaveAndRestoreState test now passes reliably thanks to
Ia2c996a27c355c8bd7bf4d6479d9026896356c17.
Change-Id: I7d0db2290b58da22c4e5b313e9de1241b4f44329
hromium/tools/run_webview_cts.py
|
| 2d9f16b8677f87aa89d296aac10f359f5f1de2bd |
27-Nov-2012 |
Newton Allen <newt@google.com> |
Remove unused R.java.
R.java has been moved to the chromium repository under
content/public/android/java/resource_map.
BUG: crbug.com/136704
Change-Id: I1eda4b356dee7e0bd64817bf5c849fe66d665cd6
hromium/java/org/chromium/content/R.java
|
| 33d470f7a97be1d96615ccae1e259ad6f9b22cbf |
15-Nov-2012 |
Newton Allen <newt@google.com> |
Remove references to AppResource.
Once http://codereview.chromium.org/11360207/ lands, WebView will be
accessing Java resources via the R classes and we can remove the
obsolete AppResource.
BUG: crbug.com/136704
Change-Id: I9eaeb19f5b07279935e70db9a14b47405cc13954
hromium/java/com/android/webview/chromium/ResourceProvider.java
|
| 859ee06993e78bc89aa7bd4a1acb86ed7164701e |
26-Nov-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Implement save/restoreState glue" into master-chromium
|
| 8d3ebcaf83f29ac8e7417e7444abf366368e5da6 |
26-Nov-2012 |
Martin Kosiba <mkosiba@google.com> |
Merge "Update webview CTS bot expectations." into master-chromium
|
| 9d0b7fb491cf04ab7aa475de5698f21cb70afe16 |
26-Nov-2012 |
Martin Kosiba <mkosiba@google.com> |
Update webview CTS bot expectations.
Rebaseline expectations after moving the bot to the master-chromium
branch.
Change-Id: Ied991ada4715f9b50d644df06e575dbec92d4ab8
hromium/tools/run_webview_cts.py
|
| 3357ec4b3259ea929a5291177d877a1675dcbdb0 |
26-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge "Merge scripts: merge from LKGR by default." into master-chromium
|
| bf49aa66156d16df0c3d3ab4aa03e7cc291fbf1f |
26-Nov-2012 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Plug in {get|set}CacheMode into ContentSettingsAdapter" into master-chromium
|
| 2efbabe43f012ff9c06c78fc19fae49421a4d356 |
23-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: merge from LKGR by default.
Fetch the last known good revision from the Chromium waterfall and use
it as the default revision to merge to. Fix the svn->git revision
conversion to use the earliest match, not the latest, as this is almost
always correct.
Also, rename Snapshot without an underscore as we're going to reuse it.
Change-Id: Idd0c9db40ca6b7212c6bbcca6046bf7b09ff3259
hromium/tools/merge_from_chromium.py
|
| b4b2d8eafdf00e50598aa9305317bd691bd471ad |
23-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: remove url/branch parameters.
If the URL or branch changes it's likely the script will need to be
modified anyway; hardcode it instead of taking it as a parameter. This
makes it easier to reuse the functions in this script from another
script.
Change-Id: If77aca9120ed9f925a67677e232d41684308fa1c
hromium/tools/merge_from_chromium.py
|
| 14ac2c8d49fa1f5f12e6a80af93f1c50312d80a8 |
23-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: implement an unattended mode.
Split pushing into a separate step instead of prompting to do it
immediately, and replace --autopush with an --unattended mode switch
that removes all prompts for user interaction.
Change-Id: Id32789eb36232afce99945e97e83ff772bc1b9cd
hromium/tools/merge_common.py
hromium/tools/merge_from_chromium.py
hromium/tools/merge_to_master.py
|
| 82c98161b9cd8e8f94e00d89b6fd56540473b3d4 |
22-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge scripts: clean up and refactor.
Fix many lint errors, and generally tidy up the scripts and make them
easier to follow.
Change-Id: Ice94798218c6765eb86faea80d787036470efafd
hromium/tools/merge_common.py
hromium/tools/merge_from_chromium.py
hromium/tools/merge_to_master.py
|
| 991723343075cff93de497bceca0d7491e83fc64 |
22-Nov-2012 |
Kristian Monsen <kristianm@google.com> |
Geolocation CTS tests are expected to fail for now
Change-Id: I6244d10f01783f6495bd8e58de67d24b8a5843db
hromium/tools/run_webview_cts.py
|
| a08e8aada16dc4dbfb8745532169fb4a8347541d |
21-Nov-2012 |
Bo Liu <boliu@google.com> |
Implement save/restoreState glue
CTS test expects us to have the optimization of not saving the bundle if
there has been no navigations. Decided to put that check here to make it
easier.
Change-Id: Ia2c996a27c355c8bd7bf4d6479d9026896356c17
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 384c21569884a02e29df4895314c55774b893036 |
21-Nov-2012 |
Jonathan Dixon <joth@google.com> |
Improve CTS script
- remove some tests that no longer exist (obsolete APIs: cachemanager,
setCertificate)
- now define unexpected_passes as any expected failures that no longer
fail. This way, we'll detect any deleted tests again in futre.
Change-Id: I1fe5786a8d0c456a5c7b7c136c723451922c7f84
hromium/tools/run_webview_cts.py
|
| 370ae13a65200b20f669e2b588fbe9dd3e5380d3 |
21-Nov-2012 |
Jonathan Dixon <joth@google.com> |
Add a script for running the CTS tests
Useful in the medium term, this script filters out known failing
tests on the chromium webview. Overtime we'll drive this exception
list down to zero.
Change-Id: Id4b5d97eb24116073a570484c95b006f9abf4780
hromium/tools/run_webview_cts.py
|
| c9e6245b3f3b6ac5e37cade2bfcda265eaa3e9e2 |
21-Nov-2012 |
Mikhail Naganov <mnaganov@google.com> |
Plug in {get|set}CacheMode into ContentSettingsAdapter
BUG=6294798
Change-Id: Ifc5bd3f6d21dbec67e7bf43d8744268a14778758
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 4c41d0c5e4434c0cd0f05f03f71101ea90626b22 |
21-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Disable building webviewchromium on Mac for now.
We need separate gyp-generated makefiles, or a better solution, to be
able to build on Mac. Disable it unless HOST_OS is linux for now.
Change-Id: I5e57f9886ecbe61aa36178804a8e54e84b5e069a
ndroid.mk
|
| 08a5e00cdfb74f4ffd843d2d0a9b0b40b86b107a |
21-Nov-2012 |
Bo Liu <boliu@google.com> |
Add glue for copyBackForwardList
The code has been implemented in ContentViewCore for awhile now.
And new cts test passes with this.
Change-Id: Ia3512d06e20d03b4e2739664ee10f5860c33e921
hromium/java/com/android/webview/chromium/WebBackForwardListChromium.java
hromium/java/com/android/webview/chromium/WebHistoryItemChromium.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 5568eda06be15d573395eaba779d62c09f6f96f1 |
19-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Update merge script for multi-arch.
We're going to have different makefiles for different target
architectures. Update the merge script to reflect this. Invoke the
existing gyp_webview script rather than duplicating its logic here.
Change-Id: I5451c6df16d1180f37f76b4c1d779e2c64a72e45
hromium/tools/merge_from_chromium.py
|
| c9186f5e3b65712be75540a1277f612640135022 |
19-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge more glue layer changes into master-chromium.
Change-Id: I431cfc1cac2698914f712e08625b45647a40c8da
|
| 83114b14dac747eb6b34679763bab4cfe7e3413e |
16-Nov-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Plumb through more methods to AwContents" into master-chromium-dev
|
| 9e0f582fa54ecd2116daeac8e9b38643f7cf59e1 |
16-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge latest glue layer changes into master-chromium.
The latest snapshot needs these changes to work.
Change-Id: I124d067d9801436773f00fcfea8ec091e059c200
|
| 994b888d1fa75dc62853245a6d06158c02c7f4ab |
16-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Only build webviewchromium on ARM for now.
There are build system issues with x86 that need to be resolved; until
everything is fixed, only depend on and load the makefiles for
webviewchromium on ARM platforms.
Change-Id: Ibd246c14b405a9a91137043e19baddfe05eb0467
ndroid.mk
|
| cadf645507c329e0f5d7fbb67d9311cfa26ac638 |
16-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Update merge with new repos/license info.
1) Add smhasher repository back to the merge list as it's used by the
latest version of ANGLE.
2) Known-incompatible license list has moved to "known_issues" module.
Change-Id: I3c955d1f93244cc8e7ca636a270eb8c4c91a6c5b
hromium/tools/merge_common.py
hromium/tools/merge_from_chromium.py
|
| 1cc4c3210fd2ea027bd6d883a15c3951476642bb |
14-Nov-2012 |
Jonathan Dixon <joth@google.com> |
Plumb through more methods to AwContents
Depends onhttps://codereview.chromium.org/11365248
Change-Id: I95e09297ef2811cead21e541f27266d767b7d1b9
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| e82b66d0da05c71c1953a891c3b9e80acf9339a6 |
15-Nov-2012 |
Ben Murdoch <benm@google.com> |
Merge "Supplement AppResource with a manually maintained R.java." into master-chromium-dev
|
| 317070273e8a9f5c513815f09133608079227c25 |
14-Nov-2012 |
Newton Allen <newt@google.com> |
Supplement AppResource with a manually maintained R.java.
This prepares webview for the imminent change in Chromium to start referencing
resources via the R class instead of through AppResource:
http://codereview.chromium.org/11360207/
BUG: crbug.com/136704
Change-Id: Ibbf01f47c692338fb19a35927a431998c4db624b
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/java/org/chromium/content/R.java
|
| 03679fc5e0d499f28722e35c23ca2de22d807d6c |
15-Nov-2012 |
Ben Murdoch <benm@google.com> |
Merge "Plumb WebChromeClient.onCreateWindow callback through glue." into master-chromium-dev
|
| 0a0259ff81b6a18766473d72feeb82dba3a35093 |
15-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Fix "Plumb through the glue layer functor to AwContents".
The merge resulted in LOCAL_REQUIRED_MODULES being set twice,
overwriting the previous copy and causing the code not to actually be
built in a normal build, and masking that the include path was wrong.
Fix both issues so it's built correctly.
Change-Id: I98b5e302c8747c48f1de0b39e5cf30ac2ef013e7
hromium/Android.mk
|
| 26fd0b8486e397b5d55796d0c4458df766614e32 |
14-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge "Plumb through the glue layer functor to AwContents" to master-chromium
|
| 5df69cc93257f8b26bbf32e4cc97265e7b38f392 |
14-Nov-2012 |
Jonathan Dixon <joth@google.com> |
Merge "Add input event glue implementation." into master-chromium-dev
|
| a05566067d5a010130b0b1aa36eb0d7b3f73e122 |
23-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Add webviewchromium as a dependency of webview.
For now we want to include both the classic and chromium-powered
webviews in the rom, so depend on both here. We also need to include
the makefiles in the subdirectories of frameworks/webview, and have
the webviewchromium module pull in the native code and resources from
external/chromium_org.
Change-Id: Iebf83ad86de6204143336f1977c88bf7d487dbae
ndroid.mk
hromium/Android.mk
|
| c3fbc0fea57ba0dd4cf9eb8cc4d12f1b0edbcc5c |
12-Nov-2012 |
Bo Liu <boliu@google.com> |
Add input event glue implementation.
Change-Id: Ic2807fb3de100314f84f9271ee95f37c61b2cb72
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| a2b0d0b4d6d1ff22fbb1329e358e1cc0a112aab3 |
12-Nov-2012 |
Jonathan Dixon <joth@google.com> |
Plumb through the glue layer functor to AwContents
Adds new glue-layer .so and code to load it from Java.
Depends on upstream patch https://codereview.chromium.org/11358118/
Together these changes provide all the plumbing needed to get GL
functor calls through to the chromium backend.
Change-Id: I1899d59ab6f13de6d9fb07147d36b08504ef955e
hromium/Android.mk
hromium/java/com/android/webview/chromium/DrawGLFunctor.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/plat_support/draw_gl_functor.cpp
hromium/plat_support/jni_entry_point.cpp
|
| ab4e30ad8e4335f01462af9bac7fbf40e75c5afd |
12-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Add third_party/v8-i18n as a repository to merge.
Change-Id: Ie23d04552de8a8315b027dcfa545cb79bca4f6a0
hromium/tools/merge_common.py
|
| 9b5e2bd7d0951a560aa848ff5e74b45560fee045 |
08-Nov-2012 |
Ben Murdoch <benm@google.com> |
Plumb WebChromeClient.onCreateWindow callback through glue.
For now, we only allow the embedder to return false from this
callback, i.e. the popup should be blocked.
Change-Id: I513e2fee6063cbbef1ceeee448410140ac553638
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 33e5c69dc781743cc2560bef57763170b61bae3f |
06-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Implement merge-to-master tool.
Create a tool that can merge from master-chromium to master, flattening
the history of chromium and webkit in the process (and removing layout
tests). The merge parents are recorded in a file in order that they can
be grafted back in for future merges.
Change-Id: I4a2df3de3a017794b7a25f5703cb1343a488b021
hromium/tools/merge_common.py
hromium/tools/merge_to_master.py
|
| 1c263f2b522bcb9159547d14f9f57abac46967c7 |
30-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge tool: refactor reusable code.
The merge-to-master tool will need to reuse some of the code in the
merge-from-chromium tool. Refactor it into a separate module. No
functional changes.
The tool has also been renamed to merge_from_chromium as underscores are
the convention for python module names.
Change-Id: I87a4b4def579364c51b3b03ad993a66d33fdd7ea
hromium/tools/merge-from-chromium.py
hromium/tools/merge_common.py
hromium/tools/merge_from_chromium.py
|
| 3949435b480cb71106f65b237025da359cf8a8ca |
06-Nov-2012 |
Ben Murdoch <benm@google.com> |
Remove ContentViewCore from WebViewChromium.
AwContents now owns the ContentViewCore instance.
Change-Id: Id57c4ed4a0c7026a61380b9f987d4d427d8e504e
hromium/java/com/android/webview/chromium/WebViewChromium.java
|
| 77a1992a81c32c8f04a2528c7333efb9647aa59c |
01-Nov-2012 |
Ben Murdoch <benm@google.com> |
Merge "Plumb WebSettings.[set]supportMultipleWindows." into master-chromium
|
| a136fa49c1f49a35e9a7caf886e70f5dc41cda91 |
01-Nov-2012 |
Ben Murdoch <benm@google.com> |
Plumb WebSettings.[set]supportMultipleWindows.
Bug: 7262225
Change-Id: Ia229179ea8edb97d938e683d29285ef265e0711c
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 345e0d54e2327cf8cc37f7729563c9af69d55519 |
01-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge "Create a phony "webview" module" into master-chromium
Change-Id: I5a2da838a061a497eeacac4aafd2d57d1ab394e4
|
| 68f3ce2aabdf9e8249dc031c4d4586af85c4be55 |
31-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Create a phony "webview" module.
Add a "webview" module which can be used to depend on the components of
the appropriate system WebView implementation without other modules
needing to know which that is. For now, just depend on libwebcore; the
Java code for the classic WebView is currently part of the framework.
Change-Id: I9b4adabdeeeb8f710a8278953f06d7f9cf9acc19
ndroid.mk
|
| 0c8d3ec97b4fe24bd2fd7fca4b49a5d30e832d3e |
31-Oct-2012 |
Ben Murdoch <benm@google.com> |
Merge "Plumb through WebSettings.get/setJavaScriptCanOpenWindowsAutomatically" into master-chromium
|
| 11d3f99ef2bccfa1118daddc2ab5606cb2709804 |
31-Oct-2012 |
Ben Murdoch <benm@google.com> |
Plumb through WebSettings.get/setJavaScriptCanOpenWindowsAutomatically
BUG=7262225
Change-Id: I6d659ab7890d8180003d809657a84e0096f05874
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
|
| 26a4518132c2f6fa6dac597fbd10299bad02660d |
29-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Remove chromium projects not needed to build webview.
The list of projects required to build WebView has reduced since the
initial snapshot; remove the ones not used for now. They can always be
readded later if necessary.
Change-Id: I6a3889ed42ec91dcd1a9bb519ab7b968ee493159
hromium/tools/merge-from-chromium.py
|
| 251a1c8d0a987b0df24e19904d0c0ef492304286 |
25-Oct-2012 |
Bo Liu <boliu@google.com> |
onFormResubmission glue implementation
Change-Id: Ie388329c85823dc4ed573f5a1653886eb77393f1
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
|
| 07558846b24fa05387b7f5d545d446b853c87437 |
25-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Fix merge tool to not depend on its own location.
Use ANDROID_BUILD_TOP to find the chromium_org directory (since we
require it to be set to generate makefiles anyway) instead of using a
path relative to the script itself (which was broken since the script
moved from tools to chromium/tools).
Change-Id: I25df9ad3d04756b50931d99c03bc1088baa41c1b
hromium/tools/merge-from-chromium.py
|
| 46f104289826e85ba76a1a2139d7ecc7daca07b1 |
23-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Add initial version of webviewchromium glue layer.
Import the webviewchromium glue layer from the internal forked branch
where it was developed.
Change-Id: I685af58b50fc53a3e17f4506b2f8e830370c7840
hromium/Android.mk
hromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
hromium/java/com/android/webview/chromium/CookieManagerAdapter.java
hromium/java/com/android/webview/chromium/ResourceProvider.java
hromium/java/com/android/webview/chromium/UnimplementedWebViewApi.java
hromium/java/com/android/webview/chromium/WebViewChromium.java
hromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
hromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
hromium/tools/merge-from-chromium.py
ools/merge-from-chromium.py
|
| 1896d5d734a45c412f47fe58816665d374617d3b |
22-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Make the merge tool push the result of the merge.
If the merge succeeds, the tool will prompt to push it to the server.
The prompt can be bypassed with --autopush for use in a script.
Change-Id: I4fd6a46c6055f92d383816112ff1b9ef4c3ff66f
ools/merge-from-chromium.py
|
| b21ae87163ed9c0580363b65aa7bac1ff1b0f41e |
18-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Make the merge tool handle "UA" conflicts.
This conflict type happens when upstream renames a file we deleted for
licensing reasons. Allow the file to be re-added in case it was renamed
to a path we don't delete; it will be deleted again in the next step if
it's still in a directory we delete.
Also, simplify the existing conflict resolution code; findall returns a
string if there's only one match group, but a tuple if there's more than
one.
Change-Id: I3b55b6549b746e9e530977d99ad541e0eac096e0
ools/merge-from-chromium.py
|
| 8720718313473184ad1e64c7df67766c44353396 |
16-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Update merge tool to new cacheinvalidation repo.
Replace the old cacheinvalidation repository path with the new one.
Also, fix the error message for when a project is not found to refer to
the new name of the script.
Change-Id: I8cc43cbedc537c2a5c5b51c60d1d463f592000e3
ools/merge-from-chromium.py
|
| e9d946910fc23e839e0ba89df0a59cdcd1aac8dd |
09-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Update LASTCHANGE during merge.
Chromium expects build/util/LASTCHANGE to contain the current SVN
revision and won't build without it. Create/update this during the
merge.
Change-Id: If25219359a010ee6c0adbb064103102a8a2dca92
ools/merge-from-chromium.py
|
| c7fa5294b03fbc8ccab655d87faaa6d6d704018e |
09-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Avoid littering source tree with .pyc files.
Set sys.dont_write_bytecode before importing modules from inside the
source tree, to avoid polluting it with .pyc files. Also, export
PYTHONDONTWRITEBYTECODE when running gyp in order that gyp and grit
don't create .pyc files either.
Change-Id: I4a02238009edc31bdfb168df42369f6e98354bb4
ools/merge-from-chromium.py
|
| 3c67328c9fd2fd48405af3950e59893bfdf1287b |
09-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Add ICU to the list of projects to merge.
ICU contains some code under an incompatible license so this also
requires changes to the way that incompatible license processing works.
The Chromium upstream known_incompatible has already been updated to
group the incompatible directories by repository, the matching change to
the tool is here.
ools/merge-from-chromium.py
|
| 9df6a6c4638cfab15aa303682c15050a9509eb44 |
08-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Rewrite snapshot tool to do separate merges.
Instead of merging all the code into a single repository with subtree
merges, merge them into separate repositories. The tool has been renamed
to make it clearer what it's doing (it's not really taking a snapshot as
history is preserved).
Change-Id: I02a2b5148da887e852915f4887915e60f9caacf8
ools/merge-from-chromium.py
ools/snapshot.py
|
| bc79ddac4a295ce4616fbbc574f9c53702f1e02c |
08-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Bring old snapshot tool up to date.
1) Remove several projects from the list of projects to merge as we
don't need them and they have licenses we don't want.
2) Add support for snapshotting from a branch other than "master"
upstream (to avoid bringing in the git submodule commits), and switch
the upstream URL to use the right repo.
3) Fix a bug where the script would fail if there was no incompatibly
licensed code to remove.
Change-Id: I6a9b9ee0f80a2fe5551878c8eab0b11e064dd3b0
ools/snapshot.py
|
| 6a8c82cdaffde31477cacabea89afefeded67f3e |
08-Oct-2012 |
Torne (Richard Coles) <torne@google.com> |
Add the old version of the snapshot tool.
For comparison purposes, add the "final" version of the old snapshot
tool to this repository. It was previously in external/chromium_org.
Change-Id: Id9063d22ce7507b01f44dd7a37b31fbdcd25ef66
ools/snapshot.py
|
| be87311f6b6f9e29d458a3c5934931dd54dbceea |
11-Jul-2012 |
Chad Jones <chadj@google.com> |
Initial empty repository
|