CP 3.3: Remove context assertion from Android platform views using Virtual Display

DEPS

@@ -35,7 +35,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '654db247514fd82fe4037af9c7ef419cab8484b5',
+  'dart_revision': '63c2197b976931c6472d9dc9574f98ff2ae9408c',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py

ci/firebase_testlab.py

@@ -11,7 +11,16 @@
 import subprocess
 import sys
 
-BUCKET = 'gs://flutter_firebase_testlab'
+if 'STORAGE_BUCKET' not in os.environ:
+  print('The GCP storage bucket must be provided as an environment variable.')
+  sys.exit(1)
+BUCKET = os.environ['STORAGE_BUCKET']
+
+if 'GCP_PROJECT' not in os.environ:
+  print('The GCP project must be provided as an environment variable.')
+  sys.exit(1)
+PROJECT = os.environ['GCP_PROJECT']
+
 script_dir = os.path.dirname(os.path.realpath(__file__))
 buildroot_dir = os.path.abspath(os.path.join(script_dir, '..', '..'))
 out_dir = os.path.join(buildroot_dir, 'out')
@@ -28,7 +37,7 @@ def run_firebase_test(apk, results_dir):
       [
           'gcloud',
           '--project',
-          'flutter-infra',
+          PROJECT,
           'firebase',
           'test',
           'android',

ci/licenses_golden/licenses_flutter

@@ -2397,6 +2397,8 @@ FILE: ../../../flutter/shell/platform/windows/window_state.h
 FILE: ../../../flutter/shell/platform/windows/window_win32.cc
 FILE: ../../../flutter/shell/platform/windows/window_win32.h
 FILE: ../../../flutter/shell/platform/windows/window_win32_unittests.cc
+FILE: ../../../flutter/shell/platform/windows/windows_proc_table.cc
+FILE: ../../../flutter/shell/platform/windows/windows_proc_table.h
 FILE: ../../../flutter/shell/profiling/sampling_profiler.cc
 FILE: ../../../flutter/shell/profiling/sampling_profiler.h
 FILE: ../../../flutter/shell/profiling/sampling_profiler_unittest.cc

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: af6717216660c358a8a89f8c8a9cf21b
+Signature: afc25a44d546c441153d3dd3a92c0ddf
 
 UNUSED LICENSES:
 

impeller/compiler/impellerc_main.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <filesystem>
+#include <system_error>
 
 #include "flutter/fml/backtrace.h"
 #include "flutter/fml/command_line.h"
@@ -20,6 +21,21 @@
 namespace impeller {
 namespace compiler {
 
+// Sets the file access mode of the file at path 'p' to 0644.
+static bool SetPermissiveAccess(const std::filesystem::path& p) {
+  auto permissions =
+      std::filesystem::perms::owner_read | std::filesystem::perms::owner_write |
+      std::filesystem::perms::group_read | std::filesystem::perms::others_read;
+  std::error_code error;
+  std::filesystem::permissions(p, permissions, error);
+  if (error) {
+    std::cerr << "Failed to set access on file '" << p
+              << "': " << error.message() << std::endl;
+    return false;
+  }
+  return true;
+}
+
 bool Main(const fml::CommandLine& command_line) {
   fml::InstallCrashHandler();
   if (command_line.HasOption("help")) {
@@ -110,6 +126,11 @@ bool Main(const fml::CommandLine& command_line) {
                   << std::endl;
         return false;
       }
+      // Tools that consume the runtime stage data expect the access mode to
+      // be 0644.
+      if (!SetPermissiveAccess(sl_file_name)) {
+        return false;
+      }
     } else {
       if (!fml::WriteAtomically(*switches.working_directory,
                                 sl_file_name.string().c_str(),

lib/ui/BUILD.gn

@@ -185,6 +185,7 @@ if (enable_unittests) {
     dart_main = "fixtures/ui_test.dart"
     fixtures = [
       "fixtures/DashInNooglerHat.jpg",
+      "fixtures/DashInNooglerHat%20WithSpace.jpg",
       "fixtures/Horizontal.jpg",
       "fixtures/Horizontal.png",
       "fixtures/hello_loop_2.gif",

lib/ui/compositing.dart

@@ -21,23 +21,6 @@ class Scene extends NativeFieldWrapperClass1 {
   @pragma('vm:entry-point')
   Scene._();
 
-  /// Synchronously creates a handle to an image from this scene.
-  ///
-  /// {@macro dart.ui.painting.Picture.toImageSync}
-  Image toImageSync(int width, int height) {
-    if (width <= 0 || height <= 0) {
-      throw Exception('Invalid image dimensions.');
-    }
-
-    final _Image image = _Image._();
-    final String? result =  _toImageSync(width, height, image);
-    if (result != null) {
-      throw PictureRasterizationException._(result);
-    }
-    return Image._(image, image.width, image.height);
-  }
-  String? _toImageSync(int width, int height, _Image outImage) native 'Scene_toImageSync';
-
   /// Creates a raster image representation of the current state of the scene.
   /// This is a slow operation that is performed on a background thread.
   ///

lib/ui/compositing/scene.cc

@@ -22,7 +22,6 @@ namespace flutter {
 IMPLEMENT_WRAPPERTYPEINFO(ui, Scene);
 
 #define FOR_EACH_BINDING(V) \
-  V(Scene, toImageSync)     \
   V(Scene, toImage)         \
   V(Scene, dispose)
 
@@ -67,24 +66,6 @@ void Scene::dispose() {
   ClearDartWrapper();
 }
 
-Dart_Handle Scene::toImageSync(uint32_t width,
-                               uint32_t height,
-                               Dart_Handle raw_image_handle) {
-  TRACE_EVENT0("flutter", "Scene::toImageSync");
-
-  if (!layer_tree_) {
-    return tonic::ToDart("Scene did not contain a layer tree.");
-  }
-
-  auto picture = layer_tree_->Flatten(SkRect::MakeWH(width, height));
-  if (!picture) {
-    return tonic::ToDart("Could not flatten scene into a layer tree.");
-  }
-
-  Picture::RasterizeToImageSync(picture, width, height, raw_image_handle);
-  return Dart_Null();
-}
-
 Dart_Handle Scene::toImage(uint32_t width,
                            uint32_t height,
                            Dart_Handle raw_image_callback) {

lib/ui/compositing/scene.h

@@ -32,10 +32,6 @@ class Scene : public RefCountedDartWrappable<Scene> {
 
   std::unique_ptr<flutter::LayerTree> takeLayerTree();
 
-  Dart_Handle toImageSync(uint32_t width,
-                          uint32_t height,
-                          Dart_Handle raw_image_handle);
-
   Dart_Handle toImage(uint32_t width,
                       uint32_t height,
                       Dart_Handle image_callback);

lib/ui/painting.dart

@@ -5375,35 +5375,6 @@ class Picture extends NativeFieldWrapperClass1 {
   }
   String? _toImage(int width, int height, _Callback<_Image?> callback) native 'Picture_toImage';
 
-  /// Synchronously creates a handle to an image of this picture.
-  ///
-  /// {@template dart.ui.painting.Picture.toImageSync}
-  /// The returned image will be `width` pixels wide and `height` pixels high.
-  /// The picture is rasterized within the 0 (left), 0 (top), `width` (right),
-  /// `height` (bottom) bounds. Content outside these bounds is clipped.
-  ///
-  /// The image object is created and returned synchronously, but is rasterized
-  /// asynchronously. If the rasterization fails, an exception will be thrown
-  /// when the image is drawn to a [Canvas].
-  ///
-  /// If a GPU context is available, this image will be created as GPU resident
-  /// and not copied back to the host. This means the image will be more
-  /// efficient to draw.
-  ///
-  /// If no GPU context is availalbe, the image will be rasterized on the CPU.
-  /// {@endtemplate}
-  Image toImageSync(int width, int height) {
-    assert(!_disposed);
-    if (width <= 0 || height <= 0) {
-      throw Exception('Invalid image dimensions.');
-    }
-
-    final _Image image = _Image._();
-    _toImageSync(width, height, image);
-    return Image._(image, image.width, image.height);
-  }
-  void _toImageSync(int width, int height, _Image outImage) native 'Picture_toImageSync';
-
   /// Release the resources used by this object. The object is no longer usable
   /// after this method is called.
   void dispose() {
@@ -5703,9 +5674,14 @@ class ImmutableBuffer extends NativeFieldWrapperClass1 {
   ///
   /// Throws an [Exception] if the asset does not exist.
   static Future<ImmutableBuffer> fromAsset(String assetKey) {
+    // The flutter tool converts all asset keys with spaces into URI
+    // encoded paths (replacing ' ' with '%20', for example). We perform
+    // the same encoding here so that users can load assets with the same
+    // key they have written in the pubspec.
+    final String encodedKey = Uri(path: Uri.encodeFull(assetKey)).path;
     final ImmutableBuffer instance = ImmutableBuffer._(0);
     return _futurize((_Callback<int> callback) {
-      return instance._initFromAsset(assetKey, callback);
+      return instance._initFromAsset(encodedKey, callback);
     }).then((int length) => instance.._length = length);
   }
 
@@ -5912,7 +5888,7 @@ Future<T> _futurize<T>(_Callbacker<T> callbacker) {
 }
 
 /// An exception thrown by [Canvas.drawImage] and related methods when drawing
-/// an [Image] created via [Picture.toImageSync] that is in an invalid state.
+/// an [Image] that is in an invalid state.
 ///
 /// This exception may be thrown if the requested image dimensions exceeded the
 /// maximum 2D texture size allowed by the GPU, or if no GPU surface or context

lib/ui/painting/picture.cc

@@ -23,7 +23,6 @@ IMPLEMENT_WRAPPERTYPEINFO(ui, Picture);
 
 #define FOR_EACH_BINDING(V) \
   V(Picture, toImage)       \
-  V(Picture, toImageSync)   \
   V(Picture, dispose)       \
   V(Picture, GetAllocationSize)
 
@@ -53,46 +52,6 @@ Dart_Handle Picture::toImage(uint32_t width,
                           raw_image_callback);
 }
 
-void Picture::toImageSync(uint32_t width,
-                          uint32_t height,
-                          Dart_Handle raw_image_handle) {
-  FML_DCHECK(display_list_.skia_object());
-  RasterizeToImageSync(display_list_.skia_object(), width, height,
-                       raw_image_handle);
-}
-
-// static
-void Picture::RasterizeToImageSync(sk_sp<DisplayList> display_list,
-                                   uint32_t width,
-                                   uint32_t height,
-                                   Dart_Handle raw_image_handle) {
-  auto* dart_state = UIDartState::Current();
-  auto unref_queue = dart_state->GetSkiaUnrefQueue();
-  auto snapshot_delegate = dart_state->GetSnapshotDelegate();
-  auto raster_task_runner = dart_state->GetTaskRunners().GetRasterTaskRunner();
-
-  auto image = CanvasImage::Create();
-  auto dl_image = DlDeferredImageGPU::Make(SkISize::Make(width, height));
-  image->set_image(dl_image);
-
-  fml::TaskRunner::RunNowOrPostTask(
-      raster_task_runner,
-      [snapshot_delegate, unref_queue, dl_image = std::move(dl_image),
-       display_list = std::move(display_list)]() {
-        sk_sp<SkImage> sk_image;
-        std::string error;
-        std::tie(sk_image, error) = snapshot_delegate->MakeGpuImage(
-            display_list, dl_image->dimensions());
-        if (sk_image) {
-          dl_image->set_image(std::move(sk_image));
-        } else {
-          dl_image->set_error(std::move(error));
-        }
-      });
-
-  image->AssociateWithDartWrapper(raw_image_handle);
-}
-
 void Picture::dispose() {
   display_list_.reset();
   ClearDartWrapper();

lib/ui/painting/picture.h

@@ -37,21 +37,12 @@ class Picture : public RefCountedDartWrappable<Picture> {
                       uint32_t height,
                       Dart_Handle raw_image_callback);
 
-  void toImageSync(uint32_t width,
-                   uint32_t height,
-                   Dart_Handle raw_image_handle);
-
   void dispose();
 
   size_t GetAllocationSize() const override;
 
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
-  static void RasterizeToImageSync(sk_sp<DisplayList> display_list,
-                                   uint32_t width,
-                                   uint32_t height,
-                                   Dart_Handle raw_image_handle);
-
   static Dart_Handle RasterizeToImage(sk_sp<DisplayList> display_list,
                                       uint32_t width,
                                       uint32_t height,

lib/web_ui/lib/canvas.dart

@@ -155,7 +155,6 @@ abstract class Canvas {
 
 abstract class Picture {
   Future<Image> toImage(int width, int height);
-  Image toImageSync(int width, int height);
   void dispose();
   bool get debugDisposed;
   int get approximateBytesUsed;

lib/web_ui/lib/compositing.dart

@@ -6,7 +6,6 @@ part of ui;
 
 abstract class Scene {
   Future<Image> toImage(int width, int height);
-  Image toImageSync(int width, int height);
   void dispose();
 }
 

lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart

@@ -25,12 +25,6 @@ class LayerScene implements ui.Scene {
     final ui.Picture picture = layerTree.flatten();
     return picture.toImage(width, height);
   }
-
-  @override
-  ui.Image toImageSync(int width, int height) {
-    final ui.Picture picture = layerTree.flatten();
-    return picture.toImageSync(width, height);
-  }
 }
 
 class LayerSceneBuilder implements ui.SceneBuilder {

lib/web_ui/lib/src/engine/canvaskit/picture.dart

@@ -92,11 +92,6 @@ class CkPicture extends ManagedSkiaObject<SkPicture> implements ui.Picture {
 
   @override
   Future<ui.Image> toImage(int width, int height) async {
-    return toImageSync(width, height);
-  }
-
-  @override
-  ui.Image toImageSync(int width, int height) {
     assert(debugCheckNotDisposed('Cannot convert picture to image.'));
     final SkSurface skSurface = canvasKit.MakeSurface(width, height);
     final SkCanvas skCanvas = skSurface.getCanvas();

lib/web_ui/lib/src/engine/html/scene.dart

@@ -24,11 +24,6 @@ class SurfaceScene implements ui.Scene {
     throw UnsupportedError('toImage is not supported on the Web');
   }
 
-  @override
-  ui.Image toImageSync(int width, int height) {
-    throw UnsupportedError('toImageSync is not supported on the Web');
-  }
-
   /// Releases the resources used by this scene.
   ///
   /// After calling this function, the scene is cannot be used further.

lib/web_ui/lib/src/engine/picture.dart

@@ -88,11 +88,6 @@ class EnginePicture implements ui.Picture {
     return onImageLoaded.future;
   }
 
-  @override
-  ui.Image toImageSync(int width, int height) {
-    throw UnsupportedError('toImageSync is not supported on the HTML backend. Use drawPicture instead, or toImage.');
-  }
-
   bool _disposed = false;
 
   @override