Skip to content

Commit 1e79b65

Browse files
Manual roll of Skia to e7b8d078851f (#161609)
The Skia->engine roller was disabled for a few weeks during the migration to the monorepo.
1 parent 2b34d78 commit 1e79b65

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': 'f784f78a5669962a23243ff67997239a64ce8c99',
17+
'skia_revision': 'e7b8d078851fd505475fe74359e31a421e6968ea',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

engine/src/flutter/ci/licenses_golden/licenses_skia

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: d7670af6cbef9d04a3bfe4d89e3f3b51
1+
Signature: 368cfa762130868f2345230d1484526d
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -321,7 +321,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
321321
====================================================================================================
322322

323323
====================================================================================================
324-
LIBRARY: libmicrohttpd
325324
LIBRARY: skia
326325
ORIGIN: ../../../flutter/third_party/skia/LICENSE
327326
TYPE: LicenseType.bsd
@@ -399,12 +398,8 @@ FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/pathops.bench.js
399398
FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js
400399
FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html
401400
FILE: ../../../flutter/third_party/skia/package-lock.json
402-
FILE: ../../../flutter/third_party/skia/relnotes/GpuStats.md
403-
FILE: ../../../flutter/third_party/skia/relnotes/GraphiteLogPriority.md
404-
FILE: ../../../flutter/third_party/skia/relnotes/SkColorSpaceMakeCICP.md
405-
FILE: ../../../flutter/third_party/skia/relnotes/debugtrace.md
406-
FILE: ../../../flutter/third_party/skia/relnotes/precompilecontext.md
407-
FILE: ../../../flutter/third_party/skia/relnotes/requireorderedrecordings.md
401+
FILE: ../../../flutter/third_party/skia/relnotes/color4shader.md
402+
FILE: ../../../flutter/third_party/skia/relnotes/pipelinepurging.md
408403
FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt
409404
FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml
410405
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
442437
FILE: ../../../flutter/third_party/skia/src/sksl/sksl_shared.sksl
443438
FILE: ../../../flutter/third_party/skia/src/sksl/sksl_vert.sksl
444439
FILE: ../../../flutter/third_party/skia/third_party/go.mod
445-
FILE: ../../../flutter/third_party/skia/third_party/libmicrohttpd/MHD_config.h
446440
FILE: ../../../flutter/third_party/skia/toolchain/linux_trampolines/IWYU_mapping.imp
447441
FILE: ../../../flutter/third_party/skia/toolchain/ndk.BUILD
448442
FILE: ../../../flutter/third_party/skia/whitespace.txt
@@ -9512,6 +9506,7 @@ ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSur
95129506
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h + ../../../flutter/third_party/skia/LICENSE
95139507
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/LogPriority.h + ../../../flutter/third_party/skia/LICENSE
95149508
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/PrecompileContext.h + ../../../flutter/third_party/skia/LICENSE
9509+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypesUtils.h + ../../../flutter/third_party/skia/LICENSE
95159510
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PaintOptions.h + ../../../flutter/third_party/skia/LICENSE
95169511
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/Precompile.h + ../../../flutter/third_party/skia/LICENSE
95179512
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
96429637
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h
96439638
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/LogPriority.h
96449639
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/PrecompileContext.h
9640+
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypesUtils.h
96459641
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PaintOptions.h
96469642
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/Precompile.h
96479643
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileBase.h

engine/src/flutter/lib/web_ui/dev/steps/copy_artifacts_step.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ class CopyArtifactsStep implements PipelineStep {
201201

202202
for (final io.File imageFile in testImagesDir.listSync(recursive: true).whereType<io.File>()) {
203203
// Skip files that are used by Skia to test handling of invalid input.
204-
if (pathlib.basename(imageFile.path).contains('invalid')) {
204+
final String imageBaseName = pathlib.basename(imageFile.path);
205+
if (imageBaseName.contains('invalid') || imageBaseName.contains('missing_eof')) {
205206
continue;
206207
}
207208
final io.File destination = io.File(

engine/src/flutter/testing/dart/codec_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void main() {
3737
});
3838

3939
test('getNextFrame fails with invalid data', () async {
40-
Uint8List data = await _getSkiaResource('flutter_logo.jpg').readAsBytes();
40+
Uint8List data = await _getSkiaResource('test640x479.gif').readAsBytes();
4141
data = Uint8List.view(data.buffer, 0, 4000);
4242
final ui.Codec codec = await ui.instantiateImageCodec(data);
4343
try {

0 commit comments

Comments
 (0)