firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manual roll of Skia to e7b8d078851f (#161609)

Browse Source 
The Skia->engine roller was disabled for a few weeks during the
migration to the monorepo.
This commit is contained in:
Jason Simmons 2025-01-15 07:14:23 -08:00 committed by GitHub
parent 2b34d78c23
commit 1e79b65ea1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -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': 'f784f78a5669962a23243ff67997239a64ce8c99',
'skia_revision': 'e7b8d078851fd505475fe74359e31a421e6968ea',
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

14
engine/src/flutter/ci/licenses_golden/licenses_skia
View File

@ -1,4 +1,4 @@
Signature: d7670af6cbef9d04a3bfe4d89e3f3b51
Signature: 368cfa762130868f2345230d1484526d
====================================================================================================
LIBRARY: etc1
@ -321,7 +321,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
====================================================================================================
LIBRARY: libmicrohttpd
LIBRARY: skia
ORIGIN: ../../../flutter/third_party/skia/LICENSE
TYPE: LicenseType.bsd
@ -399,12 +398,8 @@ FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/pathops.bench.js
FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js
FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html
FILE: ../../../flutter/third_party/skia/package-lock.json
FILE: ../../../flutter/third_party/skia/relnotes/GpuStats.md
FILE: ../../../flutter/third_party/skia/relnotes/GraphiteLogPriority.md
FILE: ../../../flutter/third_party/skia/relnotes/SkColorSpaceMakeCICP.md
FILE: ../../../flutter/third_party/skia/relnotes/debugtrace.md
FILE: ../../../flutter/third_party/skia/relnotes/precompilecontext.md
FILE: ../../../flutter/third_party/skia/relnotes/requireorderedrecordings.md
FILE: ../../../flutter/third_party/skia/relnotes/color4shader.md
FILE: ../../../flutter/third_party/skia/relnotes/pipelinepurging.md
FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt
FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml
FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl
@ -442,7 +437,6 @@ FILE: ../../../flutter/third_party/skia/src/sksl/sksl_rt_shader.sksl
FILE: ../../../flutter/third_party/skia/src/sksl/sksl_shared.sksl
FILE: ../../../flutter/third_party/skia/src/sksl/sksl_vert.sksl
FILE: ../../../flutter/third_party/skia/third_party/go.mod
FILE: ../../../flutter/third_party/skia/third_party/libmicrohttpd/MHD_config.h
FILE: ../../../flutter/third_party/skia/toolchain/linux_trampolines/IWYU_mapping.imp
FILE: ../../../flutter/third_party/skia/toolchain/ndk.BUILD
FILE: ../../../flutter/third_party/skia/whitespace.txt
@ -9512,6 +9506,7 @@ ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSur
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/LogPriority.h + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/PrecompileContext.h + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypesUtils.h + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PaintOptions.h + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/Precompile.h + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileBase.h + ../../../flutter/third_party/skia/LICENSE
@ -9642,6 +9637,7 @@ FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSurfa
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/LogPriority.h
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/PrecompileContext.h
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypesUtils.h
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PaintOptions.h
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/Precompile.h
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileBase.h

3
engine/src/flutter/lib/web_ui/dev/steps/copy_artifacts_step.dart
View File

@ -201,7 +201,8 @@ class CopyArtifactsStep implements PipelineStep {
for (final io.File imageFile in testImagesDir.listSync(recursive: true).whereType<io.File>()) {
// Skip files that are used by Skia to test handling of invalid input.
if (pathlib.basename(imageFile.path).contains('invalid')) {
final String imageBaseName = pathlib.basename(imageFile.path);
if (imageBaseName.contains('invalid') || imageBaseName.contains('missing_eof')) {
continue;
}
final io.File destination = io.File(

2
engine/src/flutter/testing/dart/codec_test.dart
View File

@ -37,7 +37,7 @@ void main() {
});
test('getNextFrame fails with invalid data', () async {
Uint8List data = await _getSkiaResource('flutter_logo.jpg').readAsBytes();
Uint8List data = await _getSkiaResource('test640x479.gif').readAsBytes();
data = Uint8List.view(data.buffer, 0, 4000);
final ui.Codec codec = await ui.instantiateImageCodec(data);
try {