Unverified Commit d64efe9f authored by Alexander Markov's avatar Alexander Markov Committed by GitHub

Roll engine to a031239a5d4e44e60d0ebc62b8c544a9f592fc22 (#14601)

Includes:
* Exclude frontend_server from the license crawl (https://github.com/flutter/engine/pull/4645)
* Make native wrapper classes non-abstract (https://github.com/flutter/engine/pull/4607)
* Restrict clang-format to C, C++, Obj-C, Obj-C++ (https://github.com/flutter/engine/pull/4654)
parent 8e2278bd
337764e4edebdafad6685a4af81b84d456dac687 a031239a5d4e44e60d0ebc62b8c544a9f592fc22
...@@ -78,7 +78,7 @@ class DelayedImageProvider extends ImageProvider<DelayedImageProvider> { ...@@ -78,7 +78,7 @@ class DelayedImageProvider extends ImageProvider<DelayedImageProvider> {
String toString() => '${describeIdentity(this)}}()'; String toString() => '${describeIdentity(this)}}()';
} }
class TestImage extends ui.Image { class TestImage implements ui.Image {
@override @override
int get width => 100; int get width => 100;
......
...@@ -13,7 +13,7 @@ import 'package:flutter/foundation.dart'; ...@@ -13,7 +13,7 @@ import 'package:flutter/foundation.dart';
/// ///
/// This is useful for running in the test Zone, where it is tricky to receive /// This is useful for running in the test Zone, where it is tricky to receive
/// callbacks originating from the IO thread. /// callbacks originating from the IO thread.
class FakeCodec extends ui.Codec { class FakeCodec implements ui.Codec {
final int _frameCount; final int _frameCount;
final int _repetitionCount; final int _repetitionCount;
final List<ui.FrameInfo> _frameInfos; final List<ui.FrameInfo> _frameInfos;
...@@ -46,4 +46,7 @@ class FakeCodec extends ui.Codec { ...@@ -46,4 +46,7 @@ class FakeCodec extends ui.Codec {
_nextFrame = (_nextFrame + 1) % _frameCount; _nextFrame = (_nextFrame + 1) % _frameCount;
return result; return result;
} }
@override
void dispose() { }
} }
...@@ -9,7 +9,7 @@ import 'package:flutter/painting.dart'; ...@@ -9,7 +9,7 @@ import 'package:flutter/painting.dart';
import 'package:flutter/scheduler.dart' show timeDilation; import 'package:flutter/scheduler.dart' show timeDilation;
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
class FakeFrameInfo extends FrameInfo { class FakeFrameInfo implements FrameInfo {
final Duration _duration; final Duration _duration;
final Image _image; final Image _image;
...@@ -23,7 +23,7 @@ class FakeFrameInfo extends FrameInfo { ...@@ -23,7 +23,7 @@ class FakeFrameInfo extends FrameInfo {
Image get image => _image; Image get image => _image;
} }
class FakeImage extends Image { class FakeImage implements Image {
final int _width; final int _width;
final int _height; final int _height;
......
...@@ -112,7 +112,7 @@ class TestImageProvider extends ImageProvider<TestImageProvider> { ...@@ -112,7 +112,7 @@ class TestImageProvider extends ImageProvider<TestImageProvider> {
} }
} }
class TestImage extends ui.Image { class TestImage implements ui.Image {
@override @override
int get width => 100; int get width => 100;
......
...@@ -12,7 +12,7 @@ import 'package:flutter/services.dart'; ...@@ -12,7 +12,7 @@ import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
class TestImage extends ui.Image { class TestImage implements ui.Image {
TestImage(this.scale); TestImage(this.scale);
final double scale; final double scale;
......
...@@ -25,15 +25,15 @@ class TestImageProvider extends ImageProvider<TestImageProvider> { ...@@ -25,15 +25,15 @@ class TestImageProvider extends ImageProvider<TestImageProvider> {
} }
} }
class TestImage extends ui.Image { class TestImage implements ui.Image {
@override @override
int get width => 16; int get width => 16;
@override @override
int get height => 9; int get height => 9;
// @override @override
// void dispose() { } void dispose() { }
} }
void main() { void main() {
......
...@@ -473,7 +473,7 @@ class TestImageStreamCompleter extends ImageStreamCompleter { ...@@ -473,7 +473,7 @@ class TestImageStreamCompleter extends ImageStreamCompleter {
} }
} }
class TestImage extends ui.Image { class TestImage implements ui.Image {
@override @override
int get width => 100; int get width => 100;
...@@ -482,4 +482,7 @@ class TestImage extends ui.Image { ...@@ -482,4 +482,7 @@ class TestImage extends ui.Image {
@override @override
void dispose() { } void dispose() { }
@override
String toString() => '[$width\u00D7$height]';
} }
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