Multiview painting: Studio

ci/licenses_golden/licenses_flutter

@@ -844,6 +844,8 @@ ORIGIN: ../../../flutter/flow/raster_cache_util.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/rtree.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/rtree.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/skia_gpu_object.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/studio.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/studio.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/surface.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/surface.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/surface_frame.cc + ../../../flutter/LICENSE
@@ -2241,6 +2243,20 @@ ORIGIN: ../../../flutter/shell/common/vsync_waiter_fallback.cc + ../../../flutte
 ORIGIN: ../../../flutter/shell/common/vsync_waiter_fallback.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/vsync_waiters_test.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/vsync_waiters_test.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_gl_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_gl_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_gl_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_gl_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_metal_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_metal_impeller.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_metal_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_metal_skia.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_software.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_software.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_vulkan.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_vulkan.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_vulkan_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_studio_vulkan_impeller.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_delegate.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_delegate.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_impeller.cc + ../../../flutter/LICENSE
@@ -2805,6 +2821,15 @@ ORIGIN: ../../../flutter/shell/platform/embedder/embedder_render_target.h + ../.
 ORIGIN: ../../../flutter/shell/platform/embedder/embedder_render_target_cache.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/embedder/embedder_render_target_cache.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/embedder/embedder_struct_macros.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_studio.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_studio_gl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_studio_gl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_studio_metal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_studio_metal.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_studio_software.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_studio_software.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_studio_vulkan.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_studio_vulkan.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_gl.cc + ../../../flutter/LICENSE
@@ -2933,6 +2958,8 @@ ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/software_surface.cc + ..
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/software_surface.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/software_surface_producer.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/software_surface_producer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/studio.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/studio.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/surface.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/surface.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/surface_producer.h + ../../../flutter/LICENSE
@@ -3513,6 +3540,8 @@ FILE: ../../../flutter/flow/raster_cache_util.h
 FILE: ../../../flutter/flow/rtree.cc
 FILE: ../../../flutter/flow/rtree.h
 FILE: ../../../flutter/flow/skia_gpu_object.h
+FILE: ../../../flutter/flow/studio.cc
+FILE: ../../../flutter/flow/studio.h
 FILE: ../../../flutter/flow/surface.cc
 FILE: ../../../flutter/flow/surface.h
 FILE: ../../../flutter/flow/surface_frame.cc
@@ -4912,6 +4941,20 @@ FILE: ../../../flutter/shell/common/vsync_waiter_fallback.cc
 FILE: ../../../flutter/shell/common/vsync_waiter_fallback.h
 FILE: ../../../flutter/shell/common/vsync_waiters_test.cc
 FILE: ../../../flutter/shell/common/vsync_waiters_test.h
+FILE: ../../../flutter/shell/gpu/gpu_studio_gl_impeller.cc
+FILE: ../../../flutter/shell/gpu/gpu_studio_gl_impeller.h
+FILE: ../../../flutter/shell/gpu/gpu_studio_gl_skia.cc
+FILE: ../../../flutter/shell/gpu/gpu_studio_gl_skia.h
+FILE: ../../../flutter/shell/gpu/gpu_studio_metal_impeller.h
+FILE: ../../../flutter/shell/gpu/gpu_studio_metal_impeller.mm
+FILE: ../../../flutter/shell/gpu/gpu_studio_metal_skia.h
+FILE: ../../../flutter/shell/gpu/gpu_studio_metal_skia.mm
+FILE: ../../../flutter/shell/gpu/gpu_studio_software.cc
+FILE: ../../../flutter/shell/gpu/gpu_studio_software.h
+FILE: ../../../flutter/shell/gpu/gpu_studio_vulkan.cc
+FILE: ../../../flutter/shell/gpu/gpu_studio_vulkan.h
+FILE: ../../../flutter/shell/gpu/gpu_studio_vulkan_impeller.cc
+FILE: ../../../flutter/shell/gpu/gpu_studio_vulkan_impeller.h
 FILE: ../../../flutter/shell/gpu/gpu_surface_gl_delegate.cc
 FILE: ../../../flutter/shell/gpu/gpu_surface_gl_delegate.h
 FILE: ../../../flutter/shell/gpu/gpu_surface_gl_impeller.cc
@@ -5490,6 +5533,15 @@ FILE: ../../../flutter/shell/platform/embedder/embedder_render_target.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_render_target_cache.cc
 FILE: ../../../flutter/shell/platform/embedder/embedder_render_target_cache.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_struct_macros.h
+FILE: ../../../flutter/shell/platform/embedder/embedder_studio.h
+FILE: ../../../flutter/shell/platform/embedder/embedder_studio_gl.cc
+FILE: ../../../flutter/shell/platform/embedder/embedder_studio_gl.h
+FILE: ../../../flutter/shell/platform/embedder/embedder_studio_metal.h
+FILE: ../../../flutter/shell/platform/embedder/embedder_studio_metal.mm
+FILE: ../../../flutter/shell/platform/embedder/embedder_studio_software.cc
+FILE: ../../../flutter/shell/platform/embedder/embedder_studio_software.h
+FILE: ../../../flutter/shell/platform/embedder/embedder_studio_vulkan.cc
+FILE: ../../../flutter/shell/platform/embedder/embedder_studio_vulkan.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface.cc
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_gl.cc
@@ -5621,6 +5673,8 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/software_surface.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/software_surface.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/software_surface_producer.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/software_surface_producer.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/studio.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/studio.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/surface.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/surface.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/surface_producer.h

