Unverified Commit a742b11a authored by Todd Volkert's avatar Todd Volkert Committed by GitHub

Roll engine to cb3376c5dedb71cec7a88b8a8904acc5dd6c6ba1 (#16841)

This contains the following commit:

flutter/engine@cb3376c Support different encodings in Image.toByteData() (#16635)
parent f544f4d1
232060828a1d4a9c3ee16b92f3af5f5a15041e32 cb3376c5dedb71cec7a88b8a8904acc5dd6c6ba1
...@@ -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 Image, ImageByteFormat, 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.ImageByteFormat 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({ImageByteFormat 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.ImageByteFormat 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.ImageByteFormat 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 Image, ImageByteFormat;
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.ImageByteFormat 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.ImageByteFormat 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.ImageByteFormat 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 Image, ImageByteFormat;
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.ImageByteFormat 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 Image, ImageByteFormat;
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.ImageByteFormat 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 Image, ImageByteFormat;
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.ImageByteFormat format}) async {
throw new UnsupportedError('Cannot encode test image'); throw new UnsupportedError('Cannot encode test image');
} }
......
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