Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
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': 'dffd20efe95cfa6c4d928c9091c99825ab7b4a3c',
'skia_revision': '6e7cfaff1817d0ba84f21ea63c5ff3406eac4222',

# 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
9 changes: 8 additions & 1 deletion ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 801073172844be73f22cf6570c46d92b
Signature: 589a2c09272ababc6e8f919d9788718e

UNUSED LICENSES:

Expand Down Expand Up @@ -3892,6 +3892,7 @@ FILE: ../../../third_party/skia/bench/GrQuadBench.cpp
FILE: ../../../third_party/skia/bench/SkSLBench.h
FILE: ../../../third_party/skia/experimental/skottiekit/skottiekit_bindings.cpp
FILE: ../../../third_party/skia/gm/crbug_1041204.cpp
FILE: ../../../third_party/skia/gm/crbug_1139750.cpp
FILE: ../../../third_party/skia/gm/crbug_224618.cpp
FILE: ../../../third_party/skia/gm/encode_color_types.cpp
FILE: ../../../third_party/skia/gm/userfont.cpp
Expand All @@ -3912,6 +3913,7 @@ FILE: ../../../third_party/skia/modules/canvaskit/gm_bindings.cpp
FILE: ../../../third_party/skia/modules/canvaskit/viewer_bindings.cpp
FILE: ../../../third_party/skia/modules/canvaskit/wasm_tools/SIMD/simd_float_capabilities.cpp
FILE: ../../../third_party/skia/modules/canvaskit/wasm_tools/SIMD/simd_int_capabilities.cpp
FILE: ../../../third_party/skia/src/core/SkASAN.h
FILE: ../../../third_party/skia/src/core/SkIDChangeListener.cpp
FILE: ../../../third_party/skia/src/core/SkMatrixProvider.h
FILE: ../../../third_party/skia/src/core/SkRuntimeEffectPriv.h
Expand Down Expand Up @@ -4011,6 +4013,7 @@ FILE: ../../../third_party/skia/src/sksl/SkSLPool.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
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLInlineMarker.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSymbolAlias.h
FILE: ../../../third_party/skia/src/utils/SkCustomTypeface.cpp
Expand Down Expand Up @@ -4051,6 +4054,7 @@ LIBRARY: skia
ORIGIN: ../../../third_party/skia/bench/GlyphQuadFillBench.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/bench/GlyphQuadFillBench.cpp
FILE: ../../../third_party/skia/bench/GrPathUtilsBench.cpp
FILE: ../../../third_party/skia/bench/TessellateBench.cpp
FILE: ../../../third_party/skia/experimental/skrive/include/SkRive.h
FILE: ../../../third_party/skia/experimental/skrive/src/Artboard.cpp
Expand Down Expand Up @@ -4133,9 +4137,11 @@ FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper_coretext.cpp
FILE: ../../../third_party/skia/modules/skshaper/src/SkUnicode.h
FILE: ../../../third_party/skia/modules/skshaper/src/SkUnicode_icu.cpp
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFe.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeTurbulence.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFilter.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFilterContext.h
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFe.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeTurbulence.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFilter.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFilterContext.cpp
FILE: ../../../third_party/skia/modules/svg/utils/SvgTool.cpp
Expand Down Expand Up @@ -5594,6 +5600,7 @@ FILE: ../../../third_party/skia/docs/examples/zero_off_dashing.cpp
FILE: ../../../third_party/skia/gm/gpu_blur_utils.cpp
FILE: ../../../third_party/skia/src/gpu/GrFinishCallbacks.cpp
FILE: ../../../third_party/skia/src/gpu/GrFinishCallbacks.h
FILE: ../../../third_party/skia/src/gpu/GrVx.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrFillPathShader.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrFillPathShader.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathShader.h
Expand Down