Skip to content

Commit ed36b1a

Browse files
Roll Skia from c3794dd52778 to 2d01ed94605a (10 revisions) (#20179)
1 parent cb1a374 commit ed36b1a

File tree

2 files changed

+29
-14
lines changed

2 files changed

+29
-14
lines changed

DEPS

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ vars = {
2626
'skia_git': 'https://skia.googlesource.com',
2727
# OCMock is for testing only so there is no google clone
2828
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
29-
'skia_revision': 'c3794dd52778552a9afc323f2a9d11905e432a9b',
29+
'skia_revision': '2d01ed94605a972900ab4c54cceb6e9aad5b6e61',
3030

3131
# When updating the Dart revision, ensure that all entries that are
3232
# dependencies of Dart are also updated to match the entries in the

ci/licenses_golden/licenses_skia

+28-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 6888632fda3913e222404b942deccd12
1+
Signature: 5dec183ca4da52b931494e45051cedfe
22

33
UNUSED LICENSES:
44

@@ -1452,15 +1452,27 @@ FILE: ../../../third_party/skia/specs/web-img-decode/proposed/index.html
14521452
FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h
14531453
FILE: ../../../third_party/skia/src/ports/SkTLS_pthread.cpp
14541454
FILE: ../../../third_party/skia/src/ports/SkTLS_win.cpp
1455+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_fp.dehydrated.sksl
1456+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.c.inc
1457+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.dehydrated.sksl
1458+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_geom.c.inc
1459+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_geom.dehydrated.sksl
1460+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.c.inc
1461+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.dehydrated.sksl
1462+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_interp.c.inc
1463+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_interp.dehydrated.sksl
1464+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_pipeline.c.inc
1465+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_pipeline.dehydrated.sksl
1466+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_vert.c.inc
1467+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_vert.dehydrated.sksl
14551468
FILE: ../../../third_party/skia/src/sksl/lex/sksl.lex
1456-
FILE: ../../../third_party/skia/src/sksl/sksl_blend.inc
1457-
FILE: ../../../third_party/skia/src/sksl/sksl_fp.inc
1458-
FILE: ../../../third_party/skia/src/sksl/sksl_frag.inc
1459-
FILE: ../../../third_party/skia/src/sksl/sksl_geom.inc
1460-
FILE: ../../../third_party/skia/src/sksl/sksl_gpu.inc
1461-
FILE: ../../../third_party/skia/src/sksl/sksl_interp.inc
1462-
FILE: ../../../third_party/skia/src/sksl/sksl_pipeline.inc
1463-
FILE: ../../../third_party/skia/src/sksl/sksl_vert.inc
1469+
FILE: ../../../third_party/skia/src/sksl/sksl_fp_raw.sksl
1470+
FILE: ../../../third_party/skia/src/sksl/sksl_frag.sksl
1471+
FILE: ../../../third_party/skia/src/sksl/sksl_geom.sksl
1472+
FILE: ../../../third_party/skia/src/sksl/sksl_gpu.sksl
1473+
FILE: ../../../third_party/skia/src/sksl/sksl_interp.sksl
1474+
FILE: ../../../third_party/skia/src/sksl/sksl_pipeline.sksl
1475+
FILE: ../../../third_party/skia/src/sksl/sksl_vert.sksl
14641476
----------------------------------------------------------------------------------------------------
14651477
Copyright (c) 2011 Google Inc. All rights reserved.
14661478

@@ -3814,6 +3826,8 @@ FILE: ../../../third_party/skia/src/sksl/SkSLSectionAndParameterHelper.h
38143826
FILE: ../../../third_party/skia/src/sksl/SkSLString.cpp
38153827
FILE: ../../../third_party/skia/src/sksl/SkSLString.h
38163828
FILE: ../../../third_party/skia/src/sksl/SkSLStringStream.h
3829+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_fp.c.inc
3830+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_fp.sksl
38173831
FILE: ../../../third_party/skia/src/sksl/ir/SkSLEnum.h
38183832
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSetting.cpp
38193833
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwitchCase.h
@@ -3830,7 +3844,6 @@ FILE: ../../../third_party/skia/src/sksl/lex/RegexNode.cpp
38303844
FILE: ../../../third_party/skia/src/sksl/lex/RegexNode.h
38313845
FILE: ../../../third_party/skia/src/sksl/lex/RegexParser.cpp
38323846
FILE: ../../../third_party/skia/src/sksl/lex/RegexParser.h
3833-
FILE: ../../../third_party/skia/src/sksl/sksl_enums.inc
38343847
FILE: ../../../third_party/skia/src/utils/SkFloatToDecimal.cpp
38353848
FILE: ../../../third_party/skia/src/utils/SkFloatToDecimal.h
38363849
FILE: ../../../third_party/skia/src/utils/SkJSONWriter.cpp
@@ -3971,6 +3984,8 @@ FILE: ../../../third_party/skia/src/gpu/vk/GrVkManagedResource.h
39713984
FILE: ../../../third_party/skia/src/image/SkRescaleAndReadPixels.cpp
39723985
FILE: ../../../third_party/skia/src/image/SkRescaleAndReadPixels.h
39733986
FILE: ../../../third_party/skia/src/sksl/SkSLAnalysis.h
3987+
FILE: ../../../third_party/skia/src/sksl/SkSLDehydrator.cpp
3988+
FILE: ../../../third_party/skia/src/sksl/SkSLDehydrator.h
39743989
FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.cpp
39753990
FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.h
39763991
FILE: ../../../third_party/skia/src/sksl/SkSLSampleUsage.cpp
@@ -5539,6 +5554,8 @@ FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeTessellateShader.cpp
55395554
FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeTessellateShader.h
55405555
FILE: ../../../third_party/skia/src/opts/SkVM_opts.h
55415556
FILE: ../../../third_party/skia/src/sksl/SkSLAnalysis.cpp
5557+
FILE: ../../../third_party/skia/src/sksl/SkSLRehydrator.cpp
5558+
FILE: ../../../third_party/skia/src/sksl/SkSLRehydrator.h
55425559
----------------------------------------------------------------------------------------------------
55435560
Copyright 2020 Google LLC.
55445561

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

57495766
====================================================================================================
57505767
LIBRARY: skia
5751-
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAPISkDescriptor.cpp + ../../../third_party/skia/LICENSE
5768+
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp + ../../../third_party/skia/LICENSE
57525769
TYPE: LicenseType.bsd
5753-
FILE: ../../../third_party/skia/fuzz/FuzzSkDescriptor.cpp
5754-
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAPISkDescriptor.cpp
57555770
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp
57565771
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp
57575772
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp

0 commit comments

Comments
 (0)