diff --git a/bin/internal/engine.version b/bin/internal/engine.version index f0eb09180f5..ecee599fe8d 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -1bc0e1bb9a8db882a21086096cc2b1e0854312b7 +76cb311d9c33720dcd19274228b39ecdbad8d9af diff --git a/packages/flutter/test/painting/decoration_test.dart b/packages/flutter/test/painting/decoration_test.dart index 31e79fff8c4..0b67c90c662 100644 --- a/packages/flutter/test/painting/decoration_test.dart +++ b/packages/flutter/test/painting/decoration_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'dart:typed_data'; -import 'dart:ui' as ui show Image, ColorFilter; +import 'dart:ui' as ui show EncodingFormat, Image, ColorFilter; import 'package:flutter/foundation.dart'; import 'package:flutter/painting.dart'; @@ -90,7 +90,7 @@ class TestImage implements ui.Image { void dispose() { } @override - Future toByteData() async { + Future toByteData({ui.EncodingFormat format}) async { throw new UnsupportedError('Cannot encode test image'); } } diff --git a/packages/flutter/test/painting/image_stream_test.dart b/packages/flutter/test/painting/image_stream_test.dart index 279e8a58197..a6809a93785 100644 --- a/packages/flutter/test/painting/image_stream_test.dart +++ b/packages/flutter/test/painting/image_stream_test.dart @@ -40,7 +40,7 @@ class FakeImage implements Image { void dispose() {} @override - Future toByteData() async { + Future toByteData({EncodingFormat format}) async { throw new UnsupportedError('Cannot encode test image'); } } diff --git a/packages/flutter/test/painting/paint_image_test.dart b/packages/flutter/test/painting/paint_image_test.dart index 972f19552a3..9d571526b19 100644 --- a/packages/flutter/test/painting/paint_image_test.dart +++ b/packages/flutter/test/painting/paint_image_test.dart @@ -23,7 +23,7 @@ class TestImage implements ui.Image { void dispose() { } @override - Future toByteData() async { + Future toByteData({ui.EncodingFormat format}) async { throw new UnsupportedError('Cannot encode test image'); } } diff --git a/packages/flutter/test/painting/shape_decoration_test.dart b/packages/flutter/test/painting/shape_decoration_test.dart index 068db569092..510c5661f1e 100644 --- a/packages/flutter/test/painting/shape_decoration_test.dart +++ b/packages/flutter/test/painting/shape_decoration_test.dart @@ -125,7 +125,7 @@ class TestImage implements ui.Image { void dispose() { } @override - Future toByteData() async { + Future toByteData({ui.EncodingFormat format}) async { throw new UnsupportedError('Cannot encode test image'); } } diff --git a/packages/flutter/test/rendering/image_test.dart b/packages/flutter/test/rendering/image_test.dart index 0d4f2e99dbe..402e83fc816 100644 --- a/packages/flutter/test/rendering/image_test.dart +++ b/packages/flutter/test/rendering/image_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'dart:typed_data'; -import 'dart:ui' as ui show Image; +import 'dart:ui' as ui show EncodingFormat, Image; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -19,7 +19,7 @@ class SquareImage implements ui.Image { int get height => 10; @override - Future toByteData() async { + Future toByteData({ui.EncodingFormat format}) async { throw new UnsupportedError('Cannot encode test image'); } @@ -38,7 +38,7 @@ class WideImage implements ui.Image { int get height => 10; @override - Future toByteData() async { + Future toByteData({ui.EncodingFormat format}) async { throw new UnsupportedError('Cannot encode test image'); } @@ -57,7 +57,7 @@ class TallImage implements ui.Image { int get height => 20; @override - Future toByteData() async { + Future toByteData({ui.EncodingFormat format}) async { throw new UnsupportedError('Cannot encode test image'); } diff --git a/packages/flutter/test/widgets/image_resolution_test.dart b/packages/flutter/test/widgets/image_resolution_test.dart index be4c35b8ddd..19036366b49 100644 --- a/packages/flutter/test/widgets/image_resolution_test.dart +++ b/packages/flutter/test/widgets/image_resolution_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'dart:typed_data'; -import 'dart:ui' as ui show Image; +import 'dart:ui' as ui show EncodingFormat, Image; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; @@ -26,7 +26,7 @@ class TestImage implements ui.Image { void dispose() { } @override - Future toByteData() async { + Future toByteData({ui.EncodingFormat format}) async { throw new UnsupportedError('Cannot encode test image'); } } diff --git a/packages/flutter/test/widgets/image_rtl_test.dart b/packages/flutter/test/widgets/image_rtl_test.dart index 553cf6f3edb..492a326827a 100644 --- a/packages/flutter/test/widgets/image_rtl_test.dart +++ b/packages/flutter/test/widgets/image_rtl_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'dart:typed_data'; -import 'dart:ui' as ui show Image; +import 'dart:ui' as ui show EncodingFormat, Image; import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; @@ -37,7 +37,7 @@ class TestImage implements ui.Image { void dispose() { } @override - Future toByteData() async { + Future toByteData({ui.EncodingFormat format}) async { throw new UnsupportedError('Cannot encode test image'); } } diff --git a/packages/flutter/test/widgets/image_test.dart b/packages/flutter/test/widgets/image_test.dart index 91343a9715c..a060f99bc27 100644 --- a/packages/flutter/test/widgets/image_test.dart +++ b/packages/flutter/test/widgets/image_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'dart:typed_data'; -import 'dart:ui' as ui show Image; +import 'dart:ui' as ui show EncodingFormat, Image; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; @@ -484,7 +484,7 @@ class TestImage implements ui.Image { void dispose() { } @override - Future toByteData() async { + Future toByteData({ui.EncodingFormat format}) async { throw new UnsupportedError('Cannot encode test image'); } diff --git a/packages/flutter_tools/lib/src/test/flutter_platform.dart b/packages/flutter_tools/lib/src/test/flutter_platform.dart index 8155e7ddd1c..7c0ca7a8f8d 100644 --- a/packages/flutter_tools/lib/src/test/flutter_platform.dart +++ b/packages/flutter_tools/lib/src/test/flutter_platform.dart @@ -275,7 +275,7 @@ class _FlutterPlatform extends PlatformPlugin { dynamic outOfBandError; // error that we couldn't send to the harness that we need to send via our future - final List<_Finalizer> finalizers = <_Finalizer>[]; // Note: will be run in reverse order. + final List<_Finalizer> finalizers = <_Finalizer>[]; bool subprocessActive = false; bool controllerSinkClosed = false; try { @@ -511,7 +511,7 @@ class _FlutterPlatform extends PlatformPlugin { } } finally { printTrace('test $ourTestCount: cleaning up...'); - for (_Finalizer finalizer in finalizers.reversed) { + for (_Finalizer finalizer in finalizers) { try { await finalizer(); } catch (error, stack) {