From 5b719d4f01d01a9d14939aab0bbada76daee36c9 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Tue, 18 Jun 2019 14:16:47 -0400 Subject: [PATCH] Roll src/third_party/skia 07edcfd4dc19..c6438c0b7f32 (9 commits) (flutter/engine#9359) https://skia.googlesource.com/skia.git /%2Blog/07edcfd4dc19..c6438c0b7f32 git log 07edcfd4dc1962921de1775fd506e04e27f98642..c6438c0b7f323a40ffbb571fc72981c6c1ac7282 --date=short --no-merges --format=%ad %ae %s 2019-06-18 mtklein@google.com start excising xbyak 2019-06-18 borenet@google.com Remove experimental Go bindings 2019-06-18 benjaminwagner@google.com Add Firestore emulator to gcloud_linux asset. 2019-06-18 rmistry@google.com [skottie-wasm-perf] Add recipe and CPU bot 2019-06-18 bungeman@google.com Remove SK_IGNORE_MAC_BLENDING_MATCH_FIX. 2019-06-18 brianosman@google.com Interpreter: Support striped inputs for less overhead 2019-06-18 brianosman@google.com Revert "Revert "Shuffle SkSL sources around so compiler and bytecode can be used w/o GPU"" 2019-06-18 borenet@google.com [infra] Fix Cloud Build 2019-06-18 egdaniel@google.com Move a bunch of gpu files out of include/private and into src/gpu. 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 (bsalomon@google.com), and stop the roller if necessary. --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 24 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/DEPS b/DEPS index 568fdd677e4..a844c2f7203 100644 --- a/DEPS +++ b/DEPS @@ -24,7 +24,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': '07edcfd4dc1962921de1775fd506e04e27f98642', + 'skia_revision': 'c6438c0b7f323a40ffbb571fc72981c6c1ac7282', # 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 8aca4a7c465..8797dfa673e 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: cde2a8f21e8d657f61a79fa0f84e6f85 +Signature: bd0fe86a14b4cc6a94822cfa9c780c82 UNUSED LICENSES: @@ -1068,12 +1068,7 @@ FILE: ../../../third_party/skia/include/gpu/vk/GrVkTypes.h FILE: ../../../third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h FILE: ../../../third_party/skia/include/ports/SkImageGeneratorCG.h FILE: ../../../third_party/skia/include/ports/SkImageGeneratorWIC.h -FILE: ../../../third_party/skia/include/private/GrAuditTrail.h -FILE: ../../../third_party/skia/include/private/GrOpList.h -FILE: ../../../third_party/skia/include/private/GrRenderTargetProxy.h FILE: ../../../third_party/skia/include/private/GrSingleOwner.h -FILE: ../../../third_party/skia/include/private/GrSurfaceProxy.h -FILE: ../../../third_party/skia/include/private/GrTextureProxy.h FILE: ../../../third_party/skia/include/private/SkBitmaskEnum.h FILE: ../../../third_party/skia/include/private/SkEncodedInfo.h FILE: ../../../third_party/skia/include/private/SkSafe_math.h @@ -1148,6 +1143,7 @@ FILE: ../../../third_party/skia/src/effects/imagefilters/SkArithmeticImageFilter FILE: ../../../third_party/skia/src/effects/imagefilters/SkPaintImageFilter.cpp FILE: ../../../third_party/skia/src/gpu/GrAppliedClip.h FILE: ../../../third_party/skia/src/gpu/GrAuditTrail.cpp +FILE: ../../../third_party/skia/src/gpu/GrAuditTrail.h FILE: ../../../third_party/skia/src/gpu/GrBitmapTextureMaker.cpp FILE: ../../../third_party/skia/src/gpu/GrBitmapTextureMaker.h FILE: ../../../third_party/skia/src/gpu/GrClipStackClip.cpp @@ -1161,11 +1157,13 @@ FILE: ../../../third_party/skia/src/gpu/GrGpuCommandBuffer.h FILE: ../../../third_party/skia/src/gpu/GrImageTextureMaker.cpp FILE: ../../../third_party/skia/src/gpu/GrImageTextureMaker.h FILE: ../../../third_party/skia/src/gpu/GrOpList.cpp +FILE: ../../../third_party/skia/src/gpu/GrOpList.h FILE: ../../../third_party/skia/src/gpu/GrProgramDesc.cpp FILE: ../../../third_party/skia/src/gpu/GrReducedClip.cpp FILE: ../../../third_party/skia/src/gpu/GrReducedClip.h FILE: ../../../third_party/skia/src/gpu/GrRenderTargetContextPriv.h FILE: ../../../third_party/skia/src/gpu/GrRenderTargetProxy.cpp +FILE: ../../../third_party/skia/src/gpu/GrRenderTargetProxy.h FILE: ../../../third_party/skia/src/gpu/GrResourceHandle.h FILE: ../../../third_party/skia/src/gpu/GrScissorState.h FILE: ../../../third_party/skia/src/gpu/GrShaderVar.cpp @@ -1177,6 +1175,7 @@ FILE: ../../../third_party/skia/src/gpu/GrSurfaceContext.cpp FILE: ../../../third_party/skia/src/gpu/GrSurfaceContext.h FILE: ../../../third_party/skia/src/gpu/GrSurfaceContextPriv.h FILE: ../../../third_party/skia/src/gpu/GrSurfaceProxy.cpp +FILE: ../../../third_party/skia/src/gpu/GrSurfaceProxy.h FILE: ../../../third_party/skia/src/gpu/GrSwizzle.h FILE: ../../../third_party/skia/src/gpu/GrTextureAdjuster.cpp FILE: ../../../third_party/skia/src/gpu/GrTextureAdjuster.h @@ -1189,6 +1188,7 @@ FILE: ../../../third_party/skia/src/gpu/GrTextureOpList.h FILE: ../../../third_party/skia/src/gpu/GrTextureProducer.cpp FILE: ../../../third_party/skia/src/gpu/GrTextureProducer.h FILE: ../../../third_party/skia/src/gpu/GrTextureProxy.cpp +FILE: ../../../third_party/skia/src/gpu/GrTextureProxy.h FILE: ../../../third_party/skia/src/gpu/GrTextureRenderTargetProxy.cpp FILE: ../../../third_party/skia/src/gpu/GrTextureRenderTargetProxy.h FILE: ../../../third_party/skia/src/gpu/GrUserStencilSettings.h @@ -1452,7 +1452,6 @@ FILE: ../../../third_party/skia/include/gpu/GrDriverBugWorkarounds.h FILE: ../../../third_party/skia/include/gpu/vk/GrVkMemoryAllocator.h FILE: ../../../third_party/skia/include/gpu/vk/GrVkVulkan.h FILE: ../../../third_party/skia/include/ports/SkFontMgr_fuchsia.h -FILE: ../../../third_party/skia/include/private/GrProxyRef.h FILE: ../../../third_party/skia/include/private/GrVkTypesPriv.h FILE: ../../../third_party/skia/include/private/SkMacros.h FILE: ../../../third_party/skia/include/private/SkSafe32.h @@ -1554,6 +1553,7 @@ FILE: ../../../third_party/skia/src/gpu/GrFPArgs.h FILE: ../../../third_party/skia/src/gpu/GrLegacyDirectContext.cpp FILE: ../../../third_party/skia/src/gpu/GrProxyProvider.cpp FILE: ../../../third_party/skia/src/gpu/GrProxyProvider.h +FILE: ../../../third_party/skia/src/gpu/GrProxyRef.h FILE: ../../../third_party/skia/src/gpu/GrRenderTargetProxyPriv.h FILE: ../../../third_party/skia/src/gpu/GrResourceProviderPriv.h FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCClipPath.cpp @@ -2069,6 +2069,8 @@ FILE: ../../../third_party/skia/infra/bots/recipes/perf_canvaskit.expected/pathk FILE: ../../../third_party/skia/infra/bots/recipes/perf_pathkit.expected/Perf-Debian9-EMCC-GCE-CPU-AVX2-asmjs-Release-All-PathKit.json FILE: ../../../third_party/skia/infra/bots/recipes/perf_pathkit.expected/Perf-Debian9-EMCC-GCE-CPU-AVX2-wasm-Release-All-PathKit.json FILE: ../../../third_party/skia/infra/bots/recipes/perf_pathkit.expected/pathkit_trybot.json +FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottie_wasm.expected/skottie_wasm_perf.json +FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottie_wasm.expected/skottie_wasm_perf_trybot.json FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottietrace.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SkottieTracing.json FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json @@ -3158,10 +3160,6 @@ FILE: ../../../third_party/skia/dm/DMSrcSink.cpp FILE: ../../../third_party/skia/dm/DMSrcSink.h FILE: ../../../third_party/skia/example/SkiaSDLExample.cpp FILE: ../../../third_party/skia/experimental/c-api-example/skia-c-example.c -FILE: ../../../third_party/skia/experimental/go-demo/main.go -FILE: ../../../third_party/skia/experimental/go-skia/ctypes.go -FILE: ../../../third_party/skia/experimental/go-skia/skia.go -FILE: ../../../third_party/skia/experimental/go-skia/types.go FILE: ../../../third_party/skia/experimental/tools/coreGraphicsPdf2png.cpp FILE: ../../../third_party/skia/gm/aaxfermodes.cpp FILE: ../../../third_party/skia/gm/addarc.cpp @@ -5585,10 +5583,10 @@ ORIGIN: ../../../third_party/skia/fuzz/FuzzEncoders.cpp + ../../../third_party/s TYPE: LicenseType.bsd FILE: ../../../third_party/skia/fuzz/FuzzEncoders.cpp FILE: ../../../third_party/skia/fuzz/FuzzPolyUtils.cpp -FILE: ../../../third_party/skia/include/private/GrSkSLFPFactoryCache.h FILE: ../../../third_party/skia/modules/canvaskit/canvaskit_bindings.cpp FILE: ../../../third_party/skia/modules/pathkit/pathkit_wasm_bindings.cpp FILE: ../../../third_party/skia/src/core/SkPicture_none.cpp +FILE: ../../../third_party/skia/src/gpu/GrSkSLFPFactoryCache.h FILE: ../../../third_party/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer_none.cpp ---------------------------------------------------------------------------------------------------- Copyright 2018 Google LLC @@ -6190,7 +6188,6 @@ TYPE: LicenseType.bsd FILE: ../../../third_party/skia/include/gpu/GrConfig.h FILE: ../../../third_party/skia/include/gpu/GrContext.h FILE: ../../../third_party/skia/include/gpu/GrTypes.h -FILE: ../../../third_party/skia/include/private/GrColor.h FILE: ../../../third_party/skia/src/core/SkImageInfo.cpp FILE: ../../../third_party/skia/src/core/SkRasterClip.cpp FILE: ../../../third_party/skia/src/core/SkRasterClip.h @@ -6199,6 +6196,7 @@ FILE: ../../../third_party/skia/src/gpu/GrAllocator.h FILE: ../../../third_party/skia/src/gpu/GrBufferAllocPool.cpp FILE: ../../../third_party/skia/src/gpu/GrBufferAllocPool.h FILE: ../../../third_party/skia/src/gpu/GrClip.h +FILE: ../../../third_party/skia/src/gpu/GrColor.h FILE: ../../../third_party/skia/src/gpu/GrFixedClip.cpp FILE: ../../../third_party/skia/src/gpu/GrGlyph.h FILE: ../../../third_party/skia/src/gpu/GrGpu.cpp