diff --git a/DEPS b/DEPS index 351a184da79bf..d89d52b37e8a6 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': 'f4ce9fc2ec452db2edc4bec0f7b454eaa87a4e95', + 'skia_revision': '52bb1539c5cf8cf84d73bbf109b6a50879f9f718', # 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 71d4e3bdf6e97..5635e1fd82483 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2313,6 +2313,7 @@ ../../../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/mtl/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/mock/BUILD.bazel @@ -2453,6 +2454,7 @@ ../../../flutter/third_party/skia/src/gpu/ganesh/gl/android/BUILD.bazel ../../../flutter/third_party/skia/src/gpu/ganesh/gl/builders/BUILD.bazel ../../../flutter/third_party/skia/src/gpu/ganesh/gl/egl/BUILD.bazel +../../../flutter/third_party/skia/src/gpu/ganesh/gl/epoxy/BUILD.bazel ../../../flutter/third_party/skia/src/gpu/ganesh/gl/glx/BUILD.bazel ../../../flutter/third_party/skia/src/gpu/ganesh/gl/iOS/BUILD.bazel ../../../flutter/third_party/skia/src/gpu/ganesh/gl/mac/BUILD.bazel diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 5be0b1a5f06d1..4721f5863c397 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 401baa15ca3d3247bfbd2c852476b3f4 +Signature: 6c258f46a0fb5a0c7787d6d02c35cbf1 ==================================================================================================== LIBRARY: etc1 @@ -9517,12 +9517,15 @@ ORIGIN: ../../../flutter/third_party/skia/gm/emptyshader.cpp + ../../../flutter/ ORIGIN: ../../../flutter/third_party/skia/gm/imagedither.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLMakeWebGLInterface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSemaphore.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/epoxy/GrGLMakeEpoxyEGLInterface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_coretext.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_harfbuzz.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_skunicode.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/core/SkKnownRuntimeEffects.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/core/SkKnownRuntimeEffects.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/SwizzlePriv.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLCoreFunctions.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/epoxy/GrGLMakeEpoxyEGLInterface.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlBackendSemaphore.mm + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RasterPathUtils.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RasterPathUtils.h + ../../../flutter/third_party/skia/LICENSE @@ -9534,12 +9537,15 @@ FILE: ../../../flutter/third_party/skia/gm/emptyshader.cpp FILE: ../../../flutter/third_party/skia/gm/imagedither.cpp FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLMakeWebGLInterface.h FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSemaphore.h +FILE: ../../../flutter/third_party/skia/include/gpu/gl/epoxy/GrGLMakeEpoxyEGLInterface.h FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_coretext.h FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_harfbuzz.h FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_skunicode.h FILE: ../../../flutter/third_party/skia/src/core/SkKnownRuntimeEffects.cpp FILE: ../../../flutter/third_party/skia/src/core/SkKnownRuntimeEffects.h FILE: ../../../flutter/third_party/skia/src/gpu/SwizzlePriv.h +FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLCoreFunctions.h +FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/epoxy/GrGLMakeEpoxyEGLInterface.cpp FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlBackendSemaphore.mm FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RasterPathUtils.cpp FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RasterPathUtils.h