flow/BUILD.gn

@@ -78,6 +78,8 @@ source_set("flow") {
     "rtree.cc",
     "rtree.h",
     "skia_gpu_object.h",
+    "studio.cc",
+    "studio.h",
     "surface.cc",
     "surface.h",
     "surface_frame.cc",

flow/embedded_views.cc

@@ -110,10 +110,6 @@ const std::vector<std::shared_ptr<Mutator>>::const_iterator MutatorsStack::End()
   return vector_.end();
 };
 
-bool ExternalViewEmbedder::SupportsDynamicThreadMerging() {
-  return false;
-}
-
 void ExternalViewEmbedder::Teardown() {}
 
 }  // namespace flutter

flow/embedded_views.h

@@ -432,13 +432,6 @@ class ExternalViewEmbedder {
       bool should_resubmit_frame,
       fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {}
 
-  // Whether the embedder should support dynamic thread merging.
-  //
-  // Returning `true` results a |RasterThreadMerger| instance to be created.
-  // * See also |BegineFrame| and |EndFrame| for getting the
-  // |RasterThreadMerger| instance.
-  virtual bool SupportsDynamicThreadMerging();
-
   // Called when the rasterizer is being torn down.
   // This method provides a way to release resources associated with the current
   // embedder.

flow/studio.cc

@@ -0,0 +1,33 @@
+// Copyright 2013 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.
+
+#include "flutter/flow/studio.h"
+
+namespace flutter {
+
+Studio::Studio() = default;
+
+Studio::~Studio() = default;
+
+std::unique_ptr<GLContextResult> Studio::MakeRenderContextCurrent() {
+  return std::make_unique<GLContextDefaultResult>(true);
+}
+
+bool Studio::ClearRenderContext() {
+  return false;
+}
+
+bool Studio::AllowsDrawingWhenGpuDisabled() const {
+  return true;
+}
+
+bool Studio::EnableRasterCache() const {
+  return true;
+}
+
+std::shared_ptr<impeller::AiksContext> Studio::GetAiksContext() const {
+  return nullptr;
+}
+
+}  // namespace flutter

flow/studio.h

@@ -0,0 +1,47 @@
+// Copyright 2013 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.
+
+#ifndef FLUTTER_FLOW_STUDIO_H_
+#define FLUTTER_FLOW_STUDIO_H_
+
+#include <memory>
+
+#include "flutter/common/graphics/gl_context_switch.h"
+#include "flutter/fml/macros.h"
+
+class GrDirectContext;
+
+namespace impeller {
+class AiksContext;
+}  // namespace impeller
+
+namespace flutter {
+
+class Studio {
+ public:
+  Studio();
+
+  virtual ~Studio();
+
+  virtual bool IsValid() = 0;
+
+  virtual GrDirectContext* GetContext() = 0;
+
+  virtual std::unique_ptr<GLContextResult> MakeRenderContextCurrent();
+
+  virtual bool ClearRenderContext();
+
+  virtual bool AllowsDrawingWhenGpuDisabled() const;
+
+  virtual bool EnableRasterCache() const;
+
+  virtual std::shared_ptr<impeller::AiksContext> GetAiksContext() const;
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(Studio);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_FLOW_STUDIO_H_

flow/surface.cc

@@ -10,26 +10,6 @@ Surface::Surface() = default;
 
 Surface::~Surface() = default;
 
-std::unique_ptr<GLContextResult> Surface::MakeRenderContextCurrent() {
-  return std::make_unique<GLContextDefaultResult>(true);
-}
-
-bool Surface::ClearRenderContext() {
-  return false;
-}
-
-bool Surface::AllowsDrawingWhenGpuDisabled() const {
-  return true;
-}
-
-bool Surface::EnableRasterCache() const {
-  return true;
-}
-
-std::shared_ptr<impeller::AiksContext> Surface::GetAiksContext() const {
-  return nullptr;
-}
-
 Surface::SurfaceData Surface::GetSurfaceData() const {
   return {};
 }

flow/surface.h

@@ -39,18 +39,6 @@ class Surface {
 
   virtual SkMatrix GetRootTransformation() const = 0;
 
-  virtual GrDirectContext* GetContext() = 0;
-
-  virtual std::unique_ptr<GLContextResult> MakeRenderContextCurrent();
-
-  virtual bool ClearRenderContext();
-
-  virtual bool AllowsDrawingWhenGpuDisabled() const;
-
-  virtual bool EnableRasterCache() const;
-
-  virtual std::shared_ptr<impeller::AiksContext> GetAiksContext() const;
-
   /// Capture the `SurfaceData` currently present in the surface.
   ///
   /// Not guaranteed to work on all setups and not intended to be used in

lib/ui/compositing/scene_builder_unittests.cc

@@ -82,7 +82,7 @@ TEST_F(ShellTest, SceneBuilderBuildAndSceneDisposeReleasesLayerStack) {
   AddNativeCallback("ValidateSceneHasNoLayers",
                     CREATE_NATIVE_ENTRY(validate_scene_has_no_layers));
 
-  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  std::unique_ptr<Shell> shell = CreateShell(settings, &task_runners);
 
   ASSERT_TRUE(shell->IsSetup());
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -141,7 +141,7 @@ TEST_F(ShellTest, EngineLayerDisposeReleasesReference) {
   AddNativeCallback("ValidateEngineLayerDispose",
                     CREATE_NATIVE_ENTRY(validate_engine_layer_dispose));
 
-  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  std::unique_ptr<Shell> shell = CreateShell(settings, &task_runners);
 
   ASSERT_TRUE(shell->IsSetup());
   auto configuration = RunConfiguration::InferFromSettings(settings);

lib/ui/dart_ui.cc

@@ -99,7 +99,7 @@ typedef CanvasPath Path;
   V(PlatformConfigurationNativeApi::ImplicitViewEnabled, 0)           \
   V(PlatformConfigurationNativeApi::DefaultRouteName, 0)              \
   V(PlatformConfigurationNativeApi::ScheduleFrame, 0)                 \
-  V(PlatformConfigurationNativeApi::Render, 1)                        \
+  V(PlatformConfigurationNativeApi::Render, 2)                        \
   V(PlatformConfigurationNativeApi::UpdateSemantics, 1)               \
   V(PlatformConfigurationNativeApi::SetNeedsReportTimings, 1)         \
   V(PlatformConfigurationNativeApi::SetIsolateDebugName, 1)           \

lib/ui/hooks.dart

@@ -4,6 +4,20 @@
 
 part of dart.ui;
 
+@pragma('vm:entry-point')
+void _addView(
+  Object id,
+) {
+  PlatformDispatcher.instance._addView(id);
+}
+
+@pragma('vm:entry-point')
+void _removeView(
+  Object id,
+) {
+  PlatformDispatcher.instance._removeView(id);
+}
+
 @pragma('vm:entry-point')
 void _updateDisplays(
   List<int> ids,
@@ -30,6 +44,11 @@ void _updateDisplays(
   PlatformDispatcher.instance._updateDisplays(displays);
 }
 
+@pragma('vm:entry-point')
+void _sendViewConfigurations(List<int> viewIds) {
+  PlatformDispatcher.instance._onSentViewConfigurations(viewIds);
+}
+
 @pragma('vm:entry-point')
 void _updateWindowMetrics(
   int id,

lib/ui/hooks_unittests.cc

@@ -35,7 +35,7 @@ TEST_F(HooksTest, HooksUnitTests) {
 
   auto message_latch = std::make_shared<fml::AutoResetWaitableEvent>();
 
-  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  std::unique_ptr<Shell> shell = CreateShell(settings, &task_runners);
   ASSERT_TRUE(shell->IsSetup());
 
   auto call_hook = [](Dart_NativeArguments args) {

lib/ui/painting/image_dispose_unittests.cc

@@ -69,7 +69,7 @@ TEST_F(ImageDisposeTest, ImageReleasedAfterFrameAndDisposePictureAndLayer) {
                     CREATE_NATIVE_ENTRY(native_capture_image_and_picture));
   AddNativeCallback("Finish", CREATE_NATIVE_ENTRY(native_finish));
 
-  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  std::unique_ptr<Shell> shell = CreateShell(settings, &task_runners);
 
   ASSERT_TRUE(shell->IsSetup());
 

lib/ui/painting/image_encoding_unittests.cc

@@ -106,7 +106,7 @@ TEST_F(ShellTest, EncodeImageGivesExternalTypedData) {
   AddNativeCallback("ValidateExternal",
                     CREATE_NATIVE_ENTRY(nativeValidateExternal));
 
-  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  std::unique_ptr<Shell> shell = CreateShell(settings, &task_runners);
 
   ASSERT_TRUE(shell->IsSetup());
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -170,7 +170,7 @@ TEST_F(ShellTest, EncodeImageAccessesSyncSwitch) {
 
   AddNativeCallback("EncodeImage", CREATE_NATIVE_ENTRY(native_encode_image));
 
-  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  std::unique_ptr<Shell> shell = CreateShell(settings, &task_runners);
 
   ASSERT_TRUE(shell->IsSetup());
   auto configuration = RunConfiguration::InferFromSettings(settings);

lib/ui/painting/paint_unittests.cc

@@ -36,7 +36,7 @@ TEST_F(ShellTest, ConvertPaintToDlPaint) {
   AddNativeCallback("ConvertPaintToDlPaint",
                     CREATE_NATIVE_ENTRY(nativeToDlPaint));
 
-  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  std::unique_ptr<Shell> shell = CreateShell(settings, &task_runners);
 
   ASSERT_TRUE(shell->IsSetup());
   auto configuration = RunConfiguration::InferFromSettings(settings);