From 0fcf3b3ef032d7f60c6dcbfe3f8643dfc9a70cc2 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Wed, 17 Jul 2019 15:12:20 -0400 Subject: [PATCH] Roll src/third_party/skia e574f1e409aa..d7639aff1001 (16 commits) (#9889) https://skia.googlesource.com/skia.git /compare/e574f1e409aa..d7639aff1001 git log e574f1e409aa3a030d84cd1122abc5348c30f9eb..d7639aff1001736bc6072da539b31f911bb3788a --date=short --no-merges --format=%ad %ae %s 2019-07-17 halcanary@google.com Samples: clean up cruft 2019-07-17 fmalita@chromium.org [skottie] Remove deprecated loadImageAsset API 2019-07-17 mtklein@google.com split deaths() out of other analysis 2019-07-17 reed@google.com search for 'main' explicitly 2019-07-17 egdaniel@google.com Revert "First draft of Dawn backend: clears are working." 2019-07-17 fmalita@chromium.org [skottie] De-dupe sequential cubic mappers 2019-07-17 egdaniel@google.com Remove RG32F color type and pixel config. 2019-07-17 reed@google.com change colorfilter signature back to just inout color 2019-07-17 senorblanco@chromium.org First draft of Dawn backend: clears are working. 2019-07-17 fmalita@chromium.org [skottie] Fix default cubic controls detection 2019-07-16 reed@google.com use same signature for shader/colorfilters in sksl 2019-07-17 ethannicholas@google.com add support for ctype=SkPMColor4f to GrSkSLFP 2019-07-17 egdaniel@google.com Move verified color attachment flag to FormatInfo. 2019-07-17 bsalomon@google.com Remove kRenderTarget_GrSurfaceFlag, instead pass GrRenderable. 2019-07-16 egdaniel@google.com Move renderable flag and valid samplecounts in GrGLCaps to FormatInfo. 2019-07-16 egdaniel@google.com Add comment regarding gl BGRA format and renderability. The AutoRoll server is located here: https://autoroll.skia.org/r/skia-flutter-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff (nifong@google.com), and stop the roller if necessary. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- sky/packages/sky_engine/LICENSE | 61 ++++++++++++++++---------------- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/DEPS b/DEPS index ebce54998e9..614db732e75 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': 'e574f1e409aa3a030d84cd1122abc5348c30f9eb', + 'skia_revision': 'd7639aff1001736bc6072da539b31f911bb3788a', # 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/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index a1a2c545aa9..1b3cb3b67d1 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: b9ff8ffebdb7e61d78ff1c9078566a4a +Signature: f05c70f0a20aced6c42d0455c9b7f151 UNUSED LICENSES: diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 34bbf323241..7ced9051792 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -3539,37 +3539,6 @@ met: contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"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 THE COPYRIGHT -OWNER 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. --------------------------------------------------------------------------------- -engine -icu - -Copyright 2014 The Chromium Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * 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. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -7537,6 +7506,36 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- icu +Copyright 2014 The Chromium Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"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 THE COPYRIGHT +OWNER 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. +-------------------------------------------------------------------------------- +icu + Copyright © 1991-2018 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.