Merge remote-tracking branch 'origin/main' into feat/replay-bitmap-transfer

Author: vaind

flutter/.pubignore

@@ -1 +1,2 @@
 .vscode/
+microbenchmarks

flutter/analysis_options.yaml

@@ -3,6 +3,7 @@ include: package:flutter_lints/flutter.yaml
 analyzer:
   exclude:
     - test/*.mocks.dart
+    - microbenchmarks/**
   language:
     strict-casts: true
     strict-inference: true

flutter/lib/src/screenshot/screenshot.dart

@@ -14,6 +14,7 @@ class Screenshot {
   final Flow flow;
   Future<ByteData>? _rawRgbaData;
   Future<ByteData>? _pngData;
+  bool _disposed = false;
 
   Screenshot(this._image, this.timestamp, this.flow);
   Screenshot._cloned(
@@ -49,12 +50,19 @@ class Screenshot {
   }
 
   Screenshot clone() {
-    assert(!_image.debugDisposed);
+    assert(!_disposed, 'Cannot clone a disposed screenshot');
     return Screenshot._cloned(
         _image.clone(), timestamp, flow, _rawRgbaData, _pngData);
   }
 
-  void dispose() => _image.dispose();
+  void dispose() {
+    if (!_disposed) {
+      _disposed = true;
+      _image.dispose();
+      _rawRgbaData = null;
+      _pngData = null;
+    }
+  }
 
   /// Efficiently compares two memory regions for data equality..
   @visibleForTesting

flutter/lib/src/screenshot/stabilizer.dart

@@ -65,7 +65,7 @@ class ScreenshotStabilizer<R> {
       return;
     }
 
-    final prevScreenshot = _previousScreenshot;
+    var prevScreenshot = _previousScreenshot;
     try {
       _previousScreenshot = screenshot.clone();
       if (prevScreenshot != null &&
@@ -85,8 +85,18 @@ class ScreenshotStabilizer<R> {
         return;
       }
     } finally {
+      // [prevScreenshot] and [screenshot] are unnecessary after this line.
       // Note: we need to dispose (free the memory) before recursion.
+      // Also, we need to reset the variable to null so that the whole object
+      // can be garbage collected.
       prevScreenshot?.dispose();
+      prevScreenshot = null;
+      // Note: while the caller will also do `screenshot.dispose()`,
+      // it would be a problem in a long recursion because we only return
+      // from this function when the screenshot is ultimately stable.
+      // At that point, the caller would have accumulated a lot of screenshots
+      // on stack. This would lead to OOM.
+      screenshot.dispose();
     }
 
     if (maxTries != null && _tries >= maxTries!) {

flutter/microbenchmarks/.gitignore

@@ -0,0 +1,45 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.build/
+.buildlog/
+.history
+.svn/
+.swiftpm/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.pub-cache/
+.pub/
+/build/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release

flutter/microbenchmarks/.metadata

@@ -0,0 +1,45 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "8495dee1fd4aacbe9de707e7581203232f591b2f"
+  channel: "stable"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+    - platform: android
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+    - platform: ios
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+    - platform: linux
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+    - platform: macos
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+    - platform: web
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+    - platform: windows
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

flutter/microbenchmarks/README.md

@@ -0,0 +1,11 @@
+# Microbenchmarks
+
+To run these benchmarks on a device, execute:
+```
+flutter run --profile -d <device>
+```
+or
+```
+flutter run --release -d <device>
+```
+

flutter/microbenchmarks/analysis_options.yaml

@@ -0,0 +1,7 @@
+include: package:flutter_lints/flutter.yaml
+
+analyzer:
+  errors:
+    avoid_print: ignore
+    implementation_imports: ignore
+    invalid_use_of_internal_member: ignore

flutter/microbenchmarks/android/.gitignore

@@ -0,0 +1,13 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/to/reference-keystore
+key.properties
+**/*.keystore
+**/*.jks

flutter/microbenchmarks/android/app/build.gradle

@@ -0,0 +1,44 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
+android {
+    namespace = "com.example.microbenchmarks"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "com.example.microbenchmarks"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.debug
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}