Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 15768e5

Browse files
Roll Skia from f1b5383 to db0288d (7 revisions) (#21910)
1 parent 5355f27 commit 15768e5

File tree

2 files changed

+85
-56
lines changed

2 files changed

+85
-56
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
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': 'f1b53836b70549fb9e0a0f0358b6dbf676d35f41',
29+
'skia_revision': 'db0288d747ae84e8cfb577f70953c1d56eb78110',
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

Lines changed: 84 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: a21a1a69f9d735a406af72e69b6ae7e7
1+
Signature: f6b15586236bf4f932f5c03ac999ee73
22

33
UNUSED LICENSES:
44

@@ -435,49 +435,6 @@ FILE: ../../../third_party/skia/bench/StreamBench.cpp
435435
FILE: ../../../third_party/skia/bench/SwizzleBench.cpp
436436
FILE: ../../../third_party/skia/bench/TileImageFilterBench.cpp
437437
FILE: ../../../third_party/skia/bench/VertexColorSpaceBench.cpp
438-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGAttribute.cpp
439-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGAttribute.h
440-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGAttributeParser.cpp
441-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGAttributeParser.h
442-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGCircle.cpp
443-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGCircle.h
444-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGClipPath.cpp
445-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGClipPath.h
446-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGContainer.cpp
447-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGContainer.h
448-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGDOM.cpp
449-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGDOM.h
450-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGDefs.h
451-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGEllipse.cpp
452-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGEllipse.h
453-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGG.h
454-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGHiddenContainer.h
455-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGIDMapper.h
456-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGLine.cpp
457-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGLine.h
458-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGLinearGradient.cpp
459-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGLinearGradient.h
460-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGNode.cpp
461-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGNode.h
462-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGPath.cpp
463-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGPath.h
464-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGPoly.cpp
465-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGPoly.h
466-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGRect.cpp
467-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGRect.h
468-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGRenderContext.cpp
469-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGRenderContext.h
470-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGSVG.cpp
471-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGSVG.h
472-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGShape.cpp
473-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGShape.h
474-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGStop.cpp
475-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGStop.h
476-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGTransformableNode.cpp
477-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGTransformableNode.h
478-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGTypes.h
479-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGValue.cpp
480-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGValue.h
481438
FILE: ../../../third_party/skia/experimental/xps_to_png/xps_to_png.cs
482439
FILE: ../../../third_party/skia/fuzz/Fuzz.cpp
483440
FILE: ../../../third_party/skia/fuzz/Fuzz.h
@@ -554,6 +511,49 @@ FILE: ../../../third_party/skia/modules/sksg/samples/SampleSVGPong.cpp
554511
FILE: ../../../third_party/skia/modules/skshaper/include/SkShaper.h
555512
FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp
556513
FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper_primitive.cpp
514+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGAttribute.h
515+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGAttributeParser.h
516+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGCircle.h
517+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGClipPath.h
518+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGContainer.h
519+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGDOM.h
520+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGDefs.h
521+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGEllipse.h
522+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGG.h
523+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGHiddenContainer.h
524+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGIDMapper.h
525+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGLine.h
526+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGLinearGradient.h
527+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGNode.h
528+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGPath.h
529+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGPoly.h
530+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGRect.h
531+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGRenderContext.h
532+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGSVG.h
533+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGShape.h
534+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGStop.h
535+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGTransformableNode.h
536+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGTypes.h
537+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGValue.h
538+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGAttribute.cpp
539+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGAttributeParser.cpp
540+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGCircle.cpp
541+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGClipPath.cpp
542+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGContainer.cpp
543+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGDOM.cpp
544+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGEllipse.cpp
545+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGLine.cpp
546+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGLinearGradient.cpp
547+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGNode.cpp
548+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGPath.cpp
549+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGPoly.cpp
550+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGRect.cpp
551+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGRenderContext.cpp
552+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGSVG.cpp
553+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGShape.cpp
554+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGStop.cpp
555+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGTransformableNode.cpp
556+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGValue.cpp
557557
FILE: ../../../third_party/skia/samplecode/DecodeFile.h
558558
FILE: ../../../third_party/skia/samplecode/Sample.cpp
559559
FILE: ../../../third_party/skia/samplecode/SampleAndroidShadows.cpp
@@ -3020,8 +3020,6 @@ FILE: ../../../third_party/skia/experimental/ffmpeg/SkVideoDecoder.cpp
30203020
FILE: ../../../third_party/skia/experimental/ffmpeg/SkVideoDecoder.h
30213021
FILE: ../../../third_party/skia/experimental/ffmpeg/SkVideoEncoder.cpp
30223022
FILE: ../../../third_party/skia/experimental/ffmpeg/SkVideoEncoder.h
3023-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGText.cpp
3024-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGText.h
30253023
FILE: ../../../third_party/skia/gm/backdrop.cpp
30263024
FILE: ../../../third_party/skia/gm/backdrop_imagefilter_croprect.cpp
30273025
FILE: ../../../third_party/skia/gm/bug9331.cpp
@@ -3092,6 +3090,8 @@ FILE: ../../../third_party/skia/modules/sksg/include/SkSGRenderEffect.h
30923090
FILE: ../../../third_party/skia/modules/sksg/src/SkSGNodePriv.h
30933091
FILE: ../../../third_party/skia/modules/sksg/src/SkSGRenderEffect.cpp
30943092
FILE: ../../../third_party/skia/modules/sksg/src/SkSGTransformPriv.h
3093+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGText.h
3094+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGText.cpp
30953095
FILE: ../../../third_party/skia/samplecode/SampleDegenerateQuads.cpp
30963096
FILE: ../../../third_party/skia/samplecode/SampleSG.cpp
30973097
FILE: ../../../third_party/skia/samplecode/SampleThinAA.cpp
@@ -3578,14 +3578,6 @@ FILE: ../../../third_party/skia/bin/sysopen
35783578
FILE: ../../../third_party/skia/dm/DMGpuTestProcs.cpp
35793579
FILE: ../../../third_party/skia/example/HelloWorld.cpp
35803580
FILE: ../../../third_party/skia/example/HelloWorld.h
3581-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGGradient.cpp
3582-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGGradient.h
3583-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGPattern.cpp
3584-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGPattern.h
3585-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGRadialGradient.cpp
3586-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGRadialGradient.h
3587-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGUse.cpp
3588-
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGUse.h
35893581
FILE: ../../../third_party/skia/fuzz/FuzzCanvas.cpp
35903582
FILE: ../../../third_party/skia/gm/alpha_image.cpp
35913583
FILE: ../../../third_party/skia/gm/bitmaptiled.cpp
@@ -3674,6 +3666,14 @@ FILE: ../../../third_party/skia/modules/sksg/src/SkSGPath.cpp
36743666
FILE: ../../../third_party/skia/modules/sksg/src/SkSGRect.cpp
36753667
FILE: ../../../third_party/skia/modules/sksg/src/SkSGRenderNode.cpp
36763668
FILE: ../../../third_party/skia/modules/sksg/src/SkSGTransform.cpp
3669+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGGradient.h
3670+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGPattern.h
3671+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGRadialGradient.h
3672+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGUse.h
3673+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGGradient.cpp
3674+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGPattern.cpp
3675+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGRadialGradient.cpp
3676+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGUse.cpp
36773677
FILE: ../../../third_party/skia/samplecode/SampleCCPRGeometry.cpp
36783678
FILE: ../../../third_party/skia/samplecode/SampleChineseFling.cpp
36793679
FILE: ../../../third_party/skia/samplecode/SampleCowboy.cpp
@@ -4065,7 +4065,35 @@ FILE: ../../../third_party/skia/experimental/skrive/src/reader/BinaryReader.cpp
40654065
FILE: ../../../third_party/skia/experimental/skrive/src/reader/JsonReader.cpp
40664066
FILE: ../../../third_party/skia/experimental/skrive/src/reader/StreamReader.cpp
40674067
FILE: ../../../third_party/skia/experimental/skrive/src/reader/StreamReader.h
4068-
FILE: ../../../third_party/skia/experimental/svg/utils/SvgTool.cpp
4068+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGAttribute.h
4069+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGAttributeParser.h
4070+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGCircle.h
4071+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGClipPath.h
4072+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGContainer.h
4073+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGDOM.h
4074+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGDefs.h
4075+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGEllipse.h
4076+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGG.h
4077+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGGradient.h
4078+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGHiddenContainer.h
4079+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGIDMapper.h
4080+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGLine.h
4081+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGLinearGradient.h
4082+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGNode.h
4083+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGPath.h
4084+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGPattern.h
4085+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGPoly.h
4086+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGRadialGradient.h
4087+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGRect.h
4088+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGRenderContext.h
4089+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGSVG.h
4090+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGShape.h
4091+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGStop.h
4092+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGText.h
4093+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGTransformableNode.h
4094+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGTypes.h
4095+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGUse.h
4096+
FILE: ../../../third_party/skia/experimental/svg/model/SkSVGValue.h
40694097
FILE: ../../../third_party/skia/gm/3d.cpp
40704098
FILE: ../../../third_party/skia/gm/bc1_transparency.cpp
40714099
FILE: ../../../third_party/skia/gm/bicubic.cpp
@@ -4129,6 +4157,7 @@ FILE: ../../../third_party/skia/modules/sksg/src/SkSGGeometryEffect.cpp
41294157
FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper_coretext.cpp
41304158
FILE: ../../../third_party/skia/modules/skshaper/src/SkUnicode.h
41314159
FILE: ../../../third_party/skia/modules/skshaper/src/SkUnicode_icu.cpp
4160+
FILE: ../../../third_party/skia/modules/svg/utils/SvgTool.cpp
41324161
FILE: ../../../third_party/skia/samplecode/Sample3D.cpp
41334162
FILE: ../../../third_party/skia/samplecode/SampleAudio.cpp
41344163
FILE: ../../../third_party/skia/samplecode/SampleFitCubicToCircle.cpp

0 commit comments

Comments
 (0)