Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Roll Skia from 4d35c0d31d79 to 3ad6e531c331 (25 revisions) #30302

Merged
merged 1 commit into from Dec 13, 2021
Merged

Roll Skia from 4d35c0d31d79 to 3ad6e531c331 (25 revisions) #30302

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
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': '4d35c0d31d796ddae828089ceb7ce8c2153d3839',
'skia_revision': '3ad6e531c33128b277d19ca66c57d5378a9aa966',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down
21 changes: 13 additions & 8 deletions ci/licenses_golden/licenses_skia
View file
Open in desktop
@@ -1,4 +1,4 @@
Signature: 98135a96c9877518d6eca9969b8ae7cb
Signature: 6972ed34783c82e2d1ec328f95217258

UNUSED LICENSES:

Expand Down Expand Up @@ -2564,6 +2564,7 @@ FILE: ../../../third_party/skia/gm/particles.cpp
FILE: ../../../third_party/skia/include/core/SkBlender.h
FILE: ../../../third_party/skia/include/effects/SkBlenders.h
FILE: ../../../third_party/skia/include/gpu/GrSurfaceInfo.h
FILE: ../../../third_party/skia/include/gpu/ShaderErrorHandler.h
FILE: ../../../third_party/skia/include/gpu/gl/egl/GrGLMakeEGLInterface.h
FILE: ../../../third_party/skia/include/gpu/gl/glx/GrGLMakeGLXInterface.h
FILE: ../../../third_party/skia/include/private/GrDawnTypesPriv.h
Expand Down Expand Up @@ -2598,6 +2599,7 @@ FILE: ../../../third_party/skia/src/gpu/GrWritePixelsRenderTask.cpp
FILE: ../../../third_party/skia/src/gpu/GrWritePixelsRenderTask.h
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.cpp
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.h
FILE: ../../../third_party/skia/src/gpu/ShaderErrorHandler.cpp
FILE: ../../../third_party/skia/src/gpu/SurfaceFillContext.cpp
FILE: ../../../third_party/skia/src/gpu/SurfaceFillContext.h
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DTypesPriv.cpp
Expand Down Expand Up @@ -2627,8 +2629,6 @@ FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsConstantExpression.cpp
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLProgramUsage.cpp
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLProgramVisitor.h
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLSwitchCaseContainsExit.cpp
FILE: ../../../third_party/skia/src/sksl/codegen/SkVMDebugTrace.cpp
FILE: ../../../third_party/skia/src/sksl/codegen/SkVMDebugTrace.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLBinaryExpression.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLBlock.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLChildCall.cpp
Expand Down Expand Up @@ -2666,6 +2666,10 @@ FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwizzle.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLTernaryExpression.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLTypeReference.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLVarDeclarations.cpp
FILE: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTrace.cpp
FILE: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTrace.h
FILE: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.cpp
FILE: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.h
FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateDeadFunctions.cpp
FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateDeadGlobalVariables.cpp
FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateDeadLocalVariables.cpp
Expand Down Expand Up @@ -2973,8 +2977,8 @@ FILE: ../../../third_party/skia/src/gpu/text/GrStrikeCache.cpp
FILE: ../../../third_party/skia/src/gpu/text/GrStrikeCache.h
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlob.cpp
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlob.h
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobCache.cpp
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobCache.h
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobRedrawCoordinator.cpp
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobRedrawCoordinator.h
FILE: ../../../third_party/skia/src/gpu/v1/Device_drawTexture.cpp
FILE: ../../../third_party/skia/src/gpu/v1/SurfaceDrawContext.cpp
FILE: ../../../third_party/skia/src/gpu/v1/SurfaceDrawContext_v1.h
Expand Down Expand Up @@ -3332,8 +3336,6 @@ FILE: ../../../third_party/skia/src/gpu/GrProgramInfo.cpp
FILE: ../../../third_party/skia/src/gpu/GrProgramInfo.h
FILE: ../../../third_party/skia/src/gpu/GrRenderTask.cpp
FILE: ../../../third_party/skia/src/gpu/GrRenderTask.h
FILE: ../../../third_party/skia/src/gpu/GrShaderUtils.cpp
FILE: ../../../third_party/skia/src/gpu/GrShaderUtils.h
FILE: ../../../third_party/skia/src/gpu/GrSurfaceProxyView.h
FILE: ../../../third_party/skia/src/gpu/GrSwizzle.cpp
FILE: ../../../third_party/skia/src/gpu/GrTextureResolveManager.h
Expand All @@ -3357,6 +3359,8 @@ FILE: ../../../third_party/skia/src/gpu/mock/GrMockTypes.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLExternalFunction.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLExternalFunctionCall.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLExternalFunctionReference.h
FILE: ../../../third_party/skia/src/utils/SkShaderUtils.cpp
FILE: ../../../third_party/skia/src/utils/SkShaderUtils.h
----------------------------------------------------------------------------------------------------
Copyright 2019 Google LLC

Expand Down Expand Up @@ -3509,6 +3513,7 @@ FILE: ../../../third_party/skia/src/codec/SkParseEncodedOrigin.cpp
FILE: ../../../third_party/skia/src/codec/SkWuffsCodec.cpp
FILE: ../../../third_party/skia/src/codec/SkWuffsCodec.h
FILE: ../../../third_party/skia/src/core/SkCanvasPriv.cpp
FILE: ../../../third_party/skia/src/core/SkChromeRemoteGlyphCache.cpp
FILE: ../../../third_party/skia/src/core/SkColorSpaceXformSteps.cpp
FILE: ../../../third_party/skia/src/core/SkColorSpaceXformSteps.h
FILE: ../../../third_party/skia/src/core/SkContourMeasure.cpp
Expand All @@ -3525,7 +3530,6 @@ FILE: ../../../third_party/skia/src/core/SkPath_serial.cpp
FILE: ../../../third_party/skia/src/core/SkPicturePriv.h
FILE: ../../../third_party/skia/src/core/SkRRectPriv.h
FILE: ../../../third_party/skia/src/core/SkRectPriv.h
FILE: ../../../third_party/skia/src/core/SkRemoteGlyphCache.cpp
FILE: ../../../third_party/skia/src/core/SkRemoteGlyphCache.h
FILE: ../../../third_party/skia/src/core/SkSafeRange.h
FILE: ../../../third_party/skia/src/core/SkStrikeCache.cpp
Expand Down Expand Up @@ -6063,6 +6067,7 @@ FILE: ../../../third_party/skia/gm/dsl_processor_test.cpp
FILE: ../../../third_party/skia/include/core/SkStringView.h
FILE: ../../../third_party/skia/include/private/SkSLProgramKind.h
FILE: ../../../third_party/skia/include/private/SkTOptional.h
FILE: ../../../third_party/skia/include/private/chromium/SkChromeRemoteGlyphCache.h
FILE: ../../../third_party/skia/include/sksl/DSLBlock.h
FILE: ../../../third_party/skia/include/sksl/DSLCase.h
FILE: ../../../third_party/skia/include/sksl/DSLFunction.h
Expand Down