Skip to content

Commit

Permalink
Roll Skia from c3794dd52778 to 2d01ed94605a (10 revisions) (flutter#2…
Browse files Browse the repository at this point in the history
  • Loading branch information
skia-flutter-autoroll committed Jul 31, 2020
1 parent cb1a374 commit ed36b1a
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 14 deletions.
2 changes: 1 addition & 1 deletion DEPS
Expand Up @@ -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': 'c3794dd52778552a9afc323f2a9d11905e432a9b',
'skia_revision': '2d01ed94605a972900ab4c54cceb6e9aad5b6e61',

# 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
41 changes: 28 additions & 13 deletions ci/licenses_golden/licenses_skia
@@ -1,4 +1,4 @@
Signature: 6888632fda3913e222404b942deccd12
Signature: 5dec183ca4da52b931494e45051cedfe

UNUSED LICENSES:

Expand Down Expand Up @@ -1452,15 +1452,27 @@ FILE: ../../../third_party/skia/specs/web-img-decode/proposed/index.html
FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h
FILE: ../../../third_party/skia/src/ports/SkTLS_pthread.cpp
FILE: ../../../third_party/skia/src/ports/SkTLS_win.cpp
FILE: ../../../third_party/skia/src/sksl/generated/sksl_fp.dehydrated.sksl
FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.c.inc
FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.dehydrated.sksl
FILE: ../../../third_party/skia/src/sksl/generated/sksl_geom.c.inc
FILE: ../../../third_party/skia/src/sksl/generated/sksl_geom.dehydrated.sksl
FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.c.inc
FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.dehydrated.sksl
FILE: ../../../third_party/skia/src/sksl/generated/sksl_interp.c.inc
FILE: ../../../third_party/skia/src/sksl/generated/sksl_interp.dehydrated.sksl
FILE: ../../../third_party/skia/src/sksl/generated/sksl_pipeline.c.inc
FILE: ../../../third_party/skia/src/sksl/generated/sksl_pipeline.dehydrated.sksl
FILE: ../../../third_party/skia/src/sksl/generated/sksl_vert.c.inc
FILE: ../../../third_party/skia/src/sksl/generated/sksl_vert.dehydrated.sksl
FILE: ../../../third_party/skia/src/sksl/lex/sksl.lex
FILE: ../../../third_party/skia/src/sksl/sksl_blend.inc
FILE: ../../../third_party/skia/src/sksl/sksl_fp.inc
FILE: ../../../third_party/skia/src/sksl/sksl_frag.inc
FILE: ../../../third_party/skia/src/sksl/sksl_geom.inc
FILE: ../../../third_party/skia/src/sksl/sksl_gpu.inc
FILE: ../../../third_party/skia/src/sksl/sksl_interp.inc
FILE: ../../../third_party/skia/src/sksl/sksl_pipeline.inc
FILE: ../../../third_party/skia/src/sksl/sksl_vert.inc
FILE: ../../../third_party/skia/src/sksl/sksl_fp_raw.sksl
FILE: ../../../third_party/skia/src/sksl/sksl_frag.sksl
FILE: ../../../third_party/skia/src/sksl/sksl_geom.sksl
FILE: ../../../third_party/skia/src/sksl/sksl_gpu.sksl
FILE: ../../../third_party/skia/src/sksl/sksl_interp.sksl
FILE: ../../../third_party/skia/src/sksl/sksl_pipeline.sksl
FILE: ../../../third_party/skia/src/sksl/sksl_vert.sksl
----------------------------------------------------------------------------------------------------
Copyright (c) 2011 Google Inc. All rights reserved.

Expand Down Expand Up @@ -3814,6 +3826,8 @@ FILE: ../../../third_party/skia/src/sksl/SkSLSectionAndParameterHelper.h
FILE: ../../../third_party/skia/src/sksl/SkSLString.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLString.h
FILE: ../../../third_party/skia/src/sksl/SkSLStringStream.h
FILE: ../../../third_party/skia/src/sksl/generated/sksl_fp.c.inc
FILE: ../../../third_party/skia/src/sksl/generated/sksl_fp.sksl
FILE: ../../../third_party/skia/src/sksl/ir/SkSLEnum.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSetting.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwitchCase.h
Expand All @@ -3830,7 +3844,6 @@ FILE: ../../../third_party/skia/src/sksl/lex/RegexNode.cpp
FILE: ../../../third_party/skia/src/sksl/lex/RegexNode.h
FILE: ../../../third_party/skia/src/sksl/lex/RegexParser.cpp
FILE: ../../../third_party/skia/src/sksl/lex/RegexParser.h
FILE: ../../../third_party/skia/src/sksl/sksl_enums.inc
FILE: ../../../third_party/skia/src/utils/SkFloatToDecimal.cpp
FILE: ../../../third_party/skia/src/utils/SkFloatToDecimal.h
FILE: ../../../third_party/skia/src/utils/SkJSONWriter.cpp
Expand Down Expand Up @@ -3971,6 +3984,8 @@ FILE: ../../../third_party/skia/src/gpu/vk/GrVkManagedResource.h
FILE: ../../../third_party/skia/src/image/SkRescaleAndReadPixels.cpp
FILE: ../../../third_party/skia/src/image/SkRescaleAndReadPixels.h
FILE: ../../../third_party/skia/src/sksl/SkSLAnalysis.h
FILE: ../../../third_party/skia/src/sksl/SkSLDehydrator.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLDehydrator.h
FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.h
FILE: ../../../third_party/skia/src/sksl/SkSLSampleUsage.cpp
Expand Down Expand Up @@ -5539,6 +5554,8 @@ FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeTessellateShader.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeTessellateShader.h
FILE: ../../../third_party/skia/src/opts/SkVM_opts.h
FILE: ../../../third_party/skia/src/sksl/SkSLAnalysis.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLRehydrator.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLRehydrator.h
----------------------------------------------------------------------------------------------------
Copyright 2020 Google LLC.

Expand Down Expand Up @@ -5748,10 +5765,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAPISkDescriptor.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/fuzz/FuzzSkDescriptor.cpp
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAPISkDescriptor.cpp
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp
Expand Down

0 comments on commit ed36b1a

Please sign in to comment.