From 2467c528f530b0ad0ab952e98eaee77edb241da5 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Fri, 31 May 2019 21:17:43 -0700 Subject: [PATCH] Roll engine 69ebe5fb28fc..a4b7d1c2895d (3 commits) (#33697) https://github.com/flutter/engine/compare/69ebe5fb28fc..68a3ca46b40a git log 69ebe5fb28fca271b23010d43d4dc7f6e5286c4f..a4b7d1c2895d82228705a021cdb7fdb2f71ac2a5 --no-merges --oneline 4c6253cdd Copy the macOS podspec during builds (#9158) 68a3ca46b Roll src/third_party/dart 445a23a9bc..0e6b74543c (29 commits) (#9159) 1d1cff1fa Roll src/third_party/skia 3cd435eecf5e..09f5aedf2cc8 (3 commits) (#9160) The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff (cbracken@google.com), and stop the roller if necessary. --- bin/internal/engine.version | 2 +- packages/flutter_test/lib/src/binding.dart | 7 ++++--- packages/flutter_tools/lib/src/base/io.dart | 1 + packages/flutter_tools/test/commands/create_test.dart | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 7a1af8dfdee..421ea62e54d 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -69ebe5fb28fca271b23010d43d4dc7f6e5286c4f +a4b7d1c2895d82228705a021cdb7fdb2f71ac2a5 diff --git a/packages/flutter_test/lib/src/binding.dart b/packages/flutter_test/lib/src/binding.dart index 7d450be427a..e158e33af7e 100644 --- a/packages/flutter_test/lib/src/binding.dart +++ b/packages/flutter_test/lib/src/binding.dart @@ -1763,9 +1763,10 @@ class _MockHttpResponse extends Stream> implements HttpClientResponse @override int get contentLength => -1; - // @override - // TODO(tvolkert): Uncomment @override annotation once SDK change lands. - bool get autoUncompress => true; + @override + HttpClientResponseCompressionState get compressionState { + return HttpClientResponseCompressionState.decompressed; + } @override List get cookies => null; diff --git a/packages/flutter_tools/lib/src/base/io.dart b/packages/flutter_tools/lib/src/base/io.dart index 4c9d2250bb1..8b3535d546f 100644 --- a/packages/flutter_tools/lib/src/base/io.dart +++ b/packages/flutter_tools/lib/src/base/io.dart @@ -47,6 +47,7 @@ export 'dart:io' HttpClient, HttpClientRequest, HttpClientResponse, + HttpClientResponseCompressionState, HttpHeaders, HttpRequest, HttpServer, diff --git a/packages/flutter_tools/test/commands/create_test.dart b/packages/flutter_tools/test/commands/create_test.dart index 37b09b0f389..8c0e981e87f 100644 --- a/packages/flutter_tools/test/commands/create_test.dart +++ b/packages/flutter_tools/test/commands/create_test.dart @@ -1257,6 +1257,11 @@ class MockHttpClientResponse extends Stream> implements HttpClientResp @override String get reasonPhrase => ''; + @override + HttpClientResponseCompressionState get compressionState { + return HttpClientResponseCompressionState.decompressed; + } + @override StreamSubscription> listen( void onData(List event), {