diff --git a/DEPS b/DEPS index b30e29d7cec2f..d37f6d3051bd5 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': '049f389db75b10a5022f20070dbda4d094e107b3', + 'skia_revision': 'bae54bbf49bdf4c11bd0430d60abfc64c72d95fe', # 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 dd7e19286de0f..f5218536f77eb 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2627,6 +2627,7 @@ ../../../third_party/skia/gm/BUILD.bazel ../../../third_party/skia/gm/android_gm_test.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 ../../../third_party/skia/gn/bazel_build.py diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 02ba245a1519b..a713e922de4a8 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 5c58e3f64a68c3ce6656a54bb4b77951 +Signature: f99754defa70f62fd5fc847eba6dec90 ==================================================================================================== LIBRARY: etc1 @@ -8758,6 +8758,7 @@ ORIGIN: ../../../third_party/skia/gm/coordclampshader.cpp + ../../../third_party 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 ORIGIN: ../../../third_party/skia/include/private/SkGainmapInfo.h + ../../../third_party/skia/LICENSE @@ -8798,6 +8799,7 @@ 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 FILE: ../../../third_party/skia/include/private/SkGainmapInfo.h @@ -8881,6 +8883,7 @@ ORIGIN: ../../../third_party/skia/gm/scaledrects.cpp + ../../../third_party/skia 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/vias/SimpleVias.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/android/SkCanvasAndroid.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/android/SkHeifDecoder.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/android/SkImageAndroid.h + ../../../third_party/skia/LICENSE @@ -9089,6 +9092,7 @@ 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/vias/SimpleVias.cpp FILE: ../../../third_party/skia/include/android/SkCanvasAndroid.h FILE: ../../../third_party/skia/include/android/SkHeifDecoder.h FILE: ../../../third_party/skia/include/android/SkImageAndroid.h