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

This commit is contained in:
Mikkel Nygaard Ravn
2018-04-17 12:40:02 +02:00
committed by GitHub
parent dd32d1b179
commit 10cf0cedad
10 changed files with 18 additions and 18 deletions

View File

@@ -1 +1 @@
1bc0e1bb9a8db882a21086096cc2b1e0854312b7
76cb311d9c33720dcd19274228b39ecdbad8d9af

View File

@@ -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<ByteData> toByteData() async {
Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image');
}
}

View File

@@ -40,7 +40,7 @@ class FakeImage implements Image {
void dispose() {}
@override
Future<ByteData> toByteData() async {
Future<ByteData> toByteData({EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image');
}
}

View File

@@ -23,7 +23,7 @@ class TestImage implements ui.Image {
void dispose() { }
@override
Future<ByteData> toByteData() async {
Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image');
}
}

View File

@@ -125,7 +125,7 @@ class TestImage implements ui.Image {
void dispose() { }
@override
Future<ByteData> toByteData() async {
Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image');
}
}

View File

@@ -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<ByteData> toByteData() async {
Future<ByteData> 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<ByteData> toByteData() async {
Future<ByteData> 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<ByteData> toByteData() async {
Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image');
}

View File

@@ -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<ByteData> toByteData() async {
Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image');
}
}

View File

@@ -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<ByteData> toByteData() async {
Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image');
}
}

View File

@@ -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<ByteData> toByteData() async {
Future<ByteData> toByteData({ui.EncodingFormat format}) async {
throw new UnsupportedError('Cannot encode test image');
}

View File

@@ -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) {