diff --git a/DEPS b/DEPS index 60b95aa7f06d8..940761059ea97 100644 --- a/DEPS +++ b/DEPS @@ -18,7 +18,7 @@ vars = { 'llvm_git': 'https://llvm.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': 'cb4cfa571393de849c0680d556735c37ae6af321', + 'skia_revision': '3a227c22583927e0d1b423448aa250b177b31ea3', # 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 b4d58de3f1185..4867cbe913422 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2647,7 +2647,6 @@ ../../../third_party/skia/gm/BUILD.bazel ../../../third_party/skia/gm/android_gm_test.bzl ../../../third_party/skia/gm/png_codec.bzl -../../../third_party/skia/gm/surface_manager/BUILD.bazel ../../../third_party/skia/gm/vias/BUILD.bazel ../../../third_party/skia/gn/BUILD.bazel ../../../third_party/skia/gn/__init__.py diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index dd4875b740715..f0c4d30c7a13a 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: bd5ca597a924be09836da77d87c623ca +Signature: a8bda9316b6f137083ea4201aa3e20ef ==================================================================================================== LIBRARY: etc1 @@ -8641,7 +8641,6 @@ LIBRARY: skia ORIGIN: ../../../third_party/skia/gm/coordclampshader.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/fontations.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/imagefiltersunpremul.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/gm/surface_manager/SurfaceManager.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/vias/Draw.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/ports/SkFontMgr_data.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/ports/SkTypeface_fontations.h + ../../../third_party/skia/LICENSE @@ -8683,7 +8682,6 @@ TYPE: LicenseType.bsd FILE: ../../../third_party/skia/gm/coordclampshader.cpp FILE: ../../../third_party/skia/gm/fontations.cpp FILE: ../../../third_party/skia/gm/imagefiltersunpremul.cpp -FILE: ../../../third_party/skia/gm/surface_manager/SurfaceManager.h FILE: ../../../third_party/skia/gm/vias/Draw.h FILE: ../../../third_party/skia/include/ports/SkFontMgr_data.h FILE: ../../../third_party/skia/include/ports/SkTypeface_fontations.h @@ -8769,10 +8767,6 @@ ORIGIN: ../../../third_party/skia/gm/hello_bazel_world.cpp + ../../../third_part ORIGIN: ../../../third_party/skia/gm/png_codec.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/rippleshadergm.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/scaledrects.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/gm/surface_manager/GaneshGLSurfaceManager.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/gm/surface_manager/GaneshVulkanSurfaceManager.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/gm/surface_manager/RasterSurfaceManager.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/gm/surface_manager/SurfaceManager.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/vias/SimpleVias.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/workingspace.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/android/SkCanvasAndroid.h + ../../../third_party/skia/LICENSE @@ -9039,10 +9033,6 @@ FILE: ../../../third_party/skia/gm/hello_bazel_world.cpp FILE: ../../../third_party/skia/gm/png_codec.cpp FILE: ../../../third_party/skia/gm/rippleshadergm.cpp FILE: ../../../third_party/skia/gm/scaledrects.cpp -FILE: ../../../third_party/skia/gm/surface_manager/GaneshGLSurfaceManager.cpp -FILE: ../../../third_party/skia/gm/surface_manager/GaneshVulkanSurfaceManager.cpp -FILE: ../../../third_party/skia/gm/surface_manager/RasterSurfaceManager.cpp -FILE: ../../../third_party/skia/gm/surface_manager/SurfaceManager.cpp FILE: ../../../third_party/skia/gm/vias/SimpleVias.cpp FILE: ../../../third_party/skia/gm/workingspace.cpp FILE: ../../../third_party/skia/include/android/SkCanvasAndroid.h