Skip to content

Commit

Permalink
Roll src/third_party/skia 8ff2f13f3817..62db8d577931 (21 commits) (fl…
Browse files Browse the repository at this point in the history
…utter#6130)

Auto-roller completed checks. Merging.
  • Loading branch information
skia-flutter-autoroll authored Aug 31, 2018
1 parent 90faf85 commit f612a76
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 21 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ vars = {
'fuchsia_git': 'https://fuchsia.googlesource.com',
'github_git': 'https://github.com',
'skia_git': 'https://skia.googlesource.com',
'skia_revision': '8ff2f13f38171def1b1aeea8960443bb1fdd364a',
'skia_revision': '62db8d5779319ab8cedbd1da26110b1dff7ec09c',

# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the
Expand Down
42 changes: 22 additions & 20 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: c4713f2ce051c3800943375594bf6060
Signature: 4eee53d8412c999ed8a57a9cd5baec32

UNUSED LICENSES:

Expand Down Expand Up @@ -1550,6 +1550,8 @@ FILE: ../../../third_party/skia/src/opts/SkRasterPipeline_opts.h
FILE: ../../../third_party/skia/src/pathops/SkPathOpsAsWinding.cpp
FILE: ../../../third_party/skia/src/pdf/SkClusterator.cpp
FILE: ../../../third_party/skia/src/pdf/SkClusterator.h
FILE: ../../../third_party/skia/src/sksl/SkSLCPPUniformCTypes.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLCPPUniformCTypes.h
FILE: ../../../third_party/skia/src/sksl/SkSLInterpreter.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLInterpreter.h
FILE: ../../../third_party/skia/src/sksl/SkSLJIT.cpp
Expand Down Expand Up @@ -1639,10 +1641,10 @@ LIBRARY: skia
LIBRARY: vulkan
ORIGIN: ../../../flutter/third_party/txt/LICENSE
TYPE: LicenseType.apache
FILE: ../../../third_party/skia/experimental/pathkit/npm-asmjs/example.html
FILE: ../../../third_party/skia/experimental/pathkit/npm-asmjs/package.json
FILE: ../../../third_party/skia/experimental/pathkit/npm-wasm/example.html
FILE: ../../../third_party/skia/experimental/pathkit/npm-wasm/package.json
FILE: ../../../third_party/skia/modules/pathkit/npm-asmjs/example.html
FILE: ../../../third_party/skia/modules/pathkit/npm-asmjs/package.json
FILE: ../../../third_party/skia/modules/pathkit/npm-wasm/example.html
FILE: ../../../third_party/skia/modules/pathkit/npm-wasm/package.json
FILE: ../../../third_party/skia/src/images/SkWebpEncoder.cpp
FILE: ../../../third_party/skia/third_party/vulkan/vulkan/vk_platform.h
FILE: ../../../third_party/skia/third_party/vulkan/vulkan/vulkan.h
Expand Down Expand Up @@ -1956,11 +1958,6 @@ FILE: ../../../third_party/skia/experimental/docs/jsonbaseddoc.htm
FILE: ../../../third_party/skia/experimental/docs/svgBackend.js
FILE: ../../../third_party/skia/experimental/docs/svgbaseddoc.htm
FILE: ../../../third_party/skia/experimental/docs/utilities.js
FILE: ../../../third_party/skia/experimental/pathkit/chaining.js
FILE: ../../../third_party/skia/experimental/pathkit/externs.js
FILE: ../../../third_party/skia/experimental/pathkit/helper.js
FILE: ../../../third_party/skia/experimental/pathkit/karma.conf.js
FILE: ../../../third_party/skia/experimental/pathkit/package.json
FILE: ../../../third_party/skia/infra/bots/android_bin.isolate
FILE: ../../../third_party/skia/infra/bots/assets.isolate
FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_darwin/VERSION
Expand Down Expand Up @@ -2226,6 +2223,7 @@ FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Ubuntu17-C
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-BonusConfigs.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE.json
Expand All @@ -2234,7 +2232,6 @@ FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clan
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-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-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.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-FDAA.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
Expand Down Expand Up @@ -2286,6 +2283,11 @@ FILE: ../../../third_party/skia/infra/pathkit/docker/karma-chrome-tests/Dockerfi
FILE: ../../../third_party/skia/infra/project-config/cr-buildbucket.cfg
FILE: ../../../third_party/skia/infra/project-config/project.cfg
FILE: ../../../third_party/skia/infra/project-config/refs.cfg
FILE: ../../../third_party/skia/modules/pathkit/chaining.js
FILE: ../../../third_party/skia/modules/pathkit/externs.js
FILE: ../../../third_party/skia/modules/pathkit/helper.js
FILE: ../../../third_party/skia/modules/pathkit/karma.conf.js
FILE: ../../../third_party/skia/modules/pathkit/package.json
FILE: ../../../third_party/skia/public.bzl
FILE: ../../../third_party/skia/site/METADATA
FILE: ../../../third_party/skia/site/dev/METADATA
Expand Down Expand Up @@ -4518,14 +4520,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/experimental/pathkit/pathkit_wasm_bindings.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/fuzz/FuzzDrawFunctions.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/experimental/pathkit/pathkit_wasm_bindings.cpp
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/fuzz/FuzzDrawFunctions.cpp
----------------------------------------------------------------------------------------------------
Copyright 2018 Google LLC
Copyright 2016 Mozilla Foundation

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -4556,11 +4555,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/fuzz/FuzzDrawFunctions.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/fuzz/FuzzEncoders.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/fuzz/FuzzDrawFunctions.cpp
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/pathkit/pathkit_wasm_bindings.cpp
----------------------------------------------------------------------------------------------------
Copyright 2016 Mozilla Foundation
Copyright 2018 Google LLC

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down

0 comments on commit f612a76

Please sign in to comment.