Debug test

Author: Emmanuel Garcia

shell/platform/android/external_view_embedder/external_view_embedder.cc

@@ -84,7 +84,7 @@ void AndroidExternalViewEmbedder::SubmitFrame(
     return;
   }
 
-  std::unordered_map<int64_t, std::list<SkRect>> overlay_layers;
+  std::unordered_map<int64_t, SkRect> overlay_layers;
   std::unordered_map<int64_t, sk_sp<SkPicture>> pictures;
   SkCanvas* background_canvas = frame->SkiaCanvas();
   auto current_frame_view_count = composition_order_.size();
@@ -101,10 +101,8 @@ void AndroidExternalViewEmbedder::SubmitFrame(
     FML_CHECK(picture);
     pictures.insert({view_id, picture});
 
-    overlay_layers.insert({view_id, {}});
-
     sk_sp<RTree> rtree = view_rtrees_.at(view_id);
-    SkRect joined_rect;
+    SkRect joined_rect = SkRect::MakeEmpty();
 
     // Determinate if Flutter UI intersects with any of the previous
     // platform views stacked by z position.
@@ -128,14 +126,18 @@ void AndroidExternalViewEmbedder::SubmitFrame(
       }
     }
 
+    if (joined_rect.isEmpty()) {
+      continue;
+    }
+
     // Subpixels in the platform may not align with the canvas subpixels.
     //
     // To workaround it, round the floating point bounds and make the rect
     // slightly larger.
     //
     // For example, {0.3, 0.5, 3.1, 4.7} becomes {0, 0, 4, 5}.
     joined_rect.set(joined_rect.roundOut());
-    overlay_layers.at(view_id).push_back(joined_rect);
+    overlay_layers.insert({view_id, joined_rect});
     // Clip the background canvas, so it doesn't contain any of the pixels
     // drawn on the overlay layer.
     background_canvas->clipRect(joined_rect, SkClipOp::kDifference);
@@ -166,16 +168,15 @@ void AndroidExternalViewEmbedder::SubmitFrame(
         params.sizePoints().height() * device_pixel_ratio_,
         params.mutatorsStack()  //
     );
-    for (const SkRect& overlay_rect : overlay_layers.at(view_id)) {
-      std::unique_ptr<SurfaceFrame> frame =
-          CreateSurfaceIfNeeded(context,               //
-                                view_id,               //
-                                pictures.at(view_id),  //
-                                overlay_rect           //
-          );
-      if (should_submit_current_frame) {
-        frame->Submit();
-      }
+    const SkRect& overlay_rect = overlay_layers.at(view_id);
+    std::unique_ptr<SurfaceFrame> frame =
+        CreateSurfaceIfNeeded(context,               //
+                              view_id,               //
+                              pictures.at(view_id),  //
+                              overlay_rect           //
+        );
+    if (should_submit_current_frame) {
+      frame->Submit();
     }
   }
 }

shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc

@@ -517,48 +517,54 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame__overlayComposition) {
   EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
   embedder->BeginFrame(frame_size, nullptr, 1.5, raster_thread_merger);
 
-  // Add first Android view.
-  SkMatrix matrix1;
-  MutatorsStack stack1;
-  stack1.PushTransform(SkMatrix::Translate(0, 0));
-
-  embedder->PrerollCompositeEmbeddedView(
-      0, std::make_unique<EmbeddedViewParams>(matrix1, SkSize::Make(200, 200),
-                                              stack1));
-  EXPECT_CALL(*jni_mock, FlutterViewOnDisplayPlatformView(0, 0, 0, 200, 200,
-                                                          300, 300, stack1));
+  {
+    // Add first Android view.
+    SkMatrix matrix;
+    MutatorsStack stack;
+    stack.PushTransform(SkMatrix::Translate(0, 0));
+
+    embedder->PrerollCompositeEmbeddedView(
+        0, std::make_unique<EmbeddedViewParams>(matrix, SkSize::Make(200, 200),
+                                                stack));
+    EXPECT_CALL(*jni_mock, FlutterViewOnDisplayPlatformView(0, 0, 0, 200, 200,
+                                                            300, 300, stack));
+  }
 
   auto rect_paint = SkPaint();
   rect_paint.setColor(SkColors::kCyan);
   rect_paint.setStyle(SkPaint::Style::kFill_Style);
 
   // This simulates Flutter UI that intersects with the first Android view.
   embedder->CompositeEmbeddedView(0)->drawRect(
-      SkRect::MakeXYWH(25, 25, 50, 150), rect_paint);
-
-  // Add second Android view.
-  SkMatrix matrix2;
-  MutatorsStack stack2;
-  stack2.PushTransform(SkMatrix::Translate(0, 100));
-
-  embedder->PrerollCompositeEmbeddedView(
-      1, std::make_unique<EmbeddedViewParams>(matrix2, SkSize::Make(100, 100),
-                                              stack2));
-  EXPECT_CALL(*jni_mock, FlutterViewOnDisplayPlatformView(1, 0, 0, 100, 100,
-                                                          150, 150, stack2));
+      SkRect::MakeXYWH(25, 25, 80, 150), rect_paint);
 
+  {
+    // Add second Android view.
+    SkMatrix matrix;
+    MutatorsStack stack;
+    stack.PushTransform(SkMatrix::Translate(0, 100));
+
+    embedder->PrerollCompositeEmbeddedView(
+        1, std::make_unique<EmbeddedViewParams>(matrix, SkSize::Make(100, 100),
+                                                stack));
+    EXPECT_CALL(*jni_mock, FlutterViewOnDisplayPlatformView(1, 0, 0, 100, 100,
+                                                            150, 150, stack));
+  }
   // This simulates Flutter UI that intersects with the first and second Android
   // views.
-  embedder->CompositeEmbeddedView(1)->drawRect(SkRect::MakeXYWH(25, 25, 50, 50),
+  embedder->CompositeEmbeddedView(1)->drawRect(SkRect::MakeXYWH(25, 25, 80, 50),
                                                rect_paint);
 
+  embedder->CompositeEmbeddedView(1)->drawRect(
+      SkRect::MakeXYWH(75, 75, 30, 100), rect_paint);
+
   EXPECT_CALL(*jni_mock, FlutterViewCreateOverlaySurface())
       .WillRepeatedly([&]() {
         return std::make_unique<PlatformViewAndroidJNI::OverlayMetadata>(
             1, window);
       });
 
-  EXPECT_CALL(*jni_mock, FlutterViewDisplayOverlaySurface(1, 25, 25, 50, 150))
+  EXPECT_CALL(*jni_mock, FlutterViewDisplayOverlaySurface(1, 25, 25, 80, 150))
       .Times(2);
 
   auto surface_frame = std::make_unique<SurfaceFrame>(

testing/run_tests.py

@@ -124,7 +124,6 @@ def RunCCTests(build_dir, filter):
   ]
   shuffle_flags = non_repeatable_shuffle_flags + [
     "--gtest_repeat=2",
-    "--gmock_verbose=info",
   ]
 
   RunEngineExecutable(build_dir, 'client_wrapper_glfw_unittests', filter, shuffle_flags)