aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-26Snap for 4417144 from d9a36316eca79044af90373ef09d413889d0a936 to oc-m2-releaseandroid-8.1.0_r8android-8.1.0_r46android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseandroid-build-team Robot
Change-Id: I5d0359f72aac1076be482dd581ecac63ad6be4af
2017-10-23Snap for 4411005 from 6446b6fbd06718010e3b4e13c8892a446d087307 to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1oreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-releaseandroid-build-team Robot
Change-Id: I36db7da4173040ae7e136e4e45d8ceb66e528d9a
2017-10-20Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: ↵Leon Scroggins III
0d09a40b6a am: a1f20ba1d7 am: fb0b2597d9 am: 1d27d6ff05 am: fd1c60371b am: 4db4fdafc2 am: c9d0c5c1d2 am: 30c72f3cd2 -s ours am: f1a065d96e am: 5929bcbdc6 Change-Id: I949043d6ede5192eb91488c82242f01213f9414e
2017-10-20Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: ↵Leon Scroggins III
0d09a40b6a am: a1f20ba1d7 am: fb0b2597d9 am: 1d27d6ff05 am: fd1c60371b am: 4db4fdafc2 am: c9d0c5c1d2 am: 30c72f3cd2 -s ours am: f1a065d96e Change-Id: Id8715bff80c91139e63f0006649763984dffc378
2017-10-20Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: ↵Leon Scroggins III
0d09a40b6a am: a1f20ba1d7 am: fb0b2597d9 am: 1d27d6ff05 am: fd1c60371b am: 4db4fdafc2 am: c9d0c5c1d2 am: 30c72f3cd2 -s ours Change-Id: I4417af1444ab0193cf3c6ff461abe2740a8dca62
2017-10-18Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: ↵Leon Scroggins III
0d09a40b6a am: a1f20ba1d7 am: fb0b2597d9 am: 1d27d6ff05 am: fd1c60371b am: 4db4fdafc2 am: c9d0c5c1d2 Change-Id: Iafa0f10a10a42dc5264d35359eed8db18d33484d
2017-10-18Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: ↵Leon Scroggins III
0d09a40b6a am: a1f20ba1d7 am: fb0b2597d9 am: 1d27d6ff05 am: fd1c60371b am: 4db4fdafc2 Change-Id: Ic876c074479f5e8be7bbc202d1d41aaf9cabec21
2017-10-18Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: ↵Leon Scroggins III
0d09a40b6a am: a1f20ba1d7 am: fb0b2597d9 am: 1d27d6ff05 am: fd1c60371b Change-Id: I28ebfd25d654447fe93bac3bc7c68b4370662e7d
2017-10-18Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: ↵Leon Scroggins III
0d09a40b6a am: a1f20ba1d7 am: fb0b2597d9 am: 1d27d6ff05 Change-Id: Ia034f7692c47c623c657d104a4fd71eff9af39df
2017-10-18Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: ↵Leon Scroggins III
0d09a40b6a am: a1f20ba1d7 am: fb0b2597d9 Change-Id: Ie0181434479926b9056fde6c81b2bed5305f7ec6
2017-10-18Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: 0d09a40b6aLeon Scroggins III
am: a1f20ba1d7 Change-Id: I1dbd389ea31d32132f60fde00c1aca768b3f2df7
2017-10-18Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39bLeon Scroggins III
am: 0d09a40b6a Change-Id: Ib718972009c33ef3a13b31b626e6b853f2ed5c13
2017-10-18Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79Leon Scroggins III
am: 9494cea39b Change-Id: If143b95ff7890eb2bcbd7cae3013d1e1c0f8de83
2017-10-18Update OWNERS file am: bf1fbbd9c4Leon Scroggins III
am: 71c7507b79 Change-Id: I0003248dff385cdcef25817fa1b024fdd0a5f248
2017-10-11Snap for 4386615 from f19789dedc022c9802ea9ab95fe2ca4197e91912 to oc-m2-releaseandroid-build-team Robot
Change-Id: Icf3eccc0a58c8a2a45ddd6588fab6ef4c0714484
2017-10-10Update OWNERS fileLeon Scroggins III
am: bf1fbbd9c4 Change-Id: Ic969fa809e1755786ad493ee210e9acfba565e11
2017-10-10Snap for 4386596 from 67bdaa3a1f209b4fd959eddf6ccb5fad901e9ff2 to oc-mr1-releaseandroid-build-team Robot
Change-Id: I5dad081106ec22b0cb9c2f3086fcda8b78b86992
2017-10-09Snap for 4384531 from 785d138cf45e08e6395d5f25066816018deddce1 to oc-m2-releaseandroid-build-team Robot
Change-Id: I5ecc5dbc9743b087ee63a51f7a5e2d7e98d0b414
2017-10-09Roll external/skia 81e7bf8d6..8c19238a0 (2 commits)oreo-mr1-devSkia_Android Canary Bot
https://skia.googlesource.com/skia.git/+log/81e7bf8d6..8c19238a0 2017-10-06 reed@google.com experiments to speed up drawing 32bit images into 565 2017-10-03 scroggo@google.com Bring android/o-mr1-release up to date for HEIF Test: Presubmit checks in addition to passing all Skia test suites Bug: 64884885 Merged-In: I4a4ab16de50d1ceb1ad87126590d6ef5a884e718 Change-Id: Id7d5a9e889771a9db3112e847439e395ae4aa614
2017-10-08Snap for 4383937 from 65c46d9d47eae252e82d7fdd9c13f96fab31a67c to oc-mr1-releaseandroid-build-team Robot
Change-Id: Ic6c4ecedf45f2437b4b7cd86c99f1842fff8c9b8
2017-10-06Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9 am: 28a8f8e12c am: ↵Ben Wagner
2ff10d6a89 am: 9bd331095e am: e478757dd9 -s ours am: ab6d7ef311 -s ours am: 11fe1fb713 -s ours Change-Id: I2e982e72d1623ea3cc1ff46703ca40d918730920
2017-10-06Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9 am: 28a8f8e12c am: ↵Ben Wagner
2ff10d6a89 am: 9bd331095e am: e478757dd9 -s ours am: ab6d7ef311 -s ours Change-Id: Ib9b6573cf9498032fce202cfd0bfb317a0d9f77d
2017-10-06Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9 am: 28a8f8e12c am: ↵Ben Wagner
2ff10d6a89 am: 9bd331095e am: e478757dd9 -s ours Change-Id: Ifda6ab4bac89e45e73d44ebc33560c9b5faab44b
2017-10-06Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9 am: 28a8f8e12c am: ↵Ben Wagner
2ff10d6a89 am: 9bd331095e Change-Id: Ide70e11180d8a3b2ada54cfc57e9c5d9f1b187ab
2017-10-06experiments to speed up drawing 32bit images into 565Mike Reed
New (legacy style) blitters only coded for shaders (and very restricted blendmodes) (cherry picked from commit ef8ce2858b7692c9ec9874c43656e603f304c760) Bug: skia: Change-Id: Id57ee84f1c1028b79c7ccca8919480c68ac4b9c6 Reviewed-on: https://skia-review.googlesource.com/56400 Commit-Queue: Derek Sollenberger <djsollen@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com>
2017-10-06Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9 am: 28a8f8e12cBen Wagner
am: 2ff10d6a89 Change-Id: Iae1726aad8fe70110f11e1c25c82c5d6a97bcfa1
2017-10-06Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9Ben Wagner
am: 28a8f8e12c Change-Id: I14a70513d71d672203ed59aa8998317333ce736e
2017-10-06Merge "Fix SkFILEStream." into nyc-devBen Wagner
am: 3d8955c7c9 Change-Id: I64659cde8afb40dead7b7c09787df1ddef7697b6
2017-10-06Merge "Fix SkFILEStream." into nyc-devTreeHugger Robot
2017-10-06Update OWNERS fileLeon Scroggins III
Bug: 33166666 Bug: skia:6285 Test: None - this does not affect build. Switch the OWNERS to the people who actually manage this project. This matches the list (minus msarett@, who has left the project) the change in https://android-review.googlesource.com/#/c/platform/external/skia/+/343868/. Change-Id: I75e17fef2578620ee994a344e1d56dfaf5dc65c6 Exempt-From-Owner-Approval: This updates to the proper OWNERS
2017-10-06Fix truncated webp images DO NOT MERGE am: 99740b3bb9 am: ffc7e57387 am: ↵Leon Scroggins III
088c6aa773 am: 7d6c1b72f9 am: adb636be66 -s ours am: 0e6b313ed4 -s ours am: 4ffe0266bd -s ours Change-Id: I93a48cb6a54811535d2e073eadcc3901eebbf785
2017-10-06Fix truncated webp images DO NOT MERGE am: 99740b3bb9 am: ffc7e57387 am: ↵Leon Scroggins III
088c6aa773 am: 7d6c1b72f9 am: adb636be66 -s ours am: 0e6b313ed4 -s ours Change-Id: Ib9d9b8170cb4cda1ca56bbaf7b9e47ebbed3d060
2017-10-06Fix truncated webp images DO NOT MERGE am: 99740b3bb9 am: ffc7e57387 am: ↵Leon Scroggins III
088c6aa773 am: 7d6c1b72f9 am: adb636be66 -s ours Change-Id: I41da828ee44a820a2238f36d771b91d468497029
2017-10-06Fix truncated webp images DO NOT MERGE am: 99740b3bb9 am: ffc7e57387 am: ↵Leon Scroggins III
088c6aa773 am: 7d6c1b72f9 Change-Id: Ic4ee17445756cf9a75a1e9995656d3c4dc32458d
2017-10-06Fix truncated webp images DO NOT MERGE am: 99740b3bb9 am: ffc7e57387Leon Scroggins III
am: 088c6aa773 Change-Id: Id74637b1d1ca09ec9c0c1c658f70db9567581d5b
2017-10-06Fix truncated webp images DO NOT MERGE am: 1d57f616c6 -s ours am: ↵Leon Scroggins III
fa7322ed72 -s ours am: e585544227 -s ours Change-Id: I7c754c7715064d62c64255ab05466e3df2241261
2017-10-06Fix truncated webp images DO NOT MERGE am: 99740b3bb9Leon Scroggins III
am: ffc7e57387 Change-Id: I189f273c58239a2ef55f6f5cb145b8f386dfbc26
2017-10-06Fix truncated webp images DO NOT MERGE am: 1d57f616c6 -s oursLeon Scroggins III
am: fa7322ed72 -s ours Change-Id: I6e7aeeded6bece144cf9a881211263c3b1d2d4a8
2017-10-06Fix truncated webp images DO NOT MERGELeon Scroggins III
am: 99740b3bb9 Change-Id: Ieeb5f8a69c42db29e3cd3abcffa575055647a958
2017-10-06Fix truncated webp images DO NOT MERGELeon Scroggins III
am: 1d57f616c6 -s ours Change-Id: Ibd927311304da1641fc781cfd060e5764f1a7a64
2017-10-06Fix SkFILEStream.Ben Wagner
Cherry-picked from upstream Skia: 4d1955c43aaab045511b74a495dfbea4ef0057c5 Differences: - include <memory> instead of <memory.h>, to compile. - re-include "SkString.h", so we don't have to fix downstream clients that do not IWYU. - Stop building SkRTConf and its test. SkRTConf uses code that this patch deletes in SkOSFile. SkRTConf itself is deleted in upstream's 4e44efe50474d4eebcb30b762e784b3ef2126750. For simplicity in cherry-picking further back this CL does not delete the code, but simply disables it by not building it. (It is only used if SK_DEVELOPER is defined anyway, which is not the case on Android.) Bug: 65646012 Bug: 65426286 Test: I863385d797d7a6c54e37904b4f023ff694e01785 (Original) Change-Id: I8c66e4e3e857227aed3d0bc497982f4c0d96d917 Merged-In: I220ec2e2e83f4a002846e89dce855ed5926ca4a1 Merged-In: Ia36e16282eaf294709ce41f57a0f40fe887c1546 Merged-In: Ief1b80a012affeda2068b70405ab1a9f08b36867 Reviewed-on: https://skia-review.googlesource.com/9498 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Conflicts: include/core/SkStream.h src/core/SkStream.cpp src/pdf/SkPDFConvertType1FontStream.cpp src/ports/SkImageEncoder_WIC.cpp src/utils/SkShadowUtils.cpp Change-Id: Ib7aaf367f68f8764147887d858f65ee14fa7a1d9 Exempt-From-Owner-Approval: I should be an OWNER
2017-10-06Fix truncated webp images DO NOT MERGELeon Scroggins III
Bug: b/65290323 Test: ag/2974889 Merged-In: Ib6f385766d6d46ed7fe56188cae5a71b100102bd Merged-In: I0cba5ab639f1e66b7c493a9f63735a0f5edbcfbf Change-Id: I0cba5ab639f1e66b7c493a9f63735a0f5edbcfbf Original message description: ======================================================================== If a webp file is truncated such that no rows can be decoded, WebPIDecGetRGB does not initialize its "last_y" parameter. We use rowsDecoded (passed as last_y) to determine which remaining rows to fill. Check the return value of WebPIDecGetRGB. If it fails (returns null), or rowsDecoded is <= 0 (matching Chromium's check), return kInvalidInput, since there is nothing to draw. Note that this is a change in behavior for Android. Previously we would decode an empty webp to just a transparent/black rectangle, whereas now we simply fail. I think this is a change for the better. Add a test which truncates a file to have 0 rows available and attempts to decode it. msan verifies that we no longer depend on the uninitialized value. Stop attempting to test decoding subsets from an incomplete webp (in CodecTest.cpp). Unless we have decoded the portion covered by the subset, this will fail. Remove test images inc0.webp (from both dm/ and colorspace/) and inc1.webp. These just decode to transparent rectangles. Replace them with inc2.webp and inc3.webp, which decode part of the image and then have to fill with transparent. Change-Id: I64d40be91c574b45963f9a43d8dd8f4929dd2939 Reviewed-on: https://skia-review.googlesource.com/50303 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: James Zern <jzern@google.com> ======================================================================== For simplicity, this does not update VERSION or tasks.json, as does the original CL. It also does not include the test, which relied on more recent changes. Change-Id: I972d457c5c371cd082b4f025a484512fa2b80334 Exempt-From-Owner-Approval: I should be an owner.
2017-10-06Fix truncated webp images DO NOT MERGELeon Scroggins III
Bug: b/65290323 Test: ag/2974889 Merged-In: Ib6f385766d6d46ed7fe56188cae5a71b100102bd Merged-In: I0cba5ab639f1e66b7c493a9f63735a0f5edbcfbf Change-Id: I0cba5ab639f1e66b7c493a9f63735a0f5edbcfbf Original message description: ======================================================================== If a webp file is truncated such that no rows can be decoded, WebPIDecGetRGB does not initialize its "last_y" parameter. We use rowsDecoded (passed as last_y) to determine which remaining rows to fill. Check the return value of WebPIDecGetRGB. If it fails (returns null), or rowsDecoded is <= 0 (matching Chromium's check), return kInvalidInput, since there is nothing to draw. Note that this is a change in behavior for Android. Previously we would decode an empty webp to just a transparent/black rectangle, whereas now we simply fail. I think this is a change for the better. Add a test which truncates a file to have 0 rows available and attempts to decode it. msan verifies that we no longer depend on the uninitialized value. Stop attempting to test decoding subsets from an incomplete webp (in CodecTest.cpp). Unless we have decoded the portion covered by the subset, this will fail. Remove test images inc0.webp (from both dm/ and colorspace/) and inc1.webp. These just decode to transparent rectangles. Replace them with inc2.webp and inc3.webp, which decode part of the image and then have to fill with transparent. Change-Id: I64d40be91c574b45963f9a43d8dd8f4929dd2939 Reviewed-on: https://skia-review.googlesource.com/50303 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: James Zern <jzern@google.com> ======================================================================== For simplicity, this does not update VERSION or tasks.json, as does the original CL. It also does not include the test, which relied on more recent changes. Exempt-From-Owner-Approval: I should be an OWNER.
2017-10-06Snap for 4380782 from 724e4c749ff8be13389a8578dea940924a5148c9 to oc-mr1-releaseandroid-build-team Robot
Change-Id: Idcb3c876b37a7a6df1059ce29826cc762575ef3c
2017-10-05Fix truncated webp images am: 7a3ba537f7Leon Scroggins III
am: 6dc9d3e388 Change-Id: Iee519c63c1c7d7555befec8acf9464b7743328e3
2017-10-05Fix truncated webp imagesLeon Scroggins III
am: 7a3ba537f7 Change-Id: I015d2904c37c824fd201c05cc589690353d1568b
2017-10-03Bring android/o-mr1-release up to date for HEIFLeon Scroggins III
Bug: b/65262488 This cherry-picks 3 commits: ======================================================================== skia: add heif decoding support -- DO NOT MERGE Cherry-picked from https://skia-review.googlesource.com/c/35701 in skia. Change-Id: Id9cbe6a463384ce6a0b57a32a4ba881968fe32bb ======================================================================== Initialize the swizzler if there is a subset -- DO NOT MERGE Reviewed-on: https://skia-review.googlesource.com/37680 Change-Id: Ic6bef3f63bcda24fc3d88ce0cdcf1216441faa40 ======================================================================== Use kIgnore blend behavior when encoding JPEG Cherry-pick from upstream bb3dc768fd57956feb3947991011052b034dcb7a This looks to have been an oversight - encoding PNG and WEBP both use kIgnore when called through this interface. No-Tree-Checks: true No-Try: true No-Presubmit: true Change-Id: I23ba02f979210087808ee2da026a2ca0269e0fb4 Reviewed-On: https://skia-review.googlesource.com/43261 Reviewed-By: Brian Osman <brianosman@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-on: https://skia-review.googlesource.com/53902 Reviewed-by: Derek Sollenberger <djsollen@google.com>
2017-10-02Fix truncated webp imagesLeon Scroggins III
Bug: b/65290323 Test: ag/2974111 Merged-In: Ib6f385766d6d46ed7fe56188cae5a71b100102bd Change-Id: I0cba5ab639f1e66b7c493a9f63735a0f5edbcfbf Original message description: ======================================================================== If a webp file is truncated such that no rows can be decoded, WebPIDecGetRGB does not initialize its "last_y" parameter. We use rowsDecoded (passed as last_y) to determine which remaining rows to fill. Check the return value of WebPIDecGetRGB. If it fails (returns null), or rowsDecoded is <= 0 (matching Chromium's check), return kInvalidInput, since there is nothing to draw. Note that this is a change in behavior for Android. Previously we would decode an empty webp to just a transparent/black rectangle, whereas now we simply fail. I think this is a change for the better. Add a test which truncates a file to have 0 rows available and attempts to decode it. msan verifies that we no longer depend on the uninitialized value. Stop attempting to test decoding subsets from an incomplete webp (in CodecTest.cpp). Unless we have decoded the portion covered by the subset, this will fail. Remove test images inc0.webp (from both dm/ and colorspace/) and inc1.webp. These just decode to transparent rectangles. Replace them with inc2.webp and inc3.webp, which decode part of the image and then have to fill with transparent. Change-Id: I64d40be91c574b45963f9a43d8dd8f4929dd2939 Reviewed-on: https://skia-review.googlesource.com/50303 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: James Zern <jzern@google.com> ======================================================================== For simplicity, this does not update VERSION or tasks.json, as does the original CL.
2017-09-21release-request-a84b3435-75fa-41e8-bd3c-ca0f4cbd5cc5-for-git_oc-m2-release-4 ↵android-build-team Robot
352002 snap-temp-L88700000105039240 Change-Id: Ia3e290fc8b450458bd3c23d6b7651f140a14d6e5
2017-09-13release-request-b613f8ce-05b5-465e-b783-c1b87f3c1e95-for-git_oc-mr1-release- ↵android-build-team Robot
4332123 snap-temp-L59300000101925107 Change-Id: I0dd5340da7ba404f47e2da888a4420ef6bab36da
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 17:46:54 +0000