diff --git a/DEPS b/DEPS
index f71536fb6392e..a692269aefafa 100644
--- a/DEPS
+++ b/DEPS
@@ -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': '0582a9e6191ae01f978f6a9b41211372dacfe674',
+  'skia_revision': 'c6218799a6c7764c9c1e8284a09cf1cf3c57f332',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia
index ad1ab1f931de1..51db730268677 100644
--- a/ci/licenses_golden/licenses_skia
+++ b/ci/licenses_golden/licenses_skia
@@ -1,4 +1,4 @@
-Signature: 257b12b8461aceee936b1548cf699a61
+Signature: 866d05a7e4d888df2d5cf893e4d24f4b
 
 UNUSED LICENSES:
 
@@ -534,7 +534,6 @@ ORIGIN: ../../../third_party/skia/include/third_party/skcms/LICENSE
 TYPE: LicenseType.bsd
 FILE: ../../../third_party/skia/include/third_party/skcms/BUILD.bazel
 FILE: ../../../third_party/skia/include/third_party/vulkan/BUILD.bazel
-FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/BUILD.bazel
 FILE: ../../../third_party/skia/third_party/skcms/BUILD.bazel
 FILE: ../../../third_party/skia/third_party/skcms/version.sha1
 ----------------------------------------------------------------------------------------------------
@@ -754,7 +753,6 @@ FILE: ../../../third_party/skia/experimental/docs/jsonbaseddoc.htm
 FILE: ../../../third_party/skia/experimental/docs/svgBackend.js
 FILE: ../../../third_party/skia/experimental/docs/svgbaseddoc.htm
 FILE: ../../../third_party/skia/experimental/docs/utilities.js
-FILE: ../../../third_party/skia/experimental/ffmpeg/BUILD.bazel
 FILE: ../../../third_party/skia/experimental/sktext/editor/Cursor.cpp
 FILE: ../../../third_party/skia/experimental/sktext/editor/Cursor.h
 FILE: ../../../third_party/skia/experimental/sktext/editor/Defaults.h
@@ -799,13 +797,11 @@ FILE: ../../../third_party/skia/experimental/wasm-hello-world/BUILD.bazel
 FILE: ../../../third_party/skia/experimental/wasm-hello-world/hello_world.html
 FILE: ../../../third_party/skia/experimental/webgpu-bazel/example/index.html
 FILE: ../../../third_party/skia/experimental/webgpu-bazel/src/BUILD.bazel
-FILE: ../../../third_party/skia/gm/BUILD.bazel
-FILE: ../../../third_party/skia/gm/verifiers/BUILD.bazel
 FILE: ../../../third_party/skia/go.mod
 FILE: ../../../third_party/skia/go.sum
 FILE: ../../../third_party/skia/go_repositories.bzl
+FILE: ../../../third_party/skia/include/BUILD.bazel
 FILE: ../../../third_party/skia/include/android/BUILD.bazel
-FILE: ../../../third_party/skia/include/c/BUILD.bazel
 FILE: ../../../third_party/skia/include/codec/BUILD.bazel
 FILE: ../../../third_party/skia/include/config/BUILD.bazel
 FILE: ../../../third_party/skia/include/core/BUILD.bazel
@@ -813,26 +809,20 @@ FILE: ../../../third_party/skia/include/docs/BUILD.bazel
 FILE: ../../../third_party/skia/include/effects/BUILD.bazel
 FILE: ../../../third_party/skia/include/encode/BUILD.bazel
 FILE: ../../../third_party/skia/include/gpu/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/d3d/BUILD.bazel
 FILE: ../../../third_party/skia/include/gpu/dawn/BUILD.bazel
 FILE: ../../../third_party/skia/include/gpu/gl/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/gl/egl/BUILD.bazel
 FILE: ../../../third_party/skia/include/gpu/gl/glx/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/graphite/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/graphite/mtl/BUILD.bazel
 FILE: ../../../third_party/skia/include/gpu/mock/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/mtl/BUILD.bazel
 FILE: ../../../third_party/skia/include/gpu/vk/BUILD.bazel
 FILE: ../../../third_party/skia/include/pathops/BUILD.bazel
 FILE: ../../../third_party/skia/include/ports/BUILD.bazel
 FILE: ../../../third_party/skia/include/private/BUILD.bazel
 FILE: ../../../third_party/skia/include/private/chromium/BUILD.bazel
