Merge remote-tracking branch 'upstream/master' into fix_image_limit

Author: Emmanuel Garcia

DEPS

@@ -26,23 +26,23 @@ vars = {
   'skia_git': 'https://skia.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': '716e281185b5b30bef700a6b4bc30bb2ae88f7ed',
+  'skia_revision': '3913d3e137edda87872d4f7002ed6dc97c6faf26',
 
   # When updating the Dart revision, ensure that all entries that are
   # dependencies of Dart are also updated to match the entries in the
   # Dart SDK's DEPS file for that revision of Dart. The DEPS file for
   # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '8e50ccae259f8db4b4e7e66ccc0e76064d07705b',
+  'dart_revision': '2a5f37d2545304b1065bf9a6e6cc42f5e88c772a',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
   'dart_args_tag': '1.6.0',
   'dart_boringssl_gen_rev': '429ccb1877f7987a6f3988228bc2440e61293499',
   'dart_boringssl_rev': '4dfd5af70191b068aebe567b8e29ce108cee85ce',
   'dart_collection_rev': '583693680fc067e34ca5b72503df25e8b80579f9',
-  'dart_dart_style_tag': '1.3.6',
+  'dart_dart_style_tag': '1.3.7',
   'dart_http_retry_tag': '0.1.1',
   'dart_http_throttle_tag': '1.0.2',
   'dart_intl_tag': '0.16.1',
@@ -187,10 +187,10 @@ deps = {
    Var('dart_git') + '/crypto.git@f7c48b334b1386bc5ab0f706fbcd6df8496a87fc',
 
   'src/third_party/dart/third_party/pkg/csslib':
-   Var('dart_git') + '/csslib.git@451448a9ac03f87a8d0377fc0b411d8c388a6cb4',
+   Var('dart_git') + '/csslib.git@166d3e07eabc8283c6137cfde17fb25b8bb40080',
 
   'src/third_party/dart/third_party/pkg/dart2js_info':
-   Var('dart_git') + '/dart2js_info.git@94ba36cb77067f28b75a4212e77b810a2d7385e9',
+   Var('dart_git') + '/dart2js_info.git@0632a623b08e1f601c7eba99e0186a581ae799e9',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
    Var('dart_git') + '/dartdoc.git@291ebc50072746bc59ccab59115a298915218428',
@@ -516,7 +516,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'tG1GErEv9rabl_dE_vCvPMIl-tHq6bfCgIWFEuRk2dUC'
+        'version': 'sI2DAAmSIPFpoSRKVuU-K8lxECFNgEvTmP4XADA_LYwC'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -536,7 +536,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'kbanTZZRSTnc_fWORhNQBYiK03bV081IPZlsuCEiOiEC'
+        'version': '_SVZn8uN29ChCSHo5MzviLagX5er-rvbxq1TCGIknToC'
        }
      ],
      'condition': 'host_os == "linux"',

ci/licenses_golden/licenses_flutter

@@ -694,6 +694,7 @@ FILE: ../../../flutter/shell/platform/android/external_view_embedder/surface_poo
 FILE: ../../../flutter/shell/platform/android/external_view_embedder/surface_pool_unittests.cc
 FILE: ../../../flutter/shell/platform/android/flutter_main.cc
 FILE: ../../../flutter/shell/platform/android/flutter_main.h
+FILE: ../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/Log.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
@@ -753,6 +754,7 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugin
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java
@@ -1162,6 +1164,8 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/engine.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_fakes.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_external_view_embedder.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_external_view_embedder.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl_unittest.cc

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 6b67d131dea8d5ccfc6bf81a69dd6776
+Signature: 36e26eb5f7d104d66534e91db08f4946
 
 UNUSED LICENSES:
 

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: ab2adb399bdff2d17d2f0f3d64d7a56b
+Signature: 074a50d9184c881a766997db171b02d1
 
 UNUSED LICENSES:
 
@@ -3992,6 +3992,8 @@ FILE: ../../../third_party/skia/src/ports/SkNDKConversions.h
 FILE: ../../../third_party/skia/src/sksl/SkSLAnalysis.h
 FILE: ../../../third_party/skia/src/sksl/SkSLDehydrator.cpp
 FILE: ../../../third_party/skia/src/sksl/SkSLDehydrator.h
+FILE: ../../../third_party/skia/src/sksl/SkSLInliner.cpp
+FILE: ../../../third_party/skia/src/sksl/SkSLInliner.h
 FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.cpp
 FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.h
 FILE: ../../../third_party/skia/src/sksl/SkSLSampleUsage.cpp
@@ -4115,6 +4117,7 @@ FILE: ../../../third_party/skia/samplecode/Sample3D.cpp
 FILE: ../../../third_party/skia/samplecode/SampleAudio.cpp
 FILE: ../../../third_party/skia/samplecode/SampleFitCubicToCircle.cpp
 FILE: ../../../third_party/skia/samplecode/SampleSimpleStroker.cpp
+FILE: ../../../third_party/skia/samplecode/SampleTiming.cpp
 FILE: ../../../third_party/skia/src/core/SkColorFilterPriv.h
 FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.cpp
 FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.h
@@ -4922,7 +4925,6 @@ FILE: ../../../third_party/skia/docs/examples/Path_dump_2.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_empty_constructor.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_equal_operator.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_getBounds.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_getConvexity.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_getConvexityOrUnknown.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_getFillType.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_getGenerationID.cpp
@@ -4948,7 +4950,6 @@ FILE: ../../../third_party/skia/docs/examples/Path_lineTo.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_lineTo_2.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_moveTo.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_moveTo_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_notequal_operator.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_offset.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_offset_2.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_quadTo.cpp
@@ -4964,7 +4965,6 @@ FILE: ../../../third_party/skia/docs/examples/Path_reset.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_reverseAddPath.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_rewind.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_serialize.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_setConvexity.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_setFillType.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_setIsVolatile.cpp
 FILE: ../../../third_party/skia/docs/examples/Path_setLastPt.cpp

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: d18f651f0c75d76c7d258ca64692fd74
+Signature: 38135f790d0d98fe61df7551e9ec10ec
 
 UNUSED LICENSES:
 
@@ -8383,8 +8383,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: dart
-ORIGIN: ../../../third_party/dart/benchmarks/ListCopy/dart/ListCopy.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/benchmarks/Dynamic/dart/Dynamic.dart + ../../../third_party/dart/LICENSE
 TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/benchmarks/Dynamic/dart/Dynamic.dart
+FILE: ../../../third_party/dart/benchmarks/Dynamic/dart2/Dynamic.dart
 FILE: ../../../third_party/dart/benchmarks/ListCopy/dart/ListCopy.dart
 FILE: ../../../third_party/dart/benchmarks/ListCopy/dart2/ListCopy.dart
 FILE: ../../../third_party/dart/benchmarks/MD5/dart/md5.dart

common/settings.h

@@ -223,15 +223,6 @@ struct Settings {
   /// to log a timeline event that tracks the latency of engine startup.
   std::chrono::microseconds engine_start_timestamp = {};
 
-  /// Whether the application claims that it uses the android embedded view for
-  /// platform views.
-  ///
-  /// A `true` value will result the raster task runner always run on the
-  /// platform thread.
-  // TODO(cyanlaz): Remove this when dynamic thread merging is done.
-  // https://github.com/flutter/flutter/issues/59930
-  bool use_embedded_view = false;
-
   std::string ToString() const;
 };
 

e2etests/web/regular_integration_tests/pubspec.yaml

@@ -13,7 +13,7 @@ dev_dependencies:
     sdk: flutter
   flutter_test:
     sdk: flutter
-  e2e: 0.4.0
+  integration_test: 0.9.0
   http: 0.12.0+2
   test: any
 

e2etests/web/regular_integration_tests/test_driver/image_loading_e2e.dart

@@ -6,10 +6,10 @@ import 'dart:html' as html;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:regular_integration_tests/image_loading_main.dart' as app;
 
-import 'package:e2e/e2e.dart';
+import 'package:integration_test/integration_test.dart';
 
 void main() {
-  E2EWidgetsFlutterBinding.ensureInitialized() as E2EWidgetsFlutterBinding;
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   testWidgets('Image loads asset variant based on device pixel ratio',
           (WidgetTester tester) async {

e2etests/web/regular_integration_tests/test_driver/image_loading_e2e_test.dart

@@ -2,6 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:e2e/e2e_driver.dart' as e2e;
+import 'package:integration_test/integration_test_driver.dart' as test;
 
-Future<void> main() async => e2e.main();
+Future<void> main() async => test.integrationDriver();

e2etests/web/regular_integration_tests/test_driver/platform_messages_e2e.dart

@@ -10,10 +10,10 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:regular_integration_tests/platform_messages_main.dart' as app;
 
-import 'package:e2e/e2e.dart';
+import 'package:integration_test/integration_test.dart';
 
 void main() async {
-  E2EWidgetsFlutterBinding.ensureInitialized() as E2EWidgetsFlutterBinding;
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   testWidgets('platform message for Clipboard.setData reply with future',
       (WidgetTester tester) async {