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': 'ad653d8378d7a17502956c4addebb68eb3129961',
'skia_revision': '44e2c5f0babca7ff824a65b615b4c2ac7e195470',

# 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
15 changes: 14 additions & 1 deletion ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 2da5a3733cfc3ee9d4098855a1f98d15
Signature: caaa39a35d2a0fc07b167319cbd93823

UNUSED LICENSES:

Expand Down Expand Up @@ -1070,6 +1070,8 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.ex
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Debug-Docker.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Release-NoGPU_Docker.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Release-Shared_Docker.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm-Debug-iOS.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Android_Vulkan.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json
Expand Down Expand Up @@ -1237,6 +1239,7 @@ FILE: ../../../third_party/skia/infra/canvaskit/docker/canvaskit-emsdk/Dockerfil
FILE: ../../../third_party/skia/infra/config/recipes.cfg
FILE: ../../../third_party/skia/infra/cross-compile/docker/cross-linux-arm64/Dockerfile
FILE: ../../../third_party/skia/infra/cts/whitelist_devices.json
FILE: ../../../third_party/skia/infra/docker/debian9/Dockerfile
FILE: ../../../third_party/skia/infra/gcc/Debian10-mips64el/Dockerfile
FILE: ../../../third_party/skia/infra/gcc/Debian10-x86/Dockerfile
FILE: ../../../third_party/skia/infra/gcc/Debian10/Dockerfile
Expand Down Expand Up @@ -3914,11 +3917,17 @@ FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DTypesPriv.cpp
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DUtil.cpp
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DUtil.h
FILE: ../../../third_party/skia/src/gpu/effects/GrDeviceSpaceEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrMatrixEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrDeviceSpaceEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrDeviceSpaceEffect.h
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrMatrixEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrMatrixEffect.h
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLUniformHandler.cpp
FILE: ../../../third_party/skia/src/gpu/vk/GrVkManagedResource.h
FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.h
FILE: ../../../third_party/skia/src/sksl/SkSLSampleMatrix.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLSampleMatrix.h
----------------------------------------------------------------------------------------------------
Copyright 2020 Google LLC

Expand Down Expand Up @@ -5033,6 +5042,8 @@ FILE: ../../../third_party/skia/gm/fpcoordinateoverride.cpp
FILE: ../../../third_party/skia/gm/inverseclip.cpp
FILE: ../../../third_party/skia/gm/labyrinth.cpp
FILE: ../../../third_party/skia/gm/preservefillrule.cpp
FILE: ../../../third_party/skia/gm/sample_matrix_constant.cpp
FILE: ../../../third_party/skia/gm/sample_matrix_variable.cpp
FILE: ../../../third_party/skia/gm/tilemodes_alpha.cpp
FILE: ../../../third_party/skia/include/core/SkPathTypes.h
FILE: ../../../third_party/skia/modules/skplaintexteditor/app/editor_application.cpp
Expand Down Expand Up @@ -5627,6 +5638,8 @@ FILE: ../../../third_party/skia/src/core/SkColorFilterPriv.h
FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.cpp
FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.h
FILE: ../../../third_party/skia/src/core/SkM44.cpp
FILE: ../../../third_party/skia/src/core/SkMarkerStack.cpp
FILE: ../../../third_party/skia/src/core/SkMarkerStack.h
FILE: ../../../third_party/skia/src/core/SkVerticesPriv.h
FILE: ../../../third_party/skia/src/gpu/GrDynamicAtlas.cpp
FILE: ../../../third_party/skia/src/gpu/GrDynamicAtlas.h
Expand Down