+FILE: ../../../third_party/skia/include/private/gpu/BUILD.bazel
 FILE: ../../../third_party/skia/include/private/gpu/ganesh/BUILD.bazel
-FILE: ../../../third_party/skia/include/private/gpu/graphite/BUILD.bazel
 FILE: ../../../third_party/skia/include/sksl/BUILD.bazel
 FILE: ../../../third_party/skia/include/svg/BUILD.bazel
 FILE: ../../../third_party/skia/include/utils/BUILD.bazel
-FILE: ../../../third_party/skia/include/utils/mac/BUILD.bazel
 FILE: ../../../third_party/skia/infra/bots/BUILD.bazel
 FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_darwin/VERSION
 FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_linux/VERSION
@@ -1268,52 +1258,36 @@ FILE: ../../../third_party/skia/site/featured-background.png
 FILE: ../../../third_party/skia/specs/web-img-decode/current/index.html
 FILE: ../../../third_party/skia/specs/web-img-decode/proposed/impl/impl.js
 FILE: ../../../third_party/skia/specs/web-img-decode/proposed/index.html
+FILE: ../../../third_party/skia/src/BUILD.bazel
 FILE: ../../../third_party/skia/src/android/BUILD.bazel
-FILE: ../../../third_party/skia/src/c/BUILD.bazel
 FILE: ../../../third_party/skia/src/codec/BUILD.bazel
 FILE: ../../../third_party/skia/src/core/BUILD.bazel
 FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h
 FILE: ../../../third_party/skia/src/effects/BUILD.bazel
 FILE: ../../../third_party/skia/src/effects/imagefilters/BUILD.bazel
-FILE: ../../../third_party/skia/src/fonts/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/effects/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/gl/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/android/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/gl/builders/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/egl/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/glfw/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/gl/glx/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/iOS/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/mac/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/gl/webgl/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/win/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/gradients/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/mock/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/ops/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/text/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/v1/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/ganesh/vk/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/gl/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/graphite/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/graphite/geom/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/graphite/render/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/tessellate/BUILD.bazel
 FILE: ../../../third_party/skia/src/gpu/vk/BUILD.bazel
 FILE: ../../../third_party/skia/src/image/BUILD.bazel
 FILE: ../../../third_party/skia/src/images/BUILD.bazel
-FILE: ../../../third_party/skia/src/lazy/BUILD.bazel
 FILE: ../../../third_party/skia/src/opts/BUILD.bazel
 FILE: ../../../third_party/skia/src/pathops/BUILD.bazel
-FILE: ../../../third_party/skia/src/pdf/BUILD.bazel
 FILE: ../../../third_party/skia/src/ports/BUILD.bazel
 FILE: ../../../third_party/skia/src/ports/SkTLS_pthread.cpp
 FILE: ../../../third_party/skia/src/ports/SkTLS_win.cpp
@@ -1346,15 +1320,9 @@ 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/svg/BUILD.bazel
 FILE: ../../../third_party/skia/src/text/gpu/BUILD.bazel
 FILE: ../../../third_party/skia/src/utils/BUILD.bazel
-FILE: ../../../third_party/skia/src/utils/mac/BUILD.bazel
-FILE: ../../../third_party/skia/src/utils/win/BUILD.bazel
-FILE: ../../../third_party/skia/src/xml/BUILD.bazel
-FILE: ../../../third_party/skia/src/xps/BUILD.bazel
 FILE: ../../../third_party/skia/third_party/BUILD.bazel
-FILE: ../../../third_party/skia/third_party/file_map_for_bazel.json
 FILE: ../../../third_party/skia/toolchain/BUILD.bazel
 FILE: ../../../third_party/skia/toolchain/download_linux_amd64_toolchain.bzl
 FILE: ../../../third_party/skia/toolchain/download_mac_m1_toolchain.bzl