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

Roll Skia from 4a375fe2138e to 383d46895d63 (5 revisions) #34100

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': '4a375fe2138efdb7d8fc5ab2c1acabb71369bcad',
'skia_revision': '383d46895d630077dff52ff0ccf4ef7881e0df08',

# 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
14 changes: 9 additions & 5 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: e9a2c0a84a597b33e1f49f60d2453641
Signature: b61b57de5924478cf48ce30a8e467744

UNUSED LICENSES:

Expand Down Expand Up @@ -1340,7 +1340,6 @@ FILE: ../../../third_party/skia/src/sksl/sksl_rt_shader.sksl
FILE: ../../../third_party/skia/src/sksl/sksl_vert.sksl
FILE: ../../../third_party/skia/src/sksl/tracing/BUILD.bazel
FILE: ../../../third_party/skia/src/sksl/transform/BUILD.bazel
FILE: ../../../third_party/skia/src/text/BUILD.bazel
FILE: ../../../third_party/skia/src/text/gpu/BUILD.bazel
FILE: ../../../third_party/skia/src/utils/BUILD.bazel
FILE: ../../../third_party/skia/src/xml/BUILD.bazel
Expand Down Expand Up @@ -2661,6 +2660,7 @@ FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTexture.mm
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTypesPriv.mm
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlUtils.h
FILE: ../../../third_party/skia/src/gpu/graphite/render/StencilAndFillPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/render/TextRenderer.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h
FILE: ../../../third_party/skia/src/sksl/SkSLContext.cpp
Expand Down Expand Up @@ -5954,6 +5954,10 @@ FILE: ../../../third_party/skia/src/gpu/graphite/render/TessellateStrokesRenderS
FILE: ../../../third_party/skia/src/gpu/graphite/render/TessellateStrokesRenderStep.h
FILE: ../../../third_party/skia/src/gpu/graphite/render/TessellateWedgesRenderStep.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/render/TessellateWedgesRenderStep.h
FILE: ../../../third_party/skia/src/gpu/graphite/render/TextDirectRenderStep.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/render/TextDirectRenderStep.h
FILE: ../../../third_party/skia/src/gpu/graphite/render/TextSDFRenderStep.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/render/TextSDFRenderStep.h
FILE: ../../../third_party/skia/src/gpu/graphite/text/AtlasManager.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/text/AtlasManager.h
FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.cpp
Expand Down Expand Up @@ -7496,12 +7500,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/core/SkGlyphRunPainter.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkGlyphRun.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/core/SkGlyphRun.cpp
FILE: ../../../third_party/skia/src/core/SkGlyphRun.h
FILE: ../../../third_party/skia/src/core/SkGlyphRunPainter.cpp
FILE: ../../../third_party/skia/src/core/SkGlyphRunPainter.h
FILE: ../../../third_party/skia/src/text/GlyphRun.cpp
FILE: ../../../third_party/skia/src/text/GlyphRun.h
----------------------------------------------------------------------------------------------------
Copyright 2018 The Android Open Source Project

Expand Down