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 @@ -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': 'c5d3326d767d262e9f92f308ea6811ddf03ed834',
'skia_revision': 'b6dfd97c52906c1748b9c2a2406eea44a8daf96c',

# 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
4 changes: 3 additions & 1 deletion ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 034a18b08e17e7f9233edb75a9a8dd48
Signature: 73ec28a544af6c4f53d57c7ff43fa7f0

UNUSED LICENSES:

Expand Down Expand Up @@ -5640,6 +5640,7 @@ FILE: ../../../third_party/skia/src/sksl/SkSLGLSL.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLExpression.cpp
FILE: ../../../third_party/skia/src/sksl/lex/TransitionTable.cpp
FILE: ../../../third_party/skia/src/sksl/lex/TransitionTable.h
FILE: ../../../third_party/skia/src/utils/SkCycles.h
FILE: ../../../third_party/skia/src/utils/SkOrderedFontMgr.cpp
----------------------------------------------------------------------------------------------------
Copyright 2021 Google Inc.
Expand Down Expand Up @@ -6526,6 +6527,7 @@ LIBRARY: skia
ORIGIN: ../../../third_party/skia/gm/drawlines_with_local_matrix.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/gm/drawlines_with_local_matrix.cpp
FILE: ../../../third_party/skia/src/utils/SkBlitterTrace.h
----------------------------------------------------------------------------------------------------
Copyright 2022 Google Inc.

Expand Down