From 28bd141cd4c4f5bf14640897b8e11372d5eeb2b0 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Tue, 7 May 2024 11:21:05 -0700 Subject: [PATCH] Manual Skia roll to 2319f1ae8fe42525f8b6a1969a1cee67bdbee290 (#52615) This commit added a new source file (src/codec/SkJpegMetadataDecoderImpl.cpp) --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 6 +++++- skia/BUILD.gn | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 15961e0da1231..017a1205d71b9 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': '869cacf2a3f10ba099ad8dbe88e0faa49dd85673', + 'skia_revision': '2319f1ae8fe42525f8b6a1969a1cee67bdbee290', # 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 d8c04a25022fa..61cd418b17686 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 77b70b453b2712a22070c5760dd4c436 +Signature: a329094cc4d882853b50dadf3146d846 ==================================================================================================== LIBRARY: etc1 @@ -9445,6 +9445,8 @@ ORIGIN: ../../../flutter/third_party/skia/modules/skottie/utils/PreshapeTool.cpp ORIGIN: ../../../flutter/third_party/skia/modules/skottie/utils/TextPreshape.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/skottie/utils/TextPreshape.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGRectPriv.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.cpp + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontScanner.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.h + ../../../flutter/third_party/skia/LICENSE @@ -9454,6 +9456,8 @@ FILE: ../../../flutter/third_party/skia/modules/skottie/utils/PreshapeTool.cpp FILE: ../../../flutter/third_party/skia/modules/skottie/utils/TextPreshape.cpp FILE: ../../../flutter/third_party/skia/modules/skottie/utils/TextPreshape.h FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGRectPriv.h +FILE: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.cpp +FILE: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.h FILE: ../../../flutter/third_party/skia/src/core/SkFontScanner.h FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.cpp FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.h diff --git a/skia/BUILD.gn b/skia/BUILD.gn index daf7034a156d3..ea0031fd7f083 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -496,6 +496,7 @@ optional("jpeg_decode") { sources = [ "$_skia_root/src/codec/SkJpegCodec.cpp", "$_skia_root/src/codec/SkJpegDecoderMgr.cpp", + "$_skia_root/src/codec/SkJpegMetadataDecoderImpl.cpp", "$_skia_root/src/codec/SkJpegSourceMgr.cpp", "$_skia_root/src/codec/SkJpegUtility.cpp", ]