Fix platform view scenarios tests

flow/embedded_views.h

@@ -248,6 +248,9 @@ class ExternalViewEmbedder {
   // Must be called on the UI thread.
   virtual SkCanvas* CompositeEmbeddedView(int view_id) = 0;
 
+  // Must be called on the UI thread.
+  virtual SkRect GetPlatformViewRect(int view_id) = 0;
+
   virtual bool SubmitFrame(GrContext* context);
 
   FML_DISALLOW_COPY_AND_ASSIGN(ExternalViewEmbedder);

flow/layers/image_filter_layer.cc

@@ -30,15 +30,9 @@ void ImageFilterLayer::Paint(PaintContext& context) const {
   FML_DCHECK(needs_painting());
 
 #ifndef SUPPORT_FRACTIONAL_TRANSLATION
-  SkAutoCanvasRestore save(context.background_canvas, true);
-  context.background_canvas->setMatrix(RasterCache::GetIntegralTransCTM(
-      context.background_canvas->getTotalMatrix()));
-
-  if (context.leaf_nodes_canvas != nullptr) {
-    SkAutoCanvasRestore save(context.leaf_nodes_canvas, true);
-    context.leaf_nodes_canvas->setMatrix(RasterCache::GetIntegralTransCTM(
-        context.leaf_nodes_canvas->getTotalMatrix()));
-  }
+  SkAutoCanvasRestore save(context.internal_nodes_canvas, true);
+  context.internal_nodes_canvas->setMatrix(RasterCache::GetIntegralTransCTM(
+      context.internal_nodes_canvas->getTotalMatrix()));
 #endif
 
   if (context.raster_cache) {

flow/layers/performance_overlay_layer.cc

@@ -84,7 +84,7 @@ void PerformanceOverlayLayer::Paint(PaintContext& context) const {
   SkScalar y = paint_bounds().y() + padding;
   SkScalar width = paint_bounds().width() - (padding * 2);
   SkScalar height = paint_bounds().height() / 2;
-  SkAutoCanvasRestore save(context.background_canvas, true);
+  SkAutoCanvasRestore save(context.internal_nodes_canvas, true);
 
   VisualizeStopWatch(
       *context.background_canvas, context.raster_time, x, y, width,

flow/layers/picture_layer.cc

@@ -42,13 +42,8 @@ void PictureLayer::Paint(PaintContext& context) const {
   FML_DCHECK(picture_.get());
   FML_DCHECK(needs_painting());
 
-  SkAutoCanvasRestore save(context.background_canvas, true);
-  context.background_canvas->translate(offset_.x(), offset_.y());
-
-  if (context.leaf_nodes_canvas != nullptr) {
-    SkAutoCanvasRestore save(context.leaf_nodes_canvas, true);
-    context.leaf_nodes_canvas->translate(offset_.x(), offset_.y());
-  }
+  SkAutoCanvasRestore save(context.internal_nodes_canvas, true);
+  context.internal_nodes_canvas->translate(offset_.x(), offset_.y());
 
 #ifndef SUPPORT_FRACTIONAL_TRANSLATION
   context.background_canvas->setMatrix(RasterCache::GetIntegralTransCTM(

flow/layers/platform_view_layer.cc

@@ -40,5 +40,11 @@ void PlatformViewLayer::Paint(PaintContext& context) const {
   }
   SkCanvas* canvas = context.view_embedder->CompositeEmbeddedView(view_id_);
   context.leaf_nodes_canvas = canvas;
+  // Don't draw on the area covered by the platform view, since these drawings
+  // are on an overlay on top of the platform view. This prevent to see drawings
+  // on the background canvas if the platform view has opacity.
+  context.background_canvas->clipRect(
+      context.view_embedder->GetPlatformViewRect(view_id_),
+      SkClipOp::kDifference);
 }
 }  // namespace flutter

shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm

@@ -370,7 +370,7 @@
   //
   // The UIKit frame is set based on the logical resolution instead of physical.
   // (https://developer.apple.com/library/archive/documentation/DeviceInformation/Reference/iOSDeviceCompatibility/Displays/Displays.html).
-  // However, flow is based on the physical resolution. For example, 1000 pixels in flow equals
+  // However, flow is based on the physical resol ution. For eaxmple, 1000 pixels in flow equals
   // 500 points in UIKit. And until this point, we did all the calculation based on the flow
   // resolution. So we need to scale down to match UIKit's logical resolution.
   CGFloat screenScale = [UIScreen mainScreen].scale;
@@ -430,12 +430,23 @@
   layer_pool_->RecycleLayers();
 }
 
+SkRect FlutterPlatformViewsController::GetPlatformViewRect(int view_id) {
+  UIView* platform_view = [views_[view_id].get() view];
+  UIScreen* screen = [UIScreen mainScreen];
+  CGRect platform_view_cgrect = [platform_view convertRect:platform_view.bounds
+                                         toCoordinateSpace:screen.coordinateSpace];
+  return SkRect::MakeXYWH(platform_view_cgrect.origin.x * screen.scale,    //
+                          platform_view_cgrect.origin.y * screen.scale,    //
+                          platform_view_cgrect.size.width * screen.scale,  //
+                          platform_view_cgrect.size.height * screen.scale  //
+  );
+}
+
 bool FlutterPlatformViewsController::SubmitFrame(GrContext* gr_context,
                                                  std::shared_ptr<IOSContext> ios_context) {
   DisposeViews();
 
   bool did_submit = true;
-  CGFloat screenScale = [UIScreen mainScreen].scale;
 
   // Maps a platform view id to a vector of `FlutterPlatformViewLayer`.
   LayersMap platform_view_layers;
@@ -448,66 +459,10 @@
     sk_sp<SkPicture> picture =
         platform_views_recorder_[platform_view_id]->finishRecordingAsPicture();
 
-    std::shared_ptr<FlutterPlatformViewLayer> layer = layer_pool_->GetLayer(gr_context, gl_context);
-    std::unique_ptr<SurfaceFrame> frame = layer->surface->AcquireFrame(frame_size_);
-
-    layer->overlay_view.get().frame = flutter_view_.get().bounds;
-
-    std::vector<SkRect*> rects;
-    bbh->getAll(&rects);
-
-    SkCanvas* overlay_canvas = frame->SkiaCanvas();
-    overlay_canvas->clear(SK_ColorTRANSPARENT);
-
-    auto paint = SkPaint();
-    paint.setColor(SkColors::kRed);
-    paint.setStyle(SkPaint::Style::kStroke_Style);
-    paint.setStrokeWidth(5);
-
-
-    for (SkRect* rect : rects) {
-      FML_DLOG(ERROR) << " rect: " << rect->x() << "x" << rect->y();
-      overlay_canvas->drawRect(*rect, paint);
-    }
-
-    frame->Submit();
-
-    platform_view_layers[platform_view_id].push_back(layer);
-
-
-
- // std::shared_ptr<FlutterPlatformViewLayer> layer = layer_pool_->GetLayer(gr_context, gl_context);
- //  CGFloat screenScale = [UIScreen mainScreen].scale;
- //  // Set the size of the overlay UIView.
- //  layer->overlay_view.get().backgroundColor = [UIColor blueColor];
- //  layer->overlay_view.get().frame =
- //      CGRectMake(rect.x() / screenScale, rect.y() / screenScale, rect.width() / screenScale,
- //                 rect.height() / screenScale);
-
- //  SkISize rect_size = SkISize::Make(rect.width(), rect.height());
- //  std::unique_ptr<SurfaceFrame> frame = layer->surface->AcquireFrame(rect_size);
-
- //  // If frame is null, AcquireFrame already printed out an error message.
- //  if (frame == nullptr) {
- //    return layer;
- //  }
- //  SkCanvas* overlay_canvas = frame->SkiaCanvas();
- //  overlay_canvas->clear(SK_ColorTRANSPARENT);
- //  overlay_canvas->translate(-rect.x(), -rect.y());
- //  overlay_canvas->drawPicture(picture);
-
- //  layer->did_submit_last_frame = frame->Submit();
-
-    continue;
-
     for (size_t j = i + 1; j > 0; j--) {
       int current_platform_view_id = composition_order_[j - 1];
-      EmbeddedViewParams params = platform_views_params_[current_platform_view_id];
-      SkRect platform_view_rect = SkRect::MakeXYWH(
-          /*x=*/params.offsetPixels.x(),
-          /*y=*/params.offsetPixels.y(),
-          /*width=*/params.sizePoints.width() * screenScale,
-          /*height=*/params.sizePoints.height() * screenScale);
+
+      SkRect platform_view_rect = GetPlatformViewRect(current_platform_view_id);
 
       std::vector<SkRect*> intersection_rects;
       bbh->searchRects(platform_view_rect, &intersection_rects);
@@ -522,7 +477,7 @@
         }
         // Get the intersection rect between the current joined rect
         // and the platform view rect.
-        // joined_rect.intersect(platform_view_rect);
+        joined_rect.intersect(platform_view_rect);
         auto layer = GetLayer(gr_context, ios_context, picture, joined_rect);
         did_submit &= layer->did_submit_last_frame;
         platform_view_layers[current_platform_view_id].push_back(layer);
@@ -531,7 +486,7 @@
           // Get the intersection rect between the current rect
           // and the platform view rect.
           SkRect joined_rect = *rect;
-          // joined_rect.intersect(platform_view_rect);
+          joined_rect.intersect(platform_view_rect);
           auto layer = GetLayer(gr_context, ios_context, picture, joined_rect);
           did_submit &= layer->did_submit_last_frame;
           platform_view_layers[current_platform_view_id].push_back(layer);
@@ -544,6 +499,7 @@
 
   composition_order_.clear();
   layer_pool_->RecycleLayers();
+
   return did_submit;
 }
 
@@ -553,13 +509,13 @@
   for (size_t i = 0; i < composition_order_.size(); i++) {
     int platform_view_id = composition_order_[i];
     auto layers = layer_map[platform_view_id];
-    // UIView* platform_view_root = root_views_[platform_view_id].get();
+    UIView* platform_view_root = root_views_[platform_view_id].get();
 
-    // if (platform_view_root.superview != flutter_view) {
-    //   [flutter_view addSubview:platform_view_root];
-    // } else {
-    //   platform_view_root.layer.zPosition = zIndex++;
-    // }
+    if (platform_view_root.superview != flutter_view) {
+      [flutter_view addSubview:platform_view_root];
+    } else {
+      platform_view_root.layer.zPosition = zIndex++;
+    }
     for (auto layer : layers) {
       if ([layer->overlay_view superview] != flutter_view) {
         [flutter_view addSubview:layer->overlay_view];
@@ -571,26 +527,6 @@
   }
 }
 
-void FlutterPlatformViewsController::RemoveUnusedLayers() {
-  auto layers = layer_pool_->GetUnusedLayers();
-  for (auto layer : layers) {
-    [layer->overlay_view removeFromSuperview];
-  }
-
-  std::unordered_set<int64_t> composition_order_set;
-
-  for (int64_t view_id : composition_order_) {
-    composition_order_set.insert(view_id);
-  }
-  // Remove unused platform views.
-  for (int64_t view_id : active_composition_order_) {
-    if (composition_order_set.find(view_id) == composition_order_set.end()) {
-      UIView* platform_view_root = root_views_[view_id].get();
-      [platform_view_root removeFromSuperview];
-    }
-  }
-}
-
 std::shared_ptr<FlutterPlatformViewLayer> FlutterPlatformViewsController::GetLayer(
     GrContext* gr_context,
     std::shared_ptr<IOSContext> ios_context,
@@ -599,10 +535,11 @@
   std::shared_ptr<FlutterPlatformViewLayer> layer = layer_pool_->GetLayer(gr_context, ios_context);
   CGFloat screenScale = [UIScreen mainScreen].scale;
   // Set the size of the overlay UIView.
-  layer->overlay_view.get().backgroundColor = [UIColor blueColor];
-  layer->overlay_view.get().frame =
-      CGRectMake(rect.x() / screenScale, rect.y() / screenScale, rect.width() / screenScale,
-                 rect.height() / screenScale);
+  layer->overlay_view.get().frame = CGRectMake(rect.x() / screenScale,      //
+                                               rect.y() / screenScale,      //
+                                               rect.width() / screenScale,  //
+                                               rect.height() / screenScale  //
+  );
 
   SkISize rect_size = SkISize::Make(rect.width(), rect.height());
   std::unique_ptr<SurfaceFrame> frame = layer->surface->AcquireFrame(rect_size);
@@ -620,6 +557,26 @@
   return layer;
 }
 
+void FlutterPlatformViewsController::RemoveUnusedLayers() {
+  auto layers = layer_pool_->GetUnusedLayers();
+  for (auto layer : layers) {
+    [layer->overlay_view removeFromSuperview];
+  }
+
+  std::unordered_set<int64_t> composition_order_set;
+
+  for (int64_t view_id : composition_order_) {
+    composition_order_set.insert(view_id);
+  }
+  // Remove unused platform views.
+  for (int64_t view_id : active_composition_order_) {
+    if (composition_order_set.find(view_id) == composition_order_set.end()) {
+      UIView* platform_view_root = root_views_[view_id].get();
+      [platform_view_root removeFromSuperview];
+    }
+  }
+}
+
 void FlutterPlatformViewsController::DisposeViews() {
   if (views_to_dispose_.empty()) {
     return;

shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h

@@ -132,6 +132,8 @@ class FlutterPlatformViewsController {
 
   SkCanvas* CompositeEmbeddedView(int view_id);
 
+  SkRect GetPlatformViewRect(int view_id);
+
   // Discards all platform views instances and auxiliary resources.
   void Reset();
 

shell/platform/darwin/ios/ios_surface_gl.h

@@ -51,6 +51,34 @@ class IOSSurfaceGL final : public IOSSurface, public GPUSurfaceGLDelegate {
   // |GPUSurfaceGLDelegate|
   ExternalViewEmbedder* GetExternalViewEmbedder() override;
 
+  // |ExternalViewEmbedder|
+  SkCanvas* GetRootCanvas() override;
+
+  // |ExternalViewEmbedder|
+  void CancelFrame() override;
+
+  // |ExternalViewEmbedder|
+  void BeginFrame(SkISize frame_size, GrContext* context, double device_pixel_ratio) override;
+
+  // |ExternalViewEmbedder|
+  void PrerollCompositeEmbeddedView(int view_id,
+                                    std::unique_ptr<flutter::EmbeddedViewParams> params) override;
+
+  // |ExternalViewEmbedder|
+  PostPrerollResult PostPrerollAction(fml::RefPtr<fml::GpuThreadMerger> gpu_thread_merger) override;
+
+  // |ExternalViewEmbedder|
+  std::vector<SkCanvas*> GetCurrentCanvases() override;
+
+  // |ExternalViewEmbedder|
+  SkCanvas* CompositeEmbeddedView(int view_id) override;
+
+  // |ExternalViewEmbedder|
+  SkRect GetPlatformViewRect(int view_id) override;
+
+  // |ExternalViewEmbedder|
+  bool SubmitFrame(GrContext* context) override;
+
  private:
   std::unique_ptr<IOSRenderTargetGL> render_target_;