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

Roll Skia from 07ee548d5bcd to da076e9aca26 (41 revisions) #24914

Merged
merged 1 commit into from
Mar 10, 2021
Merged

Roll Skia from 07ee548d5bcd to da076e9aca26 (41 revisions) #24914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,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': '07ee548d5bcdbd4b1f0c431c3f130b5994e5d1b5',
'skia_revision': 'da076e9aca262bbb6f4373258adafdb52e6255bc',

# 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
26 changes: 8 additions & 18 deletions ci/licenses_golden/licenses_skia
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: a83a79bedff1fd89b89bd84368638c40
Signature: e3074298b6c83c55f824c83a019e656f

UNUSED LICENSES:

Expand Down Expand Up @@ -502,8 +502,12 @@ FILE: ../../../third_party/skia/include/ports/SkImageGeneratorWIC.h
FILE: ../../../third_party/skia/include/private/GrSingleOwner.h
FILE: ../../../third_party/skia/include/private/SkBitmaskEnum.h
FILE: ../../../third_party/skia/include/private/SkEncodedInfo.h
FILE: ../../../third_party/skia/include/private/SkSLIRNode.h
FILE: ../../../third_party/skia/include/private/SkSLLayout.h
FILE: ../../../third_party/skia/include/private/SkSLModifiers.h
FILE: ../../../third_party/skia/include/private/SkSLProgramElement.h
FILE: ../../../third_party/skia/include/private/SkSLStatement.h
FILE: ../../../third_party/skia/include/private/SkSLSymbol.h
FILE: ../../../third_party/skia/include/private/SkSafe_math.h
FILE: ../../../third_party/skia/include/utils/SkNoDrawCanvas.h
FILE: ../../../third_party/skia/modules/sksg/samples/SampleSVGPong.cpp
Expand Down Expand Up @@ -764,7 +768,6 @@ FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionCall.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDefinition.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionReference.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLIRNode.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLIfStatement.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLIndexExpression.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLIntLiteral.h
Expand All @@ -774,13 +777,10 @@ FILE: ../../../third_party/skia/src/sksl/ir/SkSLNop.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLPostfixExpression.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLPrefixExpression.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLProgram.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLProgramElement.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLReturnStatement.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSection.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSetting.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLStatement.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwizzle.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSymbol.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSymbolTable.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSymbolTable.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLTernaryExpression.h
Expand Down Expand Up @@ -1299,7 +1299,6 @@ FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/preamble.js
FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/radialgradient.js
FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/util.js
FILE: ../../../third_party/skia/modules/canvaskit/interface.js
FILE: ../../../third_party/skia/modules/canvaskit/karma.bench.conf.js
FILE: ../../../third_party/skia/modules/canvaskit/karma.conf.js
FILE: ../../../third_party/skia/modules/canvaskit/karma.google3.conf.js
FILE: ../../../third_party/skia/modules/canvaskit/matrix.js
Expand All @@ -1309,17 +1308,6 @@ FILE: ../../../third_party/skia/modules/canvaskit/package.json
FILE: ../../../third_party/skia/modules/canvaskit/paragraph.js
FILE: ../../../third_party/skia/modules/canvaskit/particles.js
FILE: ../../../third_party/skia/modules/canvaskit/pathops.js
FILE: ../../../third_party/skia/modules/canvaskit/perf/animation.bench.js
FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/confetti.json
FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/drinks.json
FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/lego_loader.json
FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/onboarding.json
FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/test_1500x959.jpg
FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/test_512x512.png
FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/test_64x64.png
FILE: ../../../third_party/skia/modules/canvaskit/perf/canvas.bench.js
FILE: ../../../third_party/skia/modules/canvaskit/perf/matrix.bench.js
FILE: ../../../third_party/skia/modules/canvaskit/perf/perfReporter.js
FILE: ../../../third_party/skia/modules/canvaskit/postamble.js
FILE: ../../../third_party/skia/modules/canvaskit/preamble.js
FILE: ../../../third_party/skia/modules/canvaskit/release.js
Expand Down Expand Up @@ -3393,14 +3381,14 @@ FILE: ../../../third_party/skia/modules/svg/src/SkSVGGradient.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGPattern.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGRadialGradient.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGUse.cpp
FILE: ../../../third_party/skia/samplecode/SampleCCPRGeometry.cpp
FILE: ../../../third_party/skia/samplecode/SampleChineseFling.cpp
FILE: ../../../third_party/skia/samplecode/SampleCowboy.cpp
FILE: ../../../third_party/skia/samplecode/SampleMixer.cpp
FILE: ../../../third_party/skia/samplecode/SamplePathText.cpp
FILE: ../../../third_party/skia/samplecode/SampleShadowColor.cpp
FILE: ../../../third_party/skia/samplecode/SampleShadowReference.cpp
FILE: ../../../third_party/skia/samplecode/SampleShadowUtils.cpp
FILE: ../../../third_party/skia/samplecode/SampleStrokeVerb.cpp
FILE: ../../../third_party/skia/src/android/SkAndroidFrameworkUtils.cpp
FILE: ../../../third_party/skia/src/c/sk_effects.cpp
FILE: ../../../third_party/skia/src/codec/SkBmpBaseCodec.cpp
Expand Down Expand Up @@ -5221,8 +5209,10 @@ FILE: ../../../third_party/skia/src/sksl/SkSLOperators.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLBinaryExpression.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLDoStatement.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLExpressionStatement.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFieldAccess.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLForStatement.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLIfStatement.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLIndexExpression.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLPostfixExpression.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwitchStatement.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwizzle.cpp
Expand Down