From b7560e732fb627abd8331bb34c2c2394b2a99b85 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Mon, 29 Jul 2019 16:35:32 -0400 Subject: [PATCH] Roll src/third_party/skia a8825f5a8b82..9ef1b771afa7 (8 commits) (flutter/engine#10238) https://skia.googlesource.com/skia.git /compare/a8825f5a8b82..9ef1b771afa7 git log a8825f5a8b822920f30cdb5e2c36ec74ecf98531..9ef1b771afa75968b88c445d83bf60993a0b65c3 --date=short --no-merges --format=%ad %ae %s 2019-07-29 halcanary@google.com experimental/editor: scroll on cursor movement, Editor::getLocation 2019-07-29 egdaniel@google.com Remove need for GrVkPipelineLayout class. 2019-07-26 michaelludwig@google.com Use SkTileMode for blur and matrix convolution filters 2019-07-29 mtklein@google.com don't try to format removed files 2019-07-29 ethannicholas@google.com renamed SkSL texture() and process() to sample() 2019-07-29 jvanverth@google.com Use shared mode for Metal texture upload buffers. 2019-07-26 brianosman@google.com Allow defined functions in the SkSL .inc files 2019-07-26 csmartdalton@google.com skpbench: invoke 'adb wait-for-device' lazily 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 (benjaminwagner@google.com), and stop the roller if necessary. --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 4 +- .../flutter/sky/packages/sky_engine/LICENSE | 61 +++++++++---------- 3 files changed, 32 insertions(+), 35 deletions(-) diff --git a/DEPS b/DEPS index 466671a715..241466414c 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': 'a8825f5a8b822920f30cdb5e2c36ec74ecf98531', + 'skia_revision': '9ef1b771afa75968b88c445d83bf60993a0b65c3', # 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 340a25daa2..66315ff7ef 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: d5aa1ac06506493faf591430adcf7e50 +Signature: 514785703e14b4be3abcb64d352f5aaa UNUSED LICENSES: @@ -1142,8 +1142,6 @@ FILE: ../../../third_party/skia/src/gpu/vk/GrVkAMDMemoryAllocator.h FILE: ../../../third_party/skia/src/gpu/vk/GrVkCommandPool.cpp FILE: ../../../third_party/skia/src/gpu/vk/GrVkCommandPool.h FILE: ../../../third_party/skia/src/gpu/vk/GrVkImageLayout.h -FILE: ../../../third_party/skia/src/gpu/vk/GrVkPipelineLayout.cpp -FILE: ../../../third_party/skia/src/gpu/vk/GrVkPipelineLayout.h FILE: ../../../third_party/skia/src/gpu/vk/GrVkSamplerYcbcrConversion.cpp FILE: ../../../third_party/skia/src/gpu/vk/GrVkSamplerYcbcrConversion.h FILE: ../../../third_party/skia/src/gpu/vk/GrVkTypesPriv.cpp diff --git a/engine/src/flutter/sky/packages/sky_engine/LICENSE b/engine/src/flutter/sky/packages/sky_engine/LICENSE index 412b4d4f7d..1d71149dec 100644 --- a/engine/src/flutter/sky/packages/sky_engine/LICENSE +++ b/engine/src/flutter/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.