Unverified Commit 10cf0ced authored by Mikkel Nygaard Ravn's avatar Mikkel Nygaard Ravn Committed by GitHub

Revert "Roll engine to 1bc0e1bb9a8db882a21086096cc2b1e0854312b7 (#16643)" (#16661)

parent dd32d1b1
1bc0e1bb9a8db882a21086096cc2b1e0854312b7 76cb311d9c33720dcd19274228b39ecdbad8d9af
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import 'dart:async'; import 'dart:async';
import 'dart:typed_data'; 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/foundation.dart';
import 'package:flutter/painting.dart'; import 'package:flutter/painting.dart';
...@@ -90,7 +90,7 @@ class TestImage implements ui.Image { ...@@ -90,7 +90,7 @@ class TestImage implements ui.Image {
void dispose() { } void dispose() { }
@override @override
Future<ByteData> toByteData() async { Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image'); throw new UnsupportedError('Cannot encode test image');
} }
} }
......
...@@ -40,7 +40,7 @@ class FakeImage implements Image { ...@@ -40,7 +40,7 @@ class FakeImage implements Image {
void dispose() {} void dispose() {}
@override @override
Future<ByteData> toByteData() async { Future<ByteData> toByteData({EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image'); throw new UnsupportedError('Cannot encode test image');
} }
} }
......
...@@ -23,7 +23,7 @@ class TestImage implements ui.Image { ...@@ -23,7 +23,7 @@ class TestImage implements ui.Image {
void dispose() { } void dispose() { }
@override @override
Future<ByteData> toByteData() async { Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image'); throw new UnsupportedError('Cannot encode test image');
} }
} }
......
...@@ -125,7 +125,7 @@ class TestImage implements ui.Image { ...@@ -125,7 +125,7 @@ class TestImage implements ui.Image {
void dispose() { } void dispose() { }
@override @override
Future<ByteData> toByteData() async { Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image'); throw new UnsupportedError('Cannot encode test image');
} }
} }
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import 'dart:async'; import 'dart:async';
import 'dart:typed_data'; 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/rendering.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
...@@ -19,7 +19,7 @@ class SquareImage implements ui.Image { ...@@ -19,7 +19,7 @@ class SquareImage implements ui.Image {
int get height => 10; int get height => 10;
@override @override
Future<ByteData> toByteData() async { Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image'); throw new UnsupportedError('Cannot encode test image');
} }
...@@ -38,7 +38,7 @@ class WideImage implements ui.Image { ...@@ -38,7 +38,7 @@ class WideImage implements ui.Image {
int get height => 10; int get height => 10;
@override @override
Future<ByteData> toByteData() async { Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image'); throw new UnsupportedError('Cannot encode test image');
} }
...@@ -57,7 +57,7 @@ class TallImage implements ui.Image { ...@@ -57,7 +57,7 @@ class TallImage implements ui.Image {
int get height => 20; int get height => 20;
@override @override
Future<ByteData> toByteData() async { Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image'); throw new UnsupportedError('Cannot encode test image');
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import 'dart:async'; import 'dart:async';
import 'dart:typed_data'; 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/foundation.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
...@@ -26,7 +26,7 @@ class TestImage implements ui.Image { ...@@ -26,7 +26,7 @@ class TestImage implements ui.Image {
void dispose() { } void dispose() { }
@override @override
Future<ByteData> toByteData() async { Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image'); throw new UnsupportedError('Cannot encode test image');
} }
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import 'dart:async'; import 'dart:async';
import 'dart:typed_data'; 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/foundation.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
...@@ -37,7 +37,7 @@ class TestImage implements ui.Image { ...@@ -37,7 +37,7 @@ class TestImage implements ui.Image {
void dispose() { } void dispose() { }
@override @override
Future<ByteData> toByteData() async { Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image'); throw new UnsupportedError('Cannot encode test image');
} }
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import 'dart:async'; import 'dart:async';
import 'dart:typed_data'; 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/foundation.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
...@@ -484,7 +484,7 @@ class TestImage implements ui.Image { ...@@ -484,7 +484,7 @@ class TestImage implements ui.Image {
void dispose() { } void dispose() { }
@override @override
Future<ByteData> toByteData() async { Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image'); throw new UnsupportedError('Cannot encode test image');
} }
......
...@@ -275,7 +275,7 @@ class _FlutterPlatform extends PlatformPlugin { ...@@ -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 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 subprocessActive = false;
bool controllerSinkClosed = false; bool controllerSinkClosed = false;
try { try {
...@@ -511,7 +511,7 @@ class _FlutterPlatform extends PlatformPlugin { ...@@ -511,7 +511,7 @@ class _FlutterPlatform extends PlatformPlugin {
} }
} finally { } finally {
printTrace('test $ourTestCount: cleaning up...'); printTrace('test $ourTestCount: cleaning up...');
for (_Finalizer finalizer in finalizers.reversed) { for (_Finalizer finalizer in finalizers) {
try { try {
await finalizer(); await finalizer();
} catch (error, stack) { } catch (error, stack) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment