Merged in updates from fuchsia.git sources 2021-06-23

As of fuchsia.git commit 413b2189b11faf0be2843859b900853c100beb0c

Merged into the current PR, while based on:

> commit 2e0b10f
> Author: skia-flutter-autoroll <skia-flutter-autoroll@skia.org>
> Date:   Mon May 24 14:14:02 2021 -0400
>
>     Roll Dart SDK from c696ecf to bb9d96f (1 revision) (flutter#26370)

I also had to:

* Update `DEPS` to bring in a recent version of the Fuchsia GN SDK
  (timestamped within 24 hours of the fuchsia.git sources).
* Add the `Handle.replace()` method (which was missing since I am still
  building with an older version of flutter/engine)

Author: richkadel

DEPS

@@ -598,7 +598,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/gn/mac-amd64',
-        'version': 'A9vidXntPqY2keWQe8GNDTXwGf8om82ZrBohePeQRc4C'
+        'version': 'giyeg2SD5Q0qRXPCYEdX6Ji3wTAe4k5TEz92qaG9AMsC'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -608,7 +608,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/gn/linux-amd64',
-        'version': 'txywQ_B3OXNAJQaFw6oFApUx_r5hM88i1jGUnM0WRWAC'
+        'version': '7z-1qm5DoV0E7CKrtRIglcLI7Bn0362iUjaDooZcFBAC'
        }
      ],
      'condition': 'host_os == "linux"',

shell/platform/fuchsia/flutter/integration_flutter_tests/embedder/flutter-embedder-test.cc

@@ -10,11 +10,41 @@ namespace flutter_embedder_test {
 
 constexpr char kParentViewUrl[] = "fuchsia-pkg://fuchsia.com/parent-view#meta/parent-view.cmx";
 
-constexpr scenic::Color kParentBackgroundColor = {0x00, 0x00, 0xFF, 0xFF};   // Blue
-constexpr scenic::Color kParentTappedColor = {0x00, 0x00, 0x00, 0xFF};       // Black
-constexpr scenic::Color kOverlayBackgroundColor = {0x00, 0xFF, 0x00, 0xFF};  // Green
-constexpr scenic::Color kChildBackgroundColor = {0xFF, 0x00, 0xFF, 0xFF};    // Pink
-constexpr scenic::Color kChildTappedColor = {0xFF, 0xFF, 0x00, 0xFF};        // Yellow
+constexpr scenic::Color kParentBackgroundColor = {0x00, 0x00, 0xFF, 0xFF};  // Blue
+constexpr scenic::Color kParentTappedColor = {0x00, 0x00, 0x00, 0xFF};      // Black
+constexpr scenic::Color kChildBackgroundColor = {0xFF, 0x00, 0xFF, 0xFF};   // Pink
+constexpr scenic::Color kChildTappedColor = {0xFF, 0xFF, 0x00, 0xFF};       // Yellow
+
+// TODO(fxb/64201): The new flutter renderer draws overlays as a single, large layer.  Some parts of
+// this layer are fully transparent, so we want the compositor to treat the layer as transparent and
+// blend it with the contents below.
+//
+// The gfx Scenic API only provides one way to mark this layer as transparent which is to set an
+// opacity < 1.0 for the entire layer.  In practice, we use 0.9961 (254 / 255) as an opacity value
+// to force transparency.  Unfortunately this causes the overlay to blend very slightly and it looks
+// wrong.
+//
+// Flatland allows marking a layer as transparent while still using a 1.0 opacity value when
+// blending, so migrating flutter to Flatland will fix this issue.  For now we just hard-code the
+// broken, blended values.
+constexpr scenic::Color kOverlayBackgroundColor1 = {0x00, 0xFF, 0x0E,
+                                                    0xFF};  // Green, blended with blue (FEMU local)
+constexpr scenic::Color kOverlayBackgroundColor2 = {0x0E, 0xFF, 0x0E,
+                                                    0xFF};  // Green, blended with pink (FEMU local)
+constexpr scenic::Color kOverlayBackgroundColor3 = {0x00, 0xFF, 0x0D,
+                                                    0xFF};  // Green, blended with blue (AEMU infra)
+constexpr scenic::Color kOverlayBackgroundColor4 = {0x0D, 0xFF, 0x0D,
+                                                    0xFF};  // Green, blended with pink (AEMU infra)
+constexpr scenic::Color kOverlayBackgroundColor5 = {0x00, 0xFE, 0x0D,
+                                                    0xFF};  // Green, blended with blue (NUC)
+constexpr scenic::Color kOverlayBackgroundColor6 = {0x0D, 0xFF, 0x00,
+                                                    0xFF};  // Green, blended with pink (NUC)
+
+static size_t OverlayPixelCount(std::map<scenic::Color, size_t>& histogram) {
+  return histogram[kOverlayBackgroundColor1] + histogram[kOverlayBackgroundColor2] +
+         histogram[kOverlayBackgroundColor3] + histogram[kOverlayBackgroundColor4] +
+         histogram[kOverlayBackgroundColor5] + histogram[kOverlayBackgroundColor6];
+}
 
 /// Defines a list of services that are injected into the test environment. Unlike the
 /// injected-services in CMX which are injected per test package, these are injected per test and
@@ -54,114 +84,23 @@ const std::vector<std::pair<const char*, const char*>> GetInjectedServices() {
       "fuchsia-pkg://fuchsia.com/ime_service#meta/ime_service.cmx"
     },{
       "fuchsia.ui.scenic.Scenic",
-      "fuchsia-pkg://fuchsia.com/scenic#meta/scenic.cmx"
+      "fuchsia-pkg://fuchsia.com/flutter-embedder-test#meta/scenic.cmx"
     },{
       "fuchsia.ui.pointerinjector.Registry",
-      "fuchsia-pkg://fuchsia.com/scenic#meta/scenic.cmx"
+      "fuchsia-pkg://fuchsia.com/flutter-embedder-test#meta/scenic.cmx"
     },{
       "fuchsia.ui.policy.Presenter",
-      "fuchsia-pkg://fuchsia.com/root_presenter#meta/root_presenter.cmx"
+      "fuchsia-pkg://fuchsia.com/flutter-embedder-test#meta/root_presenter.cmx"
     },{
       "fuchsia.ui.input.InputDeviceRegistry",
-      "fuchsia-pkg://fuchsia.com/root_presenter#meta/root_presenter.cmx"
+      "fuchsia-pkg://fuchsia.com/flutter-embedder-test#meta/root_presenter.cmx"
     },
       // clang-format on
   }};
   return injected_services;
 }
 
-TEST_F(FlutterEmbedderTests, BasicLegacyEmbedding) {
-  RunAppWithArgs(kParentViewUrl, {"--no-usePlatformView"});
-
-  // Take screenshot until we see the child-view's embedded color.
-  ASSERT_TRUE(
-      TakeScreenshotUntil(kChildBackgroundColor, [](std::map<scenic::Color, size_t> histogram) {
-        // Expect parent and child background colors, with parent color > child color.
-        EXPECT_GT(histogram[kParentBackgroundColor], 0u);
-        EXPECT_GT(histogram[kChildBackgroundColor], 0u);
-        EXPECT_GT(histogram[kParentBackgroundColor], histogram[kChildBackgroundColor]);
-      }));
-}
-
-TEST_F(FlutterEmbedderTests, HittestLegacyEmbedding) {
-  RunAppWithArgs(kParentViewUrl, {"--no-usePlatformView"});
-
-  // Take screenshot until we see the child-view's embedded color.
-  ASSERT_TRUE(TakeScreenshotUntil(kChildBackgroundColor));
-
-  // Tap the center of child view.
-  InjectInput();
-
-  // Take screenshot until we see the child-view's tapped color.
-  ASSERT_TRUE(TakeScreenshotUntil(kChildTappedColor, [](std::map<scenic::Color, size_t> histogram) {
-    // Expect parent and child background colors, with parent color > child color.
-    EXPECT_GT(histogram[kParentBackgroundColor], 0u);
-    EXPECT_EQ(histogram[kChildBackgroundColor], 0u);
-    EXPECT_GT(histogram[kChildTappedColor], 0u);
-    EXPECT_GT(histogram[kParentBackgroundColor], histogram[kChildTappedColor]);
-  }));
-}
-
-TEST_F(FlutterEmbedderTests, HittestDisabledLegacyEmbedding) {
-  RunAppWithArgs(kParentViewUrl, {"--no-hitTestable", "--no-usePlatformView"});
-
-  // Take screenshots until we see the child-view's embedded color.
-  ASSERT_TRUE(TakeScreenshotUntil(kChildBackgroundColor));
-
-  // Tap the center of child view. Since it's not hit-testable, the tap should go to the parent.
-  InjectInput();
-
-  // The parent-view should change color.
-  ASSERT_TRUE(
-      TakeScreenshotUntil(kParentTappedColor, [](std::map<scenic::Color, size_t> histogram) {
-        // Expect parent and child background colors, with parent color > child color.
-        EXPECT_EQ(histogram[kParentBackgroundColor], 0u);
-        EXPECT_GT(histogram[kParentTappedColor], 0u);
-        EXPECT_GT(histogram[kChildBackgroundColor], 0u);
-        EXPECT_EQ(histogram[kChildTappedColor], 0u);
-        EXPECT_GT(histogram[kParentTappedColor], histogram[kChildBackgroundColor]);
-      }));
-}
-
-TEST_F(FlutterEmbedderTests, BasicLegacyEmbeddingWithOverlay) {
-  RunAppWithArgs(kParentViewUrl, {"--showOverlay", "--no-usePlatformView"});
-
-  // Take screenshot until we see the child-view's embedded color.
-  ASSERT_TRUE(
-      TakeScreenshotUntil(kChildBackgroundColor, [](std::map<scenic::Color, size_t> histogram) {
-        // Expect parent, overlay and child background colors.
-        // With parent color > child color and overlay color > child color.
-        EXPECT_GT(histogram[kParentBackgroundColor], 0u);
-        EXPECT_GT(histogram[kOverlayBackgroundColor], 0u);
-        EXPECT_GT(histogram[kChildBackgroundColor], 0u);
-        EXPECT_GT(histogram[kParentBackgroundColor], histogram[kChildBackgroundColor]);
-        EXPECT_GT(histogram[kOverlayBackgroundColor], histogram[kChildBackgroundColor]);
-      }));
-}
-
-TEST_F(FlutterEmbedderTests, HittestLegacyEmbeddingWithOverlay) {
-  RunAppWithArgs(kParentViewUrl, {"--showOverlay", "--no-usePlatformView"});
-
-  // Take screenshot until we see the child-view's embedded color.
-  ASSERT_TRUE(TakeScreenshotUntil(kChildBackgroundColor));
-
-  // Tap the center of child view.
-  InjectInput();
-
-  // Take screenshot until we see the child-view's tapped color.
-  ASSERT_TRUE(TakeScreenshotUntil(kChildTappedColor, [](std::map<scenic::Color, size_t> histogram) {
-    // Expect parent, overlay and child background colors.
-    // With parent color > child color and overlay color > child color.
-    EXPECT_GT(histogram[kParentBackgroundColor], 0u);
-    EXPECT_GT(histogram[kOverlayBackgroundColor], 0u);
-    EXPECT_EQ(histogram[kChildBackgroundColor], 0u);
-    EXPECT_GT(histogram[kChildTappedColor], 0u);
-    EXPECT_GT(histogram[kParentBackgroundColor], histogram[kChildTappedColor]);
-    EXPECT_GT(histogram[kOverlayBackgroundColor], histogram[kChildTappedColor]);
-  }));
-}
-
-TEST_F(FlutterEmbedderTests, DISABLED_BasicPlatformViewEmbedding) {
+TEST_F(FlutterEmbedderTests, Embedding) {
   RunAppWithArgs(kParentViewUrl);
 
   // Take screenshot until we see the child-view's embedded color.
@@ -174,7 +113,7 @@ TEST_F(FlutterEmbedderTests, DISABLED_BasicPlatformViewEmbedding) {
       }));
 }
 
-TEST_F(FlutterEmbedderTests, DISABLED_HittestPlatformViewEmbedding) {
+TEST_F(FlutterEmbedderTests, HittestEmbedding) {
   RunAppWithArgs(kParentViewUrl);
 
   // Take screenshot until we see the child-view's embedded color.
@@ -193,7 +132,7 @@ TEST_F(FlutterEmbedderTests, DISABLED_HittestPlatformViewEmbedding) {
   }));
 }
 
-TEST_F(FlutterEmbedderTests, DISABLED_HittestDisabledPlatformViewEmbedding) {
+TEST_F(FlutterEmbedderTests, HittestDisabledEmbedding) {
   RunAppWithArgs(kParentViewUrl, {"--no-hitTestable"});
 
   // Take screenshots until we see the child-view's embedded color.
@@ -214,23 +153,24 @@ TEST_F(FlutterEmbedderTests, DISABLED_HittestDisabledPlatformViewEmbedding) {
       }));
 }
 
-TEST_F(FlutterEmbedderTests, DISABLED_BasicPlatformViewEmbeddingWithOverlay) {
+TEST_F(FlutterEmbedderTests, EmbeddingWithOverlay) {
   RunAppWithArgs(kParentViewUrl, {"--showOverlay"});
 
   // Take screenshot until we see the child-view's embedded color.
   ASSERT_TRUE(
       TakeScreenshotUntil(kChildBackgroundColor, [](std::map<scenic::Color, size_t> histogram) {
         // Expect parent, overlay and child background colors.
         // With parent color > child color and overlay color > child color.
+        const size_t overlay_pixel_count = OverlayPixelCount(histogram);
         EXPECT_GT(histogram[kParentBackgroundColor], 0u);
-        EXPECT_GT(histogram[kOverlayBackgroundColor], 0u);
+        EXPECT_GT(overlay_pixel_count, 0u);
         EXPECT_GT(histogram[kChildBackgroundColor], 0u);
         EXPECT_GT(histogram[kParentBackgroundColor], histogram[kChildBackgroundColor]);
-        EXPECT_GT(histogram[kOverlayBackgroundColor], histogram[kChildBackgroundColor]);
+        EXPECT_GT(overlay_pixel_count, histogram[kChildBackgroundColor]);
       }));
 }
 
-TEST_F(FlutterEmbedderTests, DISABLED_HittestPlatformViewEmbeddingWithOverlay) {
+TEST_F(FlutterEmbedderTests, HittestEmbeddingWithOverlay) {
   RunAppWithArgs(kParentViewUrl, {"--showOverlay"});
 
   // Take screenshot until we see the child-view's embedded color.
@@ -243,13 +183,13 @@ TEST_F(FlutterEmbedderTests, DISABLED_HittestPlatformViewEmbeddingWithOverlay) {
   ASSERT_TRUE(TakeScreenshotUntil(kChildTappedColor, [](std::map<scenic::Color, size_t> histogram) {
     // Expect parent, overlay and child background colors.
     // With parent color > child color and overlay color > child color.
-    // EXPECT_EQ((std::map<scenic::Color, size_t>){}, histogram) << "Unexpected colors";
+    const size_t overlay_pixel_count = OverlayPixelCount(histogram);
     EXPECT_GT(histogram[kParentBackgroundColor], 0u);
-    EXPECT_GT(histogram[kOverlayBackgroundColor], 0u);
+    EXPECT_GT(overlay_pixel_count, 0u);
     EXPECT_EQ(histogram[kChildBackgroundColor], 0u);
     EXPECT_GT(histogram[kChildTappedColor], 0u);
     EXPECT_GT(histogram[kParentBackgroundColor], histogram[kChildTappedColor]);
-    EXPECT_GT(histogram[kOverlayBackgroundColor], histogram[kChildTappedColor]);
+    EXPECT_GT(overlay_pixel_count, histogram[kChildTappedColor]);
   }));
 }
 

shell/platform/fuchsia/flutter/integration_flutter_tests/embedder/parent-view/lib/main.dart

@@ -20,23 +20,18 @@ void main(List<String> args) async {
   final parser = ArgParser()
     ..addFlag('showOverlay', defaultsTo: false)
     ..addFlag('hitTestable', defaultsTo: true)
-    ..addFlag('focusable', defaultsTo: true)
-    ..addFlag('usePlatformView', defaultsTo: true);
+    ..addFlag('focusable', defaultsTo: true);
   final arguments = parser.parse(args);
   for (final option in arguments.options) {
     print('parent-view: $option: ${arguments[option]}');
   }
 
   final childViewToken = _launchApp(_kChildAppUrl);
-  // final connection = ChildViewConnection(
-  //   childViewToken,
-  //   usePlatformView: arguments['usePlatformView'],
-  // );
 
   // runApp(MaterialApp(
   //   debugShowCheckedModeBanner: false,
   //   home: TestApp(
-  //     connection,
+  //     FuchsiaViewConnection(childViewToken),
   //     showOverlay: arguments['showOverlay'],
   //     hitTestable: arguments['hitTestable'],
   //     focusable: arguments['focusable'],
@@ -48,19 +43,17 @@ void main(List<String> args) async {
 //   static const _black = Color.fromARGB(255, 0, 0, 0);
 //   static const _blue = Color.fromARGB(255, 0, 0, 255);
 
-//   final ChildViewConnection connection;
+//   final FuchsiaViewConnection connection;
 //   final bool showOverlay;
 //   final bool hitTestable;
 //   final bool focusable;
 
 //   final _backgroundColor = ValueNotifier(_blue);
 
-//   TestApp(
-//     this.connection, {
-//     this.showOverlay = false,
+//   TestApp(this.connection,
+//     {this.showOverlay = false,
 //     this.hitTestable = true,
-//     this.focusable = true,
-//   });
+//     this.focusable = true});
 
 //   @override
 //   Widget build(BuildContext context) {
@@ -77,8 +70,8 @@ void main(List<String> args) async {
 //                   FractionallySizedBox(
 //                     widthFactor: 0.33,
 //                     heightFactor: 0.33,
-//                     child: ChildView(
-//                       connection: connection,
+//                     child: FuchsiaView(
+//                       controller: connection,
 //                       hitTestable: hitTestable,
 //                       focusable: focusable,
 //                     ),

shell/platform/fuchsia/flutter/integration_flutter_tests/fuchsia_testing/lib/fostr/fidl/fuchsia/ui/gfx/README-flutter.md

@@ -4,3 +4,10 @@ The files in this directory were generated from the fuchsia
 in-tree tool `fidlmerge`.
 
 Since `fidlmerge` is not in the SDK, I am copying the files into the flutter engine repo for now.
+
+Refreshed after building a compatible version of Fuchsia via:
+
+```shell
+$ cp ~/fuchsia/out/workstation.qemu-x64/gen/garnet/public/lib/fostr/fidl/fuchsia/ui/gfx/formatting.{cc,h} \
+    flutter/shell/platform/fuchsia/flutter/integration_flutter_tests/fuchsia_testing/lib/fostr/fidl/fuchsia/ui/gfx/
+```

shell/platform/fuchsia/flutter/integration_flutter_tests/fuchsia_testing/lib/fostr/fidl/fuchsia/ui/gfx/formatting.cc

@@ -707,17 +707,6 @@ std::ostream& operator<<(std::ostream& os, const ViewStateChangedEvent& value) {
   return os << ::fostr::Outdent;
 }
 
-std::ostream& operator<<(std::ostream& os, const Hit& value) {
-  using fidl::operator<<;
-  os << ::fostr::Indent;
-  os << ::fostr::NewLine << "tag_value: " << value.tag_value;
-  os << ::fostr::NewLine << "ray_origin: " << value.ray_origin;
-  os << ::fostr::NewLine << "ray_direction: " << value.ray_direction;
-  os << ::fostr::NewLine << "inverse_transform: " << value.inverse_transform;
-  os << ::fostr::NewLine << "distance: " << value.distance;
-  return os << ::fostr::Outdent;
-}
-
 std::ostream& operator<<(std::ostream& os, const ShapeNodeArgs& value) {
   using fidl::operator<<;
   os << ::fostr::Indent;

shell/platform/fuchsia/flutter/integration_flutter_tests/fuchsia_testing/lib/fostr/fidl/fuchsia/ui/gfx/formatting.h

@@ -91,7 +91,6 @@ std::ostream& operator<<(std::ostream& os, const ViewAttachedToSceneEvent& value
 std::ostream& operator<<(std::ostream& os, const ViewDetachedFromSceneEvent& value);
 std::ostream& operator<<(std::ostream& os, const ViewPropertiesChangedEvent& value);
 std::ostream& operator<<(std::ostream& os, const ViewStateChangedEvent& value);
-std::ostream& operator<<(std::ostream& os, const Hit& value);
 std::ostream& operator<<(std::ostream& os, const ShapeNodeArgs& value);
 std::ostream& operator<<(std::ostream& os, const ClipNodeArgs& value);
 std::ostream& operator<<(std::ostream& os, const OpacityNodeArgsHACK& value);

shell/platform/fuchsia/flutter/integration_flutter_tests/fuchsia_testing/lib/sys/cpp/testing/environment_delegating_runner/meta/environment_delegating_runner.cmx

@@ -1,6 +1,6 @@
 {
     "include": [
-        "sdk/lib/diagnostics/syslog/client.shard.cmx"
+        "//sdk/lib/diagnostics/syslog/client.shard.cmx"
     ],
     "program": {
         "binary": "bin/environment_delegating_runner"

shell/platform/fuchsia/flutter/integration_flutter_tests/fuchsia_testing/lib/syslog/cpp/BUILD.gn

@@ -21,6 +21,6 @@ source_set("cpp") {
   ]
 
   public_deps = [
-    "$fuchsia_sdk_root/pkg:fit"
+    "$fuchsia_sdk_root/pkg:fit-promise"
   ]
 }

shell/platform/fuchsia/flutter/integration_flutter_tests/fuchsia_testing/lib/syslog/cpp/log_settings.h

@@ -34,6 +34,19 @@ struct LogSettings {
   // An fd to log to. Setting this will disable all structured
   // features resulting in plaintext-only logs written to the specified file descriptor.
   int log_fd = -1;
+
+  // Set to true to disable the interest listener. Changes to interest will not be
+  // applied to your log settings.
+  bool disable_interest_listener = false;
+
+  // A single-threaded dispatcher to use for change notifications.
+  // Must be single-threaded. Passing a dispatcher that has multiple threads
+  // will result in undefined behavior.
+  // This must be an async_dispatcher_t*.
+  // This can't be defined as async_dispatcher_t* since it is used
+  // from fxl which is a host+target library. This prevents us
+  // from adding a Fuchsia-specific dependency.
+  void* single_threaded_dispatcher = nullptr;
 };
 
 // Sets the active log settings for the current process.

shell/platform/fuchsia/flutter/integration_flutter_tests/fuchsia_testing/lib/syslog/cpp/macros.h

@@ -14,6 +14,7 @@
 #include <lib/syslog/cpp/log_level.h>
 
 #include <atomic>
+#include <functional>
 #include <limits>
 #include <sstream>
 #include <vector>
@@ -28,6 +29,8 @@ struct LogBuffer;
 WEAK void BeginRecordWithSocket(LogBuffer* buffer, syslog::LogSeverity severity,
                                 const char* file_name, unsigned int line, const char* msg,
                                 const char* condition, zx_handle_t socket);
+WEAK void SetInterestChangedListener(void (*callback)(void* context, syslog::LogSeverity severity),
+                                     void* context);
 #endif
 WEAK void BeginRecord(LogBuffer* buffer, syslog::LogSeverity severity, const char* file,
                       unsigned int line, const char* msg, const char* condition);