Roll engine to cb3376c5dedb71cec7a88b8a8904acc5dd6c6ba1 (#16841)
This contains the following commit:
flutter/engine@cb3376c Support different encodings in Image.toByteData() (#16635)
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index 3b51f06..3ef65dc 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-232060828a1d4a9c3ee16b92f3af5f5a15041e32
+cb3376c5dedb71cec7a88b8a8904acc5dd6c6ba1
diff --git a/packages/flutter/test/painting/decoration_test.dart b/packages/flutter/test/painting/decoration_test.dart
index 31e79ff..9461813 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 Image, ImageByteFormat, ColorFilter;
import 'package:flutter/foundation.dart';
import 'package:flutter/painting.dart';
@@ -90,7 +90,7 @@
void dispose() { }
@override
- Future<ByteData> toByteData() async {
+ Future<ByteData> toByteData({ui.ImageByteFormat 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 279e8a5..51c1978 100644
--- a/packages/flutter/test/painting/image_stream_test.dart
+++ b/packages/flutter/test/painting/image_stream_test.dart
@@ -40,7 +40,7 @@
void dispose() {}
@override
- Future<ByteData> toByteData() async {
+ Future<ByteData> toByteData({ImageByteFormat 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 972f195..164de8a 100644
--- a/packages/flutter/test/painting/paint_image_test.dart
+++ b/packages/flutter/test/painting/paint_image_test.dart
@@ -23,7 +23,7 @@
void dispose() { }
@override
- Future<ByteData> toByteData() async {
+ Future<ByteData> toByteData({ui.ImageByteFormat 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 068db56..193467d 100644
--- a/packages/flutter/test/painting/shape_decoration_test.dart
+++ b/packages/flutter/test/painting/shape_decoration_test.dart
@@ -125,7 +125,7 @@
void dispose() { }
@override
- Future<ByteData> toByteData() async {
+ Future<ByteData> toByteData({ui.ImageByteFormat 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 0d4f2e9..d9143a1 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 Image, ImageByteFormat;
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
@@ -19,7 +19,7 @@
int get height => 10;
@override
- Future<ByteData> toByteData() async {
+ Future<ByteData> toByteData({ui.ImageByteFormat format}) async {
throw new UnsupportedError('Cannot encode test image');
}
@@ -38,7 +38,7 @@
int get height => 10;
@override
- Future<ByteData> toByteData() async {
+ Future<ByteData> toByteData({ui.ImageByteFormat format}) async {
throw new UnsupportedError('Cannot encode test image');
}
@@ -57,7 +57,7 @@
int get height => 20;
@override
- Future<ByteData> toByteData() async {
+ Future<ByteData> toByteData({ui.ImageByteFormat 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 be4c35b..7790b32 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 Image, ImageByteFormat;
import 'package:flutter/foundation.dart';
import 'package:flutter/rendering.dart';
@@ -26,7 +26,7 @@
void dispose() { }
@override
- Future<ByteData> toByteData() async {
+ Future<ByteData> toByteData({ui.ImageByteFormat 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 553cf6f..f3b51b5 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 Image, ImageByteFormat;
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
@@ -37,7 +37,7 @@
void dispose() { }
@override
- Future<ByteData> toByteData() async {
+ Future<ByteData> toByteData({ui.ImageByteFormat 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 91343a9..939dc28 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 Image, ImageByteFormat;
import 'package:flutter/foundation.dart';
import 'package:flutter/rendering.dart';
@@ -484,7 +484,7 @@
void dispose() { }
@override
- Future<ByteData> toByteData() async {
+ Future<ByteData> toByteData({ui.ImageByteFormat format}) async {
throw new UnsupportedError('Cannot encode test image');
}
