From dc2af70c9ffdef53cc13d31a78abfdb0c0f09d31 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Thu, 3 Jan 2019 16:49:40 -0500 Subject: [PATCH] Roll src/third_party/skia 3b7e65107f67..4683942a45f6 (10 commits) (flutter/engine#7362) https://skia.googlesource.com/skia.git/%2Blog/3b7e65107f67..4683942a45f6 git log 3b7e65107f671e35674ab8bfc163d998039b81bf..4683942a45f6927435249677adceefdb8c424443 --date=short --no-merges --format=%ad %ae %s 2019-01-03 kjlubick@google.com [canvaskit] Refactor skottie into own file 2019-01-03 recipe-roller@chromium.org Roll recipe dependencies (trivial). 2019-01-03 robertphillips@google.com Make the RRectEffect's screen coords be Float4 (rather than Half4) 2019-01-02 michaelludwig@google.com Normalize vectors in dot product for quad type calculations. 2018-12-27 halcanary@google.com SkPDF: eliminalte one member function 2019-01-03 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/angle2 4627b3705d59..9fa54eab2590 (1 commits) 2019-01-03 reed@google.com use drawSimpleText 2019-01-03 skia-autoroll@skia-public.iam.gserviceaccount.com Roll skia/third_party/skcms e9b211dd665b..8b9d1f9db8a8 (1 commits) 2019-01-03 reed@google.com remove legacy drawPosText (and variants) 2019-01-03 mtklein@google.com tear down one-big-switch SkRasterPipeline backend 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 (bungeman@google.com), and stop the roller if necessary. --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 43 ++++++++++++++++--- .../flutter/sky/packages/sky_engine/LICENSE | 30 +++++++++++++ 3 files changed, 69 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 9fe64672bc..77f83da2d6 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': '3b7e65107f671e35674ab8bfc163d998039b81bf', + 'skia_revision': '4683942a45f6927435249677adceefdb8c424443', # 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 37e602e14e..8eb2975a54 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: c815a9fdad786a19310d2e8659e464bf +Signature: 2df6d3ed3416daadb5c62ded175dc114 UNUSED LICENSES: @@ -2726,7 +2726,6 @@ FILE: ../../../third_party/skia/bench/BitmapRectBench.cpp FILE: ../../../third_party/skia/bench/BlurBench.cpp FILE: ../../../third_party/skia/bench/ChromeBench.cpp FILE: ../../../third_party/skia/bench/DashBench.cpp -FILE: ../../../third_party/skia/bench/FontScalerBench.cpp FILE: ../../../third_party/skia/bench/GradientBench.cpp FILE: ../../../third_party/skia/bench/MatrixBench.cpp FILE: ../../../third_party/skia/bench/MutexBench.cpp @@ -2737,7 +2736,6 @@ FILE: ../../../third_party/skia/bench/RectBench.cpp FILE: ../../../third_party/skia/bench/RegionBench.cpp FILE: ../../../third_party/skia/bench/RepeatTileBench.cpp FILE: ../../../third_party/skia/bench/ScalarBench.cpp -FILE: ../../../third_party/skia/bench/ShaderMaskBench.cpp FILE: ../../../third_party/skia/bench/VertBench.cpp FILE: ../../../third_party/skia/experimental/Networking/SkSockets.cpp FILE: ../../../third_party/skia/experimental/Networking/SkSockets.h @@ -2825,7 +2823,6 @@ FILE: ../../../third_party/skia/samplecode/SampleArc.cpp FILE: ../../../third_party/skia/samplecode/SampleBigBlur.cpp FILE: ../../../third_party/skia/samplecode/SampleBigGradient.cpp FILE: ../../../third_party/skia/samplecode/SampleBitmapRect.cpp -FILE: ../../../third_party/skia/samplecode/SampleBlur.cpp FILE: ../../../third_party/skia/samplecode/SampleCamera.cpp FILE: ../../../third_party/skia/samplecode/SampleCircle.cpp FILE: ../../../third_party/skia/samplecode/SampleClamp.cpp @@ -4623,6 +4620,42 @@ 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/experimental/canvaskit/WasmAliases.h + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/experimental/canvaskit/WasmAliases.h +FILE: ../../../third_party/skia/experimental/canvaskit/skottie_bindings.cpp +---------------------------------------------------------------------------------------------------- +Copyright 2019 Google LLC + +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. +==================================================================================================== + ==================================================================================================== LIBRARY: skia ORIGIN: ../../../third_party/skia/experimental/canvaskit/canvaskit_bindings.cpp + ../../../third_party/skia/LICENSE @@ -6029,4 +6062,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: 53 +Total license count: 54 diff --git a/engine/src/flutter/sky/packages/sky_engine/LICENSE b/engine/src/flutter/sky/packages/sky_engine/LICENSE index 84bfb2043b..c07db5a888 100644 --- a/engine/src/flutter/sky/packages/sky_engine/LICENSE +++ b/engine/src/flutter/sky/packages/sky_engine/LICENSE @@ -10886,6 +10886,36 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- skia +Copyright 2019 Google LLC + +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. +-------------------------------------------------------------------------------- +skia + NEON optimized code (C) COPYRIGHT 2009 Motorola Redistribution and use in source and binary forms, with or without