Roll engine to a031239 (flutter#14601)

alexmarkov · web-flow · commit d64efe9fdbce · 2018-02-09T14:40:28.000-08:00
Includes: * Exclude frontend_server from the license crawl (flutter/engine#4645) * Make native wrapper classes non-abstract (flutter/engine#4607) * Restrict clang-format to C, C++, Obj-C, Obj-C++ (flutter/engine#4654)
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
@@ -1 +1 @@
-337764e4edebdafad6685a4af81b84d456dac687
+a031239a5d4e44e60d0ebc62b8c544a9f592fc22
diff --git a/packages/flutter/test/painting/decoration_test.dart b/packages/flutter/test/painting/decoration_test.dart
@@ -78,7 +78,7 @@ class DelayedImageProvider extends ImageProvider<DelayedImageProvider> {
   String toString() => '${describeIdentity(this)}}()';
 }
 
-class TestImage extends ui.Image {
+class TestImage implements ui.Image {
   @override
   int get width => 100;
 
diff --git a/packages/flutter/test/painting/fake_codec.dart b/packages/flutter/test/painting/fake_codec.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
 /// callbacks originating from the IO thread.
-class FakeCodec extends ui.Codec {
+class FakeCodec implements ui.Codec {
   final int _frameCount;
   final int _repetitionCount;
   final List<ui.FrameInfo> _frameInfos;
@@ -46,4 +46,7 @@ class FakeCodec extends ui.Codec {
     _nextFrame = (_nextFrame + 1) % _frameCount;
     return result;
   }
+
+  @override
+  void dispose() { }
 }
diff --git a/packages/flutter/test/painting/image_stream_test.dart b/packages/flutter/test/painting/image_stream_test.dart
@@ -9,7 +9,7 @@ import 'package:flutter/painting.dart';
 import 'package:flutter/scheduler.dart' show timeDilation;
 import 'package:flutter_test/flutter_test.dart';
 
-class FakeFrameInfo extends FrameInfo {
+class FakeFrameInfo implements FrameInfo {
   final Duration _duration;
   final Image _image;
 
@@ -23,7 +23,7 @@ class FakeFrameInfo extends FrameInfo {
   Image get image => _image;
 }
 
-class FakeImage extends Image {
+class FakeImage implements Image {
   final int _width;
   final int _height;
 
diff --git a/packages/flutter/test/painting/shape_decoration_test.dart b/packages/flutter/test/painting/shape_decoration_test.dart
@@ -112,7 +112,7 @@ class TestImageProvider extends ImageProvider<TestImageProvider> {
   }
 }
 
-class TestImage extends ui.Image {
+class TestImage implements ui.Image {
   @override
   int get width => 100;
 
diff --git a/packages/flutter/test/widgets/image_resolution_test.dart b/packages/flutter/test/widgets/image_resolution_test.dart
@@ -12,7 +12,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-class TestImage extends ui.Image {
+class TestImage implements ui.Image {
   TestImage(this.scale);
   final double scale;
 
diff --git a/packages/flutter/test/widgets/image_rtl_test.dart b/packages/flutter/test/widgets/image_rtl_test.dart
@@ -25,15 +25,15 @@ class TestImageProvider extends ImageProvider<TestImageProvider> {
   }
 }
 
-class TestImage extends ui.Image {
+class TestImage implements ui.Image {
   @override
   int get width => 16;
 
   @override
   int get height => 9;
 
-  // @override
-  // void dispose() { }
+  @override
+  void dispose() { }
 }
 
 void main() {
diff --git a/packages/flutter/test/widgets/image_test.dart b/packages/flutter/test/widgets/image_test.dart
@@ -473,7 +473,7 @@ class TestImageStreamCompleter extends ImageStreamCompleter {
   }
 }
 
-class TestImage extends ui.Image {
+class TestImage implements ui.Image {
   @override
   int get width => 100;
 
@@ -482,4 +482,7 @@ class TestImage extends ui.Image {
 
   @override
   void dispose() { }
+
+  @override
+  String toString() => '[$width\u00D7$height]';
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-337764e4edebdafad6685a4af81b84d456dac687`
	`1`	`+a031239a5d4e44e60d0ebc62b8c544a9f592fc22`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ class DelayedImageProvider extends ImageProvider<DelayedImageProvider> {`
`78`	`78`	`String toString() => '${describeIdentity(this)}}()';`
`79`	`79`	`}`
`80`	`80`
`81`		`-class TestImage extends ui.Image {`
	`81`	`+class TestImage implements ui.Image {`
`82`	`82`	`@override`
`83`	`83`	`int get width => 100;`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ class TestImageProvider extends ImageProvider<TestImageProvider> {`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`		`-class TestImage extends ui.Image {`
	`115`	`+class TestImage implements ui.Image {`
`116`	`116`	`@override`
`117`	`117`	`int get width => 100;`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,15 @@ class TestImageProvider extends ImageProvider<TestImageProvider> {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`-class TestImage extends ui.Image {`
	`28`	`+class TestImage implements ui.Image {`
`29`	`29`	`@override`
`30`	`30`	`int get width => 16;`
`31`	`31`
`32`	`32`	`@override`
`33`	`33`	`int get height => 9;`
`34`	`34`
`35`		`- // @override`
`36`		`- // void dispose() { }`
	`35`	`+ @override`
	`36`	`+ void dispose() { }`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`void main() {`
Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ class TestImageStreamCompleter extends ImageStreamCompleter {`
`473`	`473`	`}`
`474`	`474`	`}`
`475`	`475`
`476`		`-class TestImage extends ui.Image {`
	`476`	`+class TestImage implements ui.Image {`
`477`	`477`	`@override`
`478`	`478`	`int get width => 100;`
`479`	`479`
`@@ -482,4 +482,7 @@ class TestImage extends ui.Image {`
`482`	`482`
`483`	`483`	`@override`
`484`	`484`	`void dispose() { }`
	`485`	`+`
	`486`	`+ @override`
	`487`	`+ String toString() => '[$width\u00D7$height]';`
`485`	`488`	`}`