Merge branch 'master' of github.com:flutter/flutter into integrate_lo…

…calization
flutter · Apr 23, 2020 · 24e90ad · 24e90ad
2 parents 443ef27 + 240611b
commit 24e90ad
Show file tree

Hide file tree

Showing 311 changed files with 8,257 additions and 3,176 deletions.
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
@@ -1 +1 @@
-ae311ca4da5af9a8b30d4f361ad0473a9528b033
+feb94f6c9774e748628d22d4754fd3a34eccf6d9
diff --git a/bin/internal/fuchsia-linux.version b/bin/internal/fuchsia-linux.version
@@ -1 +1 @@
-1UtoyM5xYhavd9YdlWErYMoR0-f45dTUqn7hhx1Iao0C
+kEtiuXXESsLg2BNT2-rMBtE7amfMpABtpvV9f2br-kAC
diff --git a/bin/internal/fuchsia-mac.version b/bin/internal/fuchsia-mac.version
@@ -1 +1 @@
-akM_dAPd5mFOGO5IPovHhZYnbfJsPYkz31AE2wvj3PcC
+ornVJ7V0rQ6OtxRu-IPB3yoRLQ6R_qfgKaBvmqUseVUC
diff --git a/dev/automated_tests/flutter_test/filtering_tag_test.dart b/dev/automated_tests/flutter_test/filtering_tag_test.dart
@@ -0,0 +1,14 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
+
+void main() {
+  test('included', () {
+    expect(2 + 2, 4);
+  }, tags: <String>['include-tag']);
+  test('excluded', () {
+    throw 'this test should have been filtered out';
+  }, tags: <String>['exclude-tag']);
+}
diff --git a/dev/automated_tests/pubspec.yaml b/dev/automated_tests/pubspec.yaml
@@ -39,7 +39,7 @@ dependencies:
   node_interop: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   node_io: 1.0.1+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   node_preamble: 1.4.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  package_config: 1.9.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  package_config: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   path: 1.7.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   pedantic: 1.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -60,7 +60,7 @@ dependencies:
   typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   vector_math: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   vm_service: 4.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  watcher: 0.9.7+14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  watcher: 0.9.7+15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   web_socket_channel: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   webkit_inspection_protocol: 0.5.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   yaml: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -70,4 +70,4 @@ flutter:
   assets:
   - icon/
 
-# PUBSPEC CHECKSUM: d484
+# PUBSPEC CHECKSUM: ad87
diff --git a/dev/benchmarks/complex_layout/pubspec.yaml b/dev/benchmarks/complex_layout/pubspec.yaml
@@ -26,7 +26,7 @@ dependencies:
   crypto: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   intl: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  json_rpc_2: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  json_rpc_2: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   meta: 1.1.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   path: 1.7.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -67,7 +67,7 @@ dev_dependencies:
   node_interop: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   node_io: 1.0.1+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   node_preamble: 1.4.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  package_config: 1.9.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  package_config: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   pedantic: 1.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -80,7 +80,7 @@ dev_dependencies:
   test_api: 0.2.15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   test_core: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   vm_service: 4.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  watcher: 0.9.7+14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  watcher: 0.9.7+15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   webkit_inspection_protocol: 0.5.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   yaml: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
@@ -90,4 +90,4 @@ flutter:
     - packages/flutter_gallery_assets/people/square/ali.png
     - packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png
 
-# PUBSPEC CHECKSUM: b552
+# PUBSPEC CHECKSUM: e956
diff --git a/dev/benchmarks/macrobenchmarks/lib/src/web/bench_picture_recording.dart b/dev/benchmarks/macrobenchmarks/lib/src/web/bench_picture_recording.dart
@@ -67,9 +67,9 @@ class BenchPictureRecording extends RawRecorder {
         }
         canvas.restore();
       }
-    });
+    }, reported: true);
     profile.record('estimatePaintBounds', () {
       recorder.endRecording();
-    });
+    }, reported: true);
   }
 }
diff --git a/dev/benchmarks/macrobenchmarks/lib/src/web/bench_text_layout.dart b/dev/benchmarks/macrobenchmarks/lib/src/web/bench_text_layout.dart
@@ -58,11 +58,6 @@ void _useCanvasText(bool useCanvasText) {
   );
 }
 
-typedef OnBenchmark = void Function(String name, num value);
-void _onBenchmark(OnBenchmark listener) {
-  js_util.setProperty(html.window, '_flutter_internal_on_benchmark', listener);
-}
-
 /// Repeatedly lays out a paragraph using the DOM measurement approach.
 ///
 /// Creates a different paragraph each time in order to avoid hitting the cache.
@@ -132,21 +127,21 @@ class BenchTextLayout extends RawRecorder {
   }) {
     profile.record('$keyPrefix.layout', () {
       paragraph.layout(ui.ParagraphConstraints(width: maxWidth));
-    });
+    }, reported: true);
     profile.record('$keyPrefix.getBoxesForRange', () {
       for (int start = 0; start < text.length; start += 3) {
         for (int end = start + 1; end < text.length; end *= 2) {
           paragraph.getBoxesForRange(start, end);
         }
       }
-    });
+    }, reported: true);
     profile.record('$keyPrefix.getPositionForOffset', () {
       for (double dx = 0.0; dx < paragraph.width; dx += 10.0) {
         for (double dy = 0.0; dy < paragraph.height; dy += 10.0) {
           paragraph.getPositionForOffset(Offset(dx, dy));
         }
       }
-    });
+    }, reported: true);
   }
 }
 
@@ -179,7 +174,7 @@ class BenchTextCachedLayout extends RawRecorder {
     final ui.Paragraph paragraph = builder.build();
     profile.record('layout', () {
       paragraph.layout(const ui.ParagraphConstraints(width: double.infinity));
-    });
+    }, reported: true);
     _useCanvasText(null);
   }
 }
@@ -242,15 +237,15 @@ class BenchBuildColorsGrid extends WidgetBuildRecorder {
     if (mode == _TestMode.useDomTextLayout) {
       _useCanvasText(false);
     }
-    _onBenchmark((String name, num value) {
+    registerEngineBenchmarkValueListener('text_layout', (num value) {
       _textLayoutMicros += value;
     });
   }
 
   @override
   Future<void> tearDownAll() async {
     _useCanvasText(null);
-    _onBenchmark(null);
+    stopListeningToEngineBenchmarkValues('text_layout');
   }
 
   @override
@@ -268,6 +263,7 @@ class BenchBuildColorsGrid extends WidgetBuildRecorder {
       profile.addDataPoint(
         'text_layout',
         Duration(microseconds: _textLayoutMicros.toInt()),
+        reported: true,
       );
     }
     super.frameDidDraw();