From 596f52471a6c212eb4fdf8c49a227074a5dc30c2 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Thu, 21 Feb 2019 21:19:21 -0500 Subject: [PATCH] Roll src/third_party/skia 63c4d3596915..e9912ca049a0 (8 commits) (flutter/engine#7918) https://skia.googlesource.com/skia.git/%2Blog/63c4d3596915..e9912ca049a0 git log 63c4d3596915ca38eb47266a98c6f5d99399b52e..e9912ca049a068e34b81012d2e23793dc8573cf7 --date=short --no-merges --format=%ad %ae %s 2019-02-21 recipe-roller@chromium.org Roll recipe dependencies (trivial). 2019-02-21 robertphillips@google.com Move StrikeCache and TextBlobCache to RecordingContext 2019-02-21 robertphillips@google.com Revert "SkSL now supports null child processors" 2019-02-21 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ../src dca111a7573e..61d99852c465 (495 commits) 2019-02-21 csmartdalton@google.com vk: Hold refs to sampled textures as opposed to raw ptrs 2019-02-21 recipe-roller@chromium.org Roll recipe dependencies (trivial). 2019-02-21 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/angle2 08573730b75a..962c222aa3be (1 commits) 2019-02-21 ethannicholas@google.com SkSL now supports null child processors 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 (jvanverth@google.com), and stop the roller if necessary. --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 2 +- .../flutter/sky/packages/sky_engine/LICENSE | 52 +++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/DEPS b/DEPS index cb6c2cec29..458c930bbd 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': '63c4d3596915ca38eb47266a98c6f5d99399b52e', + 'skia_revision': 'e9912ca049a068e34b81012d2e23793dc8573cf7', # 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 dabd43f2fc..61954664d5 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 4adbd887c4d5bb308d83699e0800a51a +Signature: f29054c617196d2428101f0a8fb4a133 UNUSED LICENSES: diff --git a/engine/src/flutter/sky/packages/sky_engine/LICENSE b/engine/src/flutter/sky/packages/sky_engine/LICENSE index 265bc32f11..dcc3e1b66c 100644 --- a/engine/src/flutter/sky/packages/sky_engine/LICENSE +++ b/engine/src/flutter/sky/packages/sky_engine/LICENSE @@ -3017,6 +3017,32 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -------------------------------------------------------------------------------- +bsdiff + +Copyright 2003-2005 Colin Percival. 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 THE AUTHOR ``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 AUTHOR 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. +-------------------------------------------------------------------------------- colorama Copyright (c) 2010 Jonathan Hartley @@ -3492,32 +3518,6 @@ 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. -------------------------------------------------------------------------------- -bsdiff - -Copyright 2003-2005 Colin Percival. 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 THE AUTHOR ``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 AUTHOR 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 txt