From b8e7678b14e1eccc326e204e433c2273414edd94 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Tue, 27 Nov 2018 11:43:14 -0500 Subject: [PATCH] Roll src/third_party/skia 988f54e4689b..ad5f06949033 (102 commits) (#6960) https://skia.googlesource.com/skia.git/+log/988f54e4689b..ad5f06949033 Created with: gclient setdep -r src/third_party/skia@ad5f06949033 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, who should be CC'd on the roll, and stop the roller if necessary. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 51 ++++++-------------------------- sky/packages/sky_engine/LICENSE | 31 ------------------- 3 files changed, 10 insertions(+), 74 deletions(-) diff --git a/DEPS b/DEPS index 4d4060099..87dec6bdf 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': '988f54e4689b3d9fb6d5220e02b418f5cfa2b6db', + 'skia_revision': 'ad5f069490332881eab0697c5c06807f5f89d865', # 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 1b405986e..cbc8d0823 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: ee0a1574bb6026ffa4292566b01d932d +Signature: 03ade9bd1ada22cf66f97d26b1b89935 UNUSED LICENSES: @@ -795,7 +795,6 @@ FILE: ../../../third_party/skia/gm/drawregionmodes.cpp FILE: ../../../third_party/skia/gm/encode-platform.cpp FILE: ../../../third_party/skia/gm/encode-srgb.cpp FILE: ../../../third_party/skia/gm/filterbug.cpp -FILE: ../../../third_party/skia/gm/gamut.cpp FILE: ../../../third_party/skia/gm/hardstop_gradients.cpp FILE: ../../../third_party/skia/gm/imagemakewithfilter.cpp FILE: ../../../third_party/skia/gm/imagemasksubset.cpp @@ -830,7 +829,6 @@ FILE: ../../../third_party/skia/include/effects/SkArithmeticImageFilter.h FILE: ../../../third_party/skia/include/effects/SkOverdrawColorFilter.h FILE: ../../../third_party/skia/include/effects/SkPaintImageFilter.h FILE: ../../../third_party/skia/include/gpu/vk/GrVkBackendContext.h -FILE: ../../../third_party/skia/include/gpu/vk/GrVkDefines.h FILE: ../../../third_party/skia/include/gpu/vk/GrVkExtensions.h FILE: ../../../third_party/skia/include/gpu/vk/GrVkTypes.h FILE: ../../../third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h @@ -1281,7 +1279,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skcms LIBRARY: skia -LIBRARY: vulkan LIBRARY: vulkanmemoryallocator LIBRARY: wuffs ORIGIN: ../../../third_party/skia/bench/ClearBench.cpp + ../../../third_party/skia/LICENSE @@ -1612,6 +1609,7 @@ 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/GrVkTypesPriv.cpp +FILE: ../../../third_party/skia/src/gpu/vk/GrVkVulkan.h FILE: ../../../third_party/skia/src/image/SkImage_GpuBase.cpp FILE: ../../../third_party/skia/src/image/SkImage_GpuBase.h FILE: ../../../third_party/skia/src/image/SkImage_GpuYUVA.cpp @@ -1647,7 +1645,6 @@ FILE: ../../../third_party/skia/third_party/skcms/skcms.cc FILE: ../../../third_party/skia/third_party/skcms/skcms.h FILE: ../../../third_party/skia/third_party/skcms/skcms_internal.h FILE: ../../../third_party/skia/third_party/skcms/src/Transform_inl.h -FILE: ../../../third_party/skia/third_party/vulkan/SkiaVulkan.h FILE: ../../../third_party/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp FILE: ../../../third_party/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h FILE: ../../../third_party/skia/third_party/wuffs/wuffs.c @@ -2036,9 +2033,11 @@ FILE: ../../../third_party/skia/experimental/canvaskit/canvaskit/example.html FILE: ../../../third_party/skia/experimental/canvaskit/canvaskit/node.example.js FILE: ../../../third_party/skia/experimental/canvaskit/canvaskit/package.json FILE: ../../../third_party/skia/experimental/canvaskit/cpu.js +FILE: ../../../third_party/skia/experimental/canvaskit/debug.js FILE: ../../../third_party/skia/experimental/canvaskit/externs.js FILE: ../../../third_party/skia/experimental/canvaskit/gpu.js FILE: ../../../third_party/skia/experimental/canvaskit/helper.js +FILE: ../../../third_party/skia/experimental/canvaskit/htmlcanvas/_namedcolors.js FILE: ../../../third_party/skia/experimental/canvaskit/htmlcanvas/canvas2d.js FILE: ../../../third_party/skia/experimental/canvaskit/interface.js FILE: ../../../third_party/skia/experimental/canvaskit/karma.bench.conf.js @@ -2049,6 +2048,7 @@ FILE: ../../../third_party/skia/experimental/canvaskit/perf/assets/confetti.json FILE: ../../../third_party/skia/experimental/canvaskit/perf/assets/drinks.json FILE: ../../../third_party/skia/experimental/canvaskit/perf/assets/lego_loader.json FILE: ../../../third_party/skia/experimental/canvaskit/perf/assets/onboarding.json +FILE: ../../../third_party/skia/experimental/canvaskit/release.js FILE: ../../../third_party/skia/experimental/docs/animationCommon.js FILE: ../../../third_party/skia/experimental/docs/backend.js FILE: ../../../third_party/skia/experimental/docs/canvasBackend.js @@ -2197,8 +2197,10 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.exp FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/win_test.json FILE: ../../../third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_nontrybot.json +FILE: ../../../third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_sdk_trybot.json FILE: ../../../third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_trybot.json FILE: ../../../third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_trybot_failure.json +FILE: ../../../third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_unrecognized_target.json FILE: ../../../third_party/skia/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json FILE: ../../../third_party/skia/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json FILE: ../../../third_party/skia/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json @@ -3092,6 +3094,7 @@ FILE: ../../../third_party/skia/src/c/sk_surface.cpp FILE: ../../../third_party/skia/src/core/SkBBHFactory.cpp FILE: ../../../third_party/skia/src/core/SkBitmapCache.cpp FILE: ../../../third_party/skia/src/core/SkBitmapCache.h +FILE: ../../../third_party/skia/src/core/SkBitmapProcState_matrix_neon.h FILE: ../../../third_party/skia/src/core/SkCachedData.cpp FILE: ../../../third_party/skia/src/core/SkCachedData.h FILE: ../../../third_party/skia/src/core/SkCanvasPriv.h @@ -3186,7 +3189,6 @@ FILE: ../../../third_party/skia/src/gpu/ops/GrDashOp.h FILE: ../../../third_party/skia/src/gpu/ops/GrSmallPathRenderer.h FILE: ../../../third_party/skia/src/image/SkReadPixelsRec.h FILE: ../../../third_party/skia/src/image/SkSurface_Gpu.h -FILE: ../../../third_party/skia/src/opts/SkBitmapProcState_matrix_neon.h FILE: ../../../third_party/skia/src/pathops/SkOpBuilder.cpp FILE: ../../../third_party/skia/src/pathops/SkOpSpan.cpp FILE: ../../../third_party/skia/src/pathops/SkPathOpsTSect.cpp @@ -5825,41 +5827,6 @@ 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/src/opts/SkBitmapProcState_matrixProcs_neon.cpp + ../../../third_party/skia/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp ----------------------------------------------------------------------------------------------------- -Copyright 2009 Motorola - -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/src/ports/SkFontConfigInterface_direct.cpp + ../../../third_party/skia/LICENSE @@ -6016,4 +5983,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: 52 diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 7334fbc6b..9344e0423 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -9611,7 +9611,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- skcms skia -vulkan vulkanmemoryallocator wuffs @@ -9955,36 +9954,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- skia -Copyright 2009 Motorola - -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 - Copyright 2009 The Android Open Source Project Redistribution and use in source and binary forms, with or without -- GitLab