From fa2ae20e3c90f6269c2b0d5f8db3437de8ff93ec Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Thu, 21 Nov 2019 19:21:44 -0500 Subject: [PATCH] Roll src/third_party/skia 4e0255508749..0788481c63dc (24 commits) (flutter/engine#13968) https://skia.googlesource.com/skia.git/+log/4e0255508749..0788481c63dc git log 4e0255508749..0788481c63dc --date=short --no-merges --format='%ad %ae %s' 2019-11-21 benjaminwagner@google.com Remove Build-Ubuntu18-GCC job 2019-11-21 benjaminwagner@google.com [infra] Add service_account_json option to asset utils 2019-11-21 rosasco@google.com Slim down .far by ~45 MB. 2019-11-21 reed@google.com Revert "Use flat version of path-direction enum" 2019-11-21 halcanary@google.com [reland] public.bzl: update to replace Gif with Wuffs 2019-11-21 mtklein@google.com all-constant peepholes 2019-11-21 reed@google.com Use flat version of path-direction enum 2019-11-21 kjlubick@google.com [canvaskit] Try some things to reduce GPU test flakiness 2019-11-21 mtklein@google.com build with Clang for Valgrind bots (take 2) 2019-11-21 mtklein@google.com add some missing bitfield initializers 2019-11-21 ethannicholas@google.com Reland "Fixed some GrSkSLFP limitations." 2019-11-21 michaelludwig@google.com Normalize src coords and domain up front instead of at tessellation time 2019-11-21 robertphillips@google.com Add onPrePrepare to GrFillRRectOp 2019-11-21 herb@google.com Simplify makeOps API 2019-11-21 mtklein@google.com one more stray Valgrind false positive 2019-11-21 halcanary@google.com [minor] mark scripts as executable 2019-11-21 halcanary@google.com Replace third_party/gif with new DEPS entry. 2019-11-21 mtklein@google.com expand float peepholes 2019-11-21 halcanary@google.com Replace third_party/gif: Preflight changes 2019-11-21 ethannicholas@google.com Revert "Fixed some GrSkSLFP limitations." 2019-11-21 egdaniel@google.com Update failure calls in GrVkMemory and shader creation. 2019-11-21 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/angle2 99bd10b70422..b8e748be6b94 (17 commits) 2019-11-21 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ../src 0db96f99f73d..137e8082047a (617 commits) 2019-11-21 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/swiftshader 7e11f46ddf8e..f2c9ce1e08ed (9 commits) Created with: gclient setdep -r src/third_party/skia@0788481c63dc If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC robertphillips@google.com on the revert to ensure that a human is aware of the problem. To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md Bug: None TBR=robertphillips@google.com --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 38 +------------------ .../flutter/sky/packages/sky_engine/LICENSE | 25 ------------ 3 files changed, 3 insertions(+), 62 deletions(-) diff --git a/DEPS b/DEPS index 350b9c18c76..d2ade0f3c07 100644 --- a/DEPS +++ b/DEPS @@ -26,7 +26,7 @@ vars = { 'skia_git': 'https://skia.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': '4e0255508749ce2d595dfdf68b3ba6bcaa672b7e', + 'skia_revision': '0788481c63dc4c06fdeb0976cc5568ef85d06af0', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/engine/src/flutter/ci/licenses_golden/licenses_skia b/engine/src/flutter/ci/licenses_golden/licenses_skia index 7c57aab979e..fed59d401e2 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: a15ff6749fc2a8cff5e4d7e15f8d5dfb +Signature: c8ea729af1431890557e325f934d9a17 UNUSED LICENSES: @@ -1421,7 +1421,6 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.ex FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-Metal.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Release-MoltenVK_Vulkan.json -FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Ubuntu18-GCC-x86_64-Release-Docker.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Debug-OpenCL.json @@ -1658,7 +1657,6 @@ FILE: ../../../third_party/skia/infra/cts/whitelist_devices.json FILE: ../../../third_party/skia/infra/gcc/Debian10-mips64el/Dockerfile FILE: ../../../third_party/skia/infra/gcc/Debian10-x86/Dockerfile FILE: ../../../third_party/skia/infra/gcc/Debian10/Dockerfile -FILE: ../../../third_party/skia/infra/gcc/Ubuntu18/Dockerfile FILE: ../../../third_party/skia/infra/lottiecap/docker/gold-lottie-web-puppeteer/Dockerfile FILE: ../../../third_party/skia/infra/lottiecap/docker/lottie-web-puppeteer/Dockerfile FILE: ../../../third_party/skia/infra/project-config/cr-buildbucket.cfg @@ -2759,8 +2757,6 @@ FILE: ../../../third_party/skia/src/codec/SkBmpStandardCodec.h FILE: ../../../third_party/skia/src/codec/SkCodec.cpp FILE: ../../../third_party/skia/src/codec/SkCodecImageGenerator.cpp FILE: ../../../third_party/skia/src/codec/SkCodecImageGenerator.h -FILE: ../../../third_party/skia/src/codec/SkGifCodec.cpp -FILE: ../../../third_party/skia/src/codec/SkGifCodec.h FILE: ../../../third_party/skia/src/codec/SkIcoCodec.cpp FILE: ../../../third_party/skia/src/codec/SkIcoCodec.h FILE: ../../../third_party/skia/src/codec/SkJpegCodec.cpp @@ -6084,36 +6080,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== -==================================================================================================== -LIBRARY: skia -ORIGIN: ../../../third_party/skia/src/codec/SkGifCodec.cpp -TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/src/codec/SkGifCodec.cpp ----------------------------------------------------------------------------------------------------- -Copyright (C) 2006 Apple Computer, Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -==================================================================================================== - ==================================================================================================== LIBRARY: skia ORIGIN: ../../../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp + ../../../third_party/skia/LICENSE @@ -6602,4 +6568,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ==================================================================================================== -Total license count: 52 +Total license count: 51 diff --git a/engine/src/flutter/sky/packages/sky_engine/LICENSE b/engine/src/flutter/sky/packages/sky_engine/LICENSE index eb1e9774ea0..6cb160d4868 100644 --- a/engine/src/flutter/sky/packages/sky_engine/LICENSE +++ b/engine/src/flutter/sky/packages/sky_engine/LICENSE @@ -11160,31 +11160,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- skia -Copyright (C) 2006 Apple Computer, Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------------------- -skia - Copyright (C) 2014 Google Inc. All rights reserved. Redistribution and use in source and binary forms, with or without