[iOS] Called platform view only once

.github/auto_assign.yml

@@ -17,7 +17,6 @@ reviewers:
   - GaryQian
   - jason-simmons
   - iskakaushik
-  - cbracken
   - flar
 
 # A number of reviewers added to the pull request

DEPS

@@ -26,15 +26,15 @@ 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': '50daeddf396f2f1cbb3a4a70ec785f8e3d4dca66',
+  'skia_revision': '632db1c742121f6176aa4627bac2ab1dc85cde5a',
 
   # 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': '9fcac032b669a772050fea629acf9732d0d80a7b',
+  'dart_revision': 'd8eb844e5d8f8c23166cb6877bcbe501d889ba38',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -354,7 +354,7 @@ deps = {
    Var('dart_git') + '/package_config.git@9c586d04bd26fef01215fd10e7ab96a3050cfa64',
 
   'src/third_party/dart/tools/sdks':
-   {'packages': [{'version': 'version:2.9.0-16.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'version:2.9.0-18.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -521,7 +521,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'thz2_oecn3_6i9chmPVP3cC5_WqCwF80ttrY9vqK4jYC'
+        'version': 'l2ubU17oZ4OMTqGo24etGpB7DBv7fY6qqTlAk0IZCB0C'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -541,7 +541,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'gaCdqe5pvWAil0qJ9M7V7TWshgYOn7zOvYyKzM0wzwQC'
+        'version': 'GqEvVysSbeMClo7IZMsJWgJQZiDp9ZibF_n3cCpmaBEC'
        }
      ],
      'condition': 'host_os == "linux"',

README.md

@@ -15,6 +15,10 @@ toolchain. Most developers will interact with Flutter via the [Flutter
 Framework](https://github.com/flutter/flutter), which provides a modern,
 reactive framework, and a rich set of platform, layout and foundation widgets.
 
+If you want to run/contribute to Flutter Web engine, more tooling can be 
+found at [felt](https://github.com/flutter/engine/tree/master/lib/web_ui/dev#whats-felt).
+This is a tool written to make web engine development experience easy.
+
 If you are new to Flutter, then you will find more general information
 on the Flutter project, including tutorials and samples, on our Web
 site at [Flutter.dev](https://flutter.dev). For specific information

ci/licenses_golden/licenses_flutter

@@ -690,6 +690,7 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/Flutt
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineProvider.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSplashView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 3faf3cde076e4318d67e988eb33ab900
+Signature: 249cd748150db631d8b4aaa058320686
 
 UNUSED LICENSES:
 
@@ -1485,7 +1485,6 @@ FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/fd.h
 FILE: ../../../fuchsia/sdk/linux/pkg/fdio/meta.json
 FILE: ../../../fuchsia/sdk/linux/pkg/fidl-async/meta.json
 FILE: ../../../fuchsia/sdk/linux/pkg/fidl/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/envelope_frames.h
 FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/internal_callable_traits.h
 FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/txn_header.h
 FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/visitor.h
@@ -3158,6 +3157,8 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castwindow/window.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/constants.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/error.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/interest.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/severity.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory.wlan/iovar.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/crash_register.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/data_register.fidl

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: cef2ee190e58d4bdbb36c83d85fd943a
+Signature: b3e814b93da372c39dbd3a9b96a6ac4e
 
 UNUSED LICENSES:
 
@@ -969,6 +969,7 @@ FILE: ../../../third_party/skia/bench/microbench.json
 FILE: ../../../third_party/skia/bench/skpbench.json
 FILE: ../../../third_party/skia/build/fuchsia/skqp/skqp.cmx
 FILE: ../../../third_party/skia/build/fuchsia/skqp/test_manifest.json
+FILE: ../../../third_party/skia/demos.skia.org/demos/hello_world/index.html
 FILE: ../../../third_party/skia/docker/binary-size/Dockerfile
 FILE: ../../../third_party/skia/docker/cmake-release/Dockerfile
 FILE: ../../../third_party/skia/docker/skia-build-tools/Dockerfile
@@ -2338,6 +2339,7 @@ FILE: ../../../third_party/skia/include/codec/SkAndroidCodec.h
 FILE: ../../../third_party/skia/include/codec/SkCodec.h
 FILE: ../../../third_party/skia/include/core/SkEncodedImageFormat.h
 FILE: ../../../third_party/skia/include/core/SkFilterQuality.h
+FILE: ../../../third_party/skia/include/core/SkPathBuilder.h
 FILE: ../../../third_party/skia/include/core/SkPixmap.h
 FILE: ../../../third_party/skia/include/core/SkPngChunkReader.h
 FILE: ../../../third_party/skia/include/core/SkPoint3.h
@@ -2425,6 +2427,7 @@ FILE: ../../../third_party/skia/src/core/SkMiniRecorder.h
 FILE: ../../../third_party/skia/src/core/SkNextID.h
 FILE: ../../../third_party/skia/src/core/SkOpts.cpp
 FILE: ../../../third_party/skia/src/core/SkOpts.h
+FILE: ../../../third_party/skia/src/core/SkPathBuilder.cpp
 FILE: ../../../third_party/skia/src/core/SkPathPriv.h
 FILE: ../../../third_party/skia/src/core/SkPictureCommon.h
 FILE: ../../../third_party/skia/src/core/SkPictureImageGenerator.cpp
@@ -5219,9 +5222,12 @@ TYPE: LicenseType.bsd
 FILE: ../../../third_party/skia/bench/TessellatePathBench.cpp
 FILE: ../../../third_party/skia/experimental/skrive/include/SkRive.h
 FILE: ../../../third_party/skia/experimental/skrive/src/Artboard.cpp
+FILE: ../../../third_party/skia/experimental/skrive/src/Color.cpp
 FILE: ../../../third_party/skia/experimental/skrive/src/Component.cpp
 FILE: ../../../third_party/skia/experimental/skrive/src/Drawable.cpp
+FILE: ../../../third_party/skia/experimental/skrive/src/Ellipse.cpp
 FILE: ../../../third_party/skia/experimental/skrive/src/Node.cpp
+FILE: ../../../third_party/skia/experimental/skrive/src/Paint.cpp
 FILE: ../../../third_party/skia/experimental/skrive/src/Shape.cpp
 FILE: ../../../third_party/skia/experimental/skrive/src/SkRive.cpp
 FILE: ../../../third_party/skia/experimental/skrive/src/reader/BinaryReader.cpp

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: 373a1ce95e3235f255bd904c4e32e9e8
+Signature: a56d6bbdec23954f9cf69a9a3300d035
 
 UNUSED LICENSES:
 

common/settings.h

@@ -213,6 +213,15 @@ 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;
 };
 

flow/embedded_views.h

@@ -123,7 +123,7 @@ class Mutator {
 //
 // For example consider the following stack: [T1, T2, T3], where T1 is the top
 // of the stack and T3 is the bottom of the stack. Applying this mutators stack
-// to a platform view P1 will result in T1(T2(T2(P1))).
+// to a platform view P1 will result in T1(T2(T3(P1))).
 class MutatorsStack {
  public:
   MutatorsStack() = default;
@@ -287,16 +287,16 @@ class ExternalViewEmbedder {
   virtual bool SubmitFrame(GrContext* context,
                            std::unique_ptr<SurfaceFrame> frame);
 
-  // This should only be called after |SubmitFrame|.
   // This method provides the embedder a way to do additional tasks after
-  // |SubmitFrame|. After invoking this method, the current task on the
-  // TaskRunner should end immediately.
+  // |SubmitFrame|. For example, merge task runners if `should_resubmit_frame`
+  // is true.
   //
   // For example on the iOS embedder, threads are merged in this call.
   // A new frame on the platform thread starts immediately. If the GPU thread
   // still has some task running, there could be two frames being rendered
   // concurrently, which causes undefined behaviors.
   virtual void EndFrame(
+      bool should_resubmit_frame,
       fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {}
 
   FML_DISALLOW_COPY_AND_ASSIGN(ExternalViewEmbedder);

flutter_frontend_server/lib/server.dart

@@ -28,10 +28,12 @@ class _FlutterFrontendCompiler implements frontend.CompilerInterface {
   _FlutterFrontendCompiler(StringSink output,
       {bool unsafePackageSerialization,
       bool useDebuggerModuleNames,
+      bool emitDebugMetadata,
       frontend.ProgramTransformer transformer})
       : _compiler = frontend.FrontendCompiler(output,
             transformer: transformer,
             useDebuggerModuleNames: useDebuggerModuleNames,
+            emitDebugMetadata: emitDebugMetadata,
             unsafePackageSerialization: unsafePackageSerialization);
 
   @override
@@ -171,6 +173,7 @@ Future<int> starter(
   compiler ??= _FlutterFrontendCompiler(output,
       transformer: ToStringTransformer(transformer, deleteToStringPackageUris),
       useDebuggerModuleNames: options['debugger-module-names'] as bool,
+      emitDebugMetadata: options['experimental-emit-debug-metadata'] as bool,
       unsafePackageSerialization:
           options['unsafe-package-serialization'] as bool);
 

lib/web_ui/dev/browser_lock.yaml

@@ -12,5 +12,9 @@ edge:
   launcher_version: '1.2.0.0'
 ios-safari:
   majorVersion: 13
-  minorVersion: 5
+  minorVersion: 0
   device: 'iPhone 11'
+## geckodriver is used for testing Firefox Browser. It works with multiple
+## Firefox Browser versions.
+## See: https://github.com/mozilla/geckodriver/releases
+geckodriver: 'v0.26.0'

lib/web_ui/dev/driver_manager.dart

@@ -7,7 +7,9 @@ import 'dart:io' as io;
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as pathlib;
 import 'package:web_driver_installer/chrome_driver_installer.dart';
+import 'package:web_driver_installer/firefox_driver_installer.dart';
 import 'package:web_driver_installer/safari_driver_runner.dart';
+import 'package:yaml/yaml.dart';
 
 import 'chrome_installer.dart';
 import 'common.dart';
@@ -16,10 +18,11 @@ import 'utils.dart';
 
 /// [DriverManager] implementation for Chrome.
 ///
-/// This manager can be used for both MacOS and Linux.
+/// This manager can be used for both macOS and Linux.
 class ChromeDriverManager extends DriverManager {
   ChromeDriverManager(String browser) : super(browser);
 
+  @override
   Future<void> _installDriver() async {
     if (_browserDriverDir.existsSync()) {
       _browserDriverDir.deleteSync(recursive: true);
@@ -45,6 +48,7 @@ class ChromeDriverManager extends DriverManager {
   /// Throw an error if driver directory does not exists.
   ///
   /// Driver should already exist on LUCI as a CIPD package.
+  @override
   Future<void> _verifyDriverForLUCI() {
     if (!_browserDriverDir.existsSync()) {
       throw StateError('Failed to locate Chrome driver on LUCI on path:'
@@ -53,31 +57,93 @@ class ChromeDriverManager extends DriverManager {
     return Future<void>.value();
   }
 
+  @override
   Future<void> _startDriver(String driverPath) async {
     await startProcess('./chromedriver/chromedriver', ['--port=4444'],
         workingDirectory: driverPath);
     print('INFO: Driver started');
   }
 }
 
+/// [DriverManager] implementation for Firefox.
+///
+/// This manager can be used for both macOS and Linux.
+class FirefoxDriverManager extends DriverManager {
+  FirefoxDriverManager(String browser) : super(browser);
+
+  FirefoxDriverInstaller firefoxDriverInstaller =
+      FirefoxDriverInstaller(geckoDriverVersion: getLockedGeckoDriverVersion());
+
+  @override
+  Future<void> _installDriver() async {
+    if (_browserDriverDir.existsSync()) {
+      _browserDriverDir.deleteSync(recursive: true);
+    }
+
+    _browserDriverDir.createSync(recursive: true);
+    temporaryDirectories.add(_drivers);
+
+    final io.Directory temp = io.Directory.current;
+    io.Directory.current = _browserDriverDir;
+
+    try {
+      await firefoxDriverInstaller.install(alwaysInstall: false);
+    } finally {
+      io.Directory.current = temp;
+    }
+  }
+
+  /// Throw an error if driver directory does not exist.
+  ///
+  /// Driver should already exist on LUCI as a CIPD package.
+  @override
+  Future<void> _verifyDriverForLUCI() {
+    if (!_browserDriverDir.existsSync()) {
+      throw StateError('Failed to locate Firefox driver on LUCI on path:'
+          '${_browserDriverDir.path}');
+    }
+    return Future<void>.value();
+  }
+
+  @override
+  Future<void> _startDriver(String driverPath) async {
+    await startProcess('./firefoxdriver/geckodriver', ['--port=4444'],
+        workingDirectory: driverPath);
+    print('INFO: Driver started');
+  }
+
+  /// Get the geckodriver version to be used with [FirefoxDriverInstaller].
+  ///
+  /// For different versions of geckodriver. See:
+  /// https://github.com/mozilla/geckodriver/releases
+  static String getLockedGeckoDriverVersion() {
+    final YamlMap browserLock = BrowserLock.instance.configuration;
+    String geckoDriverReleaseVersion = browserLock['geckodriver'] as String;
+    return geckoDriverReleaseVersion;
+  }
+}
+
 /// [DriverManager] implementation for Safari.
 ///
-/// This manager is will only be created/used for MacOS.
+/// This manager is will only be created/used for macOS.
 class SafariDriverManager extends DriverManager {
   SafariDriverManager(String browser) : super(browser);
 
+  @override
   Future<void> _installDriver() {
     // No-op.
     // macOS comes with Safari Driver installed.
     return new Future<void>.value();
   }
 
+  @override
   Future<void> _verifyDriverForLUCI() {
     // No-op.
     // macOS comes with Safari Driver installed.
     return Future<void>.value();
   }
 
+  @override
   Future<void> _startDriver(String driverPath) async {
     final SafariDriverRunner safariDriverRunner = SafariDriverRunner();
 
@@ -137,11 +203,13 @@ abstract class DriverManager {
   static DriverManager chooseDriver(String browser) {
     if (browser == 'chrome') {
       return ChromeDriverManager(browser);
+    } else if (browser == 'firefox') {
+      return FirefoxDriverManager(browser);
     } else if (browser == 'safari' && io.Platform.isMacOS) {
       return SafariDriverManager(browser);
     } else {
-      throw StateError('Integration tests are only supported on Chrome or '
-          'on Safari (running on MacOS)');
+      throw StateError('Integration tests are only supported on Firefox, Chrome'
+          ' and on Safari (running on macOS)');
     }
   }
 }