format

Author: Chris Yang

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

@@ -32,6 +32,16 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
 }
 @end
 
+static bool ClipBoundsContainsPlatformViewBoundingRect(const SkRect& clipBounds,
+                                                       const SkRect& platformViewBoundingRect,
+                                                       const SkMatrix& transformMatrix,
+                                                       CGFloat screenScale) {
+  SkRect transformedClipBounds = transformMatrix.mapRect(clipBounds);
+  SkMatrix reverseScreenScale = SkMatrix::Scale(1 / screenScale, 1 / screenScale);
+  SkRect scaledBoundingRect = reverseScreenScale.mapRect(platformViewBoundingRect);
+  return transformedClipBounds.contains(scaledBoundingRect);
+}
+
 namespace flutter {
 // Becomes NO if Apple's API changes and blurred backdrop filters cannot be applied.
 BOOL canApplyBlurBackdrop = YES;
@@ -405,7 +415,7 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
 
 void FlutterPlatformViewsController::ApplyMutators(const MutatorsStack& mutators_stack,
                                                    UIView* embedded_view,
-                                                   const SkRect& boundingRect) {
+                                                   const SkRect& bounding_rect) {
   if (flutter_view_ == nullptr) {
     return;
   }
@@ -419,7 +429,7 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
   // 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;
-  CATransform3D finalTransform = CATransform3DMakeScale(1 / screenScale, 1 / screenScale, 1);
+  SkMatrix transformMatrix = SkMatrix::Scale(1 / screenScale, 1 / screenScale);
 
   UIView* flutter_view = flutter_view_.get();
   FlutterClippingMaskView* maskView = [[[FlutterClippingMaskView alloc]
@@ -434,31 +444,37 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
   while (iter != mutators_stack.End()) {
     switch ((*iter)->GetType()) {
       case kTransform: {
-        CATransform3D transform = GetCATransform3DFromSkMatrix((*iter)->GetMatrix());
-        finalTransform = CATransform3DConcat(transform, finalTransform);
+        transformMatrix = SkMatrix::Concat((*iter)->GetMatrix(), transformMatrix);
         break;
       }
-      case kClipRect:
-        if ((*iter)->GetRect().contains(boundingRect)) {
+      case kClipRect: {
+        if (ClipBoundsContainsPlatformViewBoundingRect((*iter)->GetRect(), bounding_rect,
+                                                       transformMatrix, screenScale)) {
           break;
         }
-        [maskView clipRect:(*iter)->GetRect() matrix:finalTransform];
+        [maskView clipRect:(*iter)->GetRect() matrix:GetCATransform3DFromSkMatrix(transformMatrix)];
         needMask = YES;
         break;
-      case kClipRRect:
-        if ((*iter)->GetRRect().getBounds().contains(boundingRect)) {
+      }
+      case kClipRRect: {
+        if (ClipBoundsContainsPlatformViewBoundingRect(
+                (*iter)->GetRRect().getBounds(), bounding_rect, transformMatrix, screenScale)) {
           break;
         }
-        [maskView clipRRect:(*iter)->GetRRect() matrix:finalTransform];
+        [maskView clipRRect:(*iter)->GetRRect()
+                     matrix:GetCATransform3DFromSkMatrix(transformMatrix)];
         needMask = YES;
         break;
-      case kClipPath:
-        if ((*iter)->GetPath().getBounds().contains(boundingRect)) {
+      }
+      case kClipPath: {
+        if (ClipBoundsContainsPlatformViewBoundingRect(
+                (*iter)->GetPath().getBounds(), bounding_rect, transformMatrix, screenScale)) {
           break;
         }
-        [maskView clipPath:(*iter)->GetPath() matrix:finalTransform];
+        [maskView clipPath:(*iter)->GetPath() matrix:GetCATransform3DFromSkMatrix(transformMatrix)];
         needMask = YES;
         break;
+      }
       case kOpacity:
         embedded_view.alpha = (*iter)->GetAlphaFloat() * embedded_view.alpha;
         break;
@@ -512,9 +528,12 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
   // the mask view, whose origin is always (0,0) to the flutter_view.
   CATransform3D reverseTranslate =
       CATransform3DMakeTranslation(-clipView.frame.origin.x, -clipView.frame.origin.y, 0);
-  embedded_view.layer.transform = CATransform3DConcat(finalTransform, reverseTranslate);
+  embedded_view.layer.transform =
+      CATransform3DConcat(GetCATransform3DFromSkMatrix(transformMatrix), reverseTranslate);
   if (needMask) {
     clipView.maskView = maskView;
+  } else {
+    clipView.maskView = nil;
   }
 }
 

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

@@ -1512,6 +1512,10 @@ - (void)testClipsDoNotInterceptWithPlatformViewShouldNotAddMaskView {
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
+  // Layer tree always pushes a screen scale factor to the stack
+  SkMatrix screenScaleMatrix =
+      SkMatrix::Scale([UIScreen mainScreen].scale, [UIScreen mainScreen].scale);
+  stack.PushTransform(screenScaleMatrix);
   SkMatrix translateMatrix = SkMatrix::Translate(5, 5);
   // The platform view's rect for this test will be (5, 5, 10, 10)
   stack.PushTransform(translateMatrix);
@@ -1526,8 +1530,8 @@ - (void)testClipsDoNotInterceptWithPlatformViewShouldNotAddMaskView {
   SkPath path = SkPath::RRect(SkRect::MakeXYWH(0, 0, 23, 23), 1, 1);
   stack.PushClipPath(path);
 
-  auto embeddedViewParams =
-      std::make_unique<flutter::EmbeddedViewParams>(translateMatrix, SkSize::Make(5, 5), stack);
+  auto embeddedViewParams = std::make_unique<flutter::EmbeddedViewParams>(
+      SkMatrix::Concat(screenScaleMatrix, translateMatrix), SkSize::Make(5, 5), stack);
 
   flutterPlatformViewsController->PrerollCompositeEmbeddedView(2, std::move(embeddedViewParams));
   flutterPlatformViewsController->CompositeEmbeddedView(2);

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

@@ -280,7 +280,7 @@ class FlutterPlatformViewsController {
   // After each clip operation, we update the head to the super view of the current head.
   void ApplyMutators(const MutatorsStack& mutators_stack,
                      UIView* embedded_view,
-                     const SkRect& boundingRect);
+                     const SkRect& bounding_rect);
   void CompositeWithParams(int view_id, const EmbeddedViewParams& params);
 
   // Allocates a new FlutterPlatformViewLayer if needed, draws the pixels within the rect from