diff --git a/DEPS b/DEPS index 42d057195ddd2..e58b4d5b0e658 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': 'd445e2b6fcf1a051049b2e527feb1fca9a0a4946', + 'skia_revision': '91e0d7526944f714706ec9510c346bd4eab3d5f1', # 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 ce43d41f24f24..516c6991eae69 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 52d5a1113113fcff5f331b122101a0a0 +Signature: 281b747ba0f64c8a40728d9c9b17b934 UNUSED LICENSES: @@ -1114,7 +1114,7 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.e FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json -FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json +FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -1277,8 +1277,8 @@ FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clan FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan.json FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-MSVC-LenovoYogaC630-GPU-Adreno630-arm64-Debug-All-ANGLE.json -FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json -FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json +FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json +FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All.json FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal.json FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/failed_dm.json @@ -1337,6 +1337,7 @@ FILE: ../../../third_party/skia/infra/wasm-common/docker/perf-karma-chrome-tests FILE: ../../../third_party/skia/modules/canvaskit/cpu.js FILE: ../../../third_party/skia/modules/canvaskit/debug.js FILE: ../../../third_party/skia/modules/canvaskit/externs.js +FILE: ../../../third_party/skia/modules/canvaskit/font.js FILE: ../../../third_party/skia/modules/canvaskit/fonts/NotoMono-Regular.ttf FILE: ../../../third_party/skia/modules/canvaskit/gpu.js FILE: ../../../third_party/skia/modules/canvaskit/helper.js @@ -1359,6 +1360,7 @@ FILE: ../../../third_party/skia/modules/canvaskit/karma.conf.js FILE: ../../../third_party/skia/modules/canvaskit/package.json FILE: ../../../third_party/skia/modules/canvaskit/paragraph.js FILE: ../../../third_party/skia/modules/canvaskit/particles.js +FILE: ../../../third_party/skia/modules/canvaskit/pathops.js FILE: ../../../third_party/skia/modules/canvaskit/perf/animation.bench.js FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/confetti.json FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/drinks.json @@ -1368,7 +1370,9 @@ FILE: ../../../third_party/skia/modules/canvaskit/postamble.js FILE: ../../../third_party/skia/modules/canvaskit/preamble.js FILE: ../../../third_party/skia/modules/canvaskit/ready.js FILE: ../../../third_party/skia/modules/canvaskit/release.js +FILE: ../../../third_party/skia/modules/canvaskit/rt_shader.js FILE: ../../../third_party/skia/modules/canvaskit/skottie.js +FILE: ../../../third_party/skia/modules/canvaskit/skp.js FILE: ../../../third_party/skia/modules/pathkit/chaining.js FILE: ../../../third_party/skia/modules/pathkit/externs.js FILE: ../../../third_party/skia/modules/pathkit/helper.js @@ -3090,7 +3094,6 @@ FILE: ../../../third_party/skia/gm/postercircle.cpp FILE: ../../../third_party/skia/gm/samplelocations.cpp FILE: ../../../third_party/skia/gm/skbug_8664.cpp FILE: ../../../third_party/skia/gm/skbug_8955.cpp -FILE: ../../../third_party/skia/gm/skvm.cpp FILE: ../../../third_party/skia/gm/tessellation.cpp FILE: ../../../third_party/skia/gm/video_decoder.cpp FILE: ../../../third_party/skia/gm/yuv420_odd_dim.cpp @@ -3849,8 +3852,8 @@ FILE: ../../../third_party/skia/src/gpu/effects/GrAtlasedShaderHelpers.h FILE: ../../../third_party/skia/src/gpu/effects/GrBlurredEdgeFragmentProcessor.fp FILE: ../../../third_party/skia/src/gpu/effects/GrCircleEffect.fp FILE: ../../../third_party/skia/src/gpu/effects/GrEllipseEffect.fp -FILE: ../../../third_party/skia/src/gpu/effects/GrSimpleTextureEffect.cpp -FILE: ../../../third_party/skia/src/gpu/effects/GrSimpleTextureEffect.h +FILE: ../../../third_party/skia/src/gpu/effects/GrTextureEffect.cpp +FILE: ../../../third_party/skia/src/gpu/effects/GrTextureEffect.h FILE: ../../../third_party/skia/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.cpp FILE: ../../../third_party/skia/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.h FILE: ../../../third_party/skia/src/gpu/effects/generated/GrCircleEffect.cpp @@ -4263,7 +4266,6 @@ FILE: ../../../third_party/skia/docs/examples/IPoint_subtract_operator.cpp FILE: ../../../third_party/skia/docs/examples/IPoint_subtractfrom_operator.cpp FILE: ../../../third_party/skia/docs/examples/IPoint_x.cpp FILE: ../../../third_party/skia/docs/examples/IPoint_y.cpp -FILE: ../../../third_party/skia/docs/examples/IRect_EmptyIRect.cpp FILE: ../../../third_party/skia/docs/examples/IRect_Intersects.cpp FILE: ../../../third_party/skia/docs/examples/IRect_MakeEmpty.cpp FILE: ../../../third_party/skia/docs/examples/IRect_MakeLTRB.cpp @@ -6088,6 +6090,46 @@ 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/modules/skottie/src/Camera.cpp + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/modules/skottie/src/Camera.cpp +FILE: ../../../third_party/skia/modules/skottie/src/Camera.h +FILE: ../../../third_party/skia/modules/skottie/src/Transform.cpp +FILE: ../../../third_party/skia/modules/skottie/src/Transform.h +---------------------------------------------------------------------------------------------------- +Copyright 2020 Google Inc. + +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 the copyright holder 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/samplecode/SampleTextureUpload.cpp + ../../../third_party/skia/LICENSE @@ -6722,4 +6764,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/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 24ea8b29ffdb3..ca7a2150818c3 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -12490,6 +12490,38 @@ skia Copyright 2019 The Android Open Source Project +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 the copyright holder 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 + +Copyright 2020 Google Inc. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: