diff --git a/DEPS b/DEPS index 2e002696275d2..203133068b5d8 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': 'ad2e2165030621a0da9eb14d8fc01c2fcf48da14', + 'skia_revision': '2bd12e31d5781f50ffdda7a7ce9081b3f6850488', # 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 3d51985e1683d..e1ae45477560a 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: d777e0a04b30fb679310ccc1c9638e43 +Signature: d6c8f3e8e8ad3efacc9a787caa179ed0 ==================================================================================================== LIBRARY: etc1 @@ -8869,6 +8869,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== 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/include/ports/SkFontMgr_data.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/SkGainmapInfo.h + ../../../third_party/skia/LICENSE @@ -8889,9 +8890,12 @@ ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpContexts.h + ../../ ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/encode/SkJpegGainmapEncoder.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/dawn/DawnUtils.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/ports/SkTypeface_fontations.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/ports/SkTypeface_fontations.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/shaders/SkGainmapShader.cpp + ../../../third_party/skia/LICENSE 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/include/ports/SkFontMgr_data.h FILE: ../../../third_party/skia/include/private/SkGainmapInfo.h @@ -8912,6 +8916,8 @@ FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpContexts.h FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h FILE: ../../../third_party/skia/src/encode/SkJpegGainmapEncoder.cpp FILE: ../../../third_party/skia/src/gpu/dawn/DawnUtils.cpp +FILE: ../../../third_party/skia/src/ports/SkTypeface_fontations.cpp +FILE: ../../../third_party/skia/src/ports/SkTypeface_fontations.h FILE: ../../../third_party/skia/src/shaders/SkGainmapShader.cpp ---------------------------------------------------------------------------------------------------- Copyright 2023 Google Inc. @@ -8985,6 +8991,7 @@ ORIGIN: ../../../third_party/skia/src/encode/SkPngEncoder_none.cpp + ../../../th ORIGIN: ../../../third_party/skia/src/encode/SkWebpEncoder_none.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/DitherUtils.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/DitherUtils.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/GpuTypesPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.h + ../../../third_party/skia/LICENSE @@ -9062,6 +9069,7 @@ FILE: ../../../third_party/skia/src/encode/SkPngEncoder_none.cpp FILE: ../../../third_party/skia/src/encode/SkWebpEncoder_none.cpp FILE: ../../../third_party/skia/src/gpu/DitherUtils.cpp FILE: ../../../third_party/skia/src/gpu/DitherUtils.h +FILE: ../../../third_party/skia/src/gpu/GpuTypesPriv.h FILE: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.h