diff --git a/DEPS b/DEPS index 73c01281434f5..83e4a39d4f4b4 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ vars = { 'flutter_git': 'https://flutter.googlesource.com', 'skia_git': 'https://skia.googlesource.com', 'llvm_git': 'https://llvm.googlesource.com', - 'skia_revision': '249d3f07c4d53ea856336acc322fa4cb463f4d3f', + 'skia_revision': '69f4bd859025cbd5914ce00283bbd08925c48811', # 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/excluded_files b/ci/licenses_golden/excluded_files index 71ae1f7cbc498..a2dd65e2f57d5 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2637,7 +2637,6 @@ ../../../flutter/third_party/skia/bazel ../../../flutter/third_party/skia/bench ../../../flutter/third_party/skia/codereview.settings -../../../flutter/third_party/skia/defines.bzl ../../../flutter/third_party/skia/demos.skia.org ../../../flutter/third_party/skia/docker/Makefile ../../../flutter/third_party/skia/docker/README.md @@ -2706,9 +2705,6 @@ ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/ganesh/vk/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/gl/BUILD.bazel -../../../flutter/third_party/skia/include/gpu/gl/egl/BUILD.bazel -../../../flutter/third_party/skia/include/gpu/gl/epoxy/BUILD.bazel -../../../flutter/third_party/skia/include/gpu/gl/glx/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/graphite/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/graphite/mtl/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/graphite/vk/BUILD.bazel diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 2ae35999f69b7..13bfb3b20db90 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 7698c4e04e85eb6fa6926b8c3ed159c7 +Signature: 9bc974412ed2abd3ff4ae1f734e4dda9 ==================================================================================================== LIBRARY: etc1 @@ -8214,7 +8214,6 @@ ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/GlyphVector.cpp + ../../. ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/GlyphVector.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SubRunContainer.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SubRunContainer.h + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/utils/SkTestCanvas.h + ../../../flutter/third_party/skia/LICENSE TYPE: LicenseType.bsd FILE: ../../../flutter/third_party/skia/gm/bug12866.cpp FILE: ../../../flutter/third_party/skia/gm/crbug_1313579.cpp @@ -8429,7 +8428,6 @@ FILE: ../../../flutter/third_party/skia/src/text/gpu/GlyphVector.cpp FILE: ../../../flutter/third_party/skia/src/text/gpu/GlyphVector.h FILE: ../../../flutter/third_party/skia/src/text/gpu/SubRunContainer.cpp FILE: ../../../flutter/third_party/skia/src/text/gpu/SubRunContainer.h -FILE: ../../../flutter/third_party/skia/src/utils/SkTestCanvas.h ---------------------------------------------------------------------------------------------------- Copyright 2022 Google LLC @@ -8980,7 +8978,6 @@ ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SlugImpl.cpp + ../../../f ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SlugImpl.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/VertexFiller.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/VertexFiller.h + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/utils/SkTestCanvas.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkWGL_win.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/toolchain/android_trampolines/gen_trampolines/gen_trampolines.go + ../../../flutter/third_party/skia/LICENSE TYPE: LicenseType.bsd @@ -9273,7 +9270,6 @@ FILE: ../../../flutter/third_party/skia/src/text/gpu/SlugImpl.cpp FILE: ../../../flutter/third_party/skia/src/text/gpu/SlugImpl.h FILE: ../../../flutter/third_party/skia/src/text/gpu/VertexFiller.cpp FILE: ../../../flutter/third_party/skia/src/text/gpu/VertexFiller.h -FILE: ../../../flutter/third_party/skia/src/utils/SkTestCanvas.cpp FILE: ../../../flutter/third_party/skia/src/utils/win/SkWGL_win.cpp FILE: ../../../flutter/third_party/skia/toolchain/android_trampolines/gen_trampolines/gen_trampolines.go ----------------------------------------------------------------------------------------------------