fix tests

Author: Chris Yang

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

@@ -32,12 +32,6 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
 }
 @end
 
-// Return true if clip_with and clip_on have a non-zero intercetion that
-// is smaller than clip_on.
-static bool RectClipsRect(const SkRect& clip_with, const SkRect& clip_on) {
-  return clip_with.intersects(clip_on) && !clip_with.contains(clip_on);
-}
-
 namespace flutter {
 // Becomes NO if Apple's API changes and blurred backdrop filters cannot be applied.
 BOOL canApplyBlurBackdrop = YES;
@@ -445,22 +439,25 @@ static bool RectClipsRect(const SkRect& clip_with, const SkRect& clip_on) {
         break;
       }
       case kClipRect:
-        if (RectClipsRect(boundingRect, (*iter)->GetRect())) {
-          [maskView clipRect:(*iter)->GetRect() matrix:finalTransform];
-          needMask = YES;
+        if ((*iter)->GetRect().contains(boundingRect)) {
+          break;
         }
+        [maskView clipRect:(*iter)->GetRect() matrix:finalTransform];
+        needMask = YES;
         break;
       case kClipRRect:
-        if (RectClipsRect(boundingRect, (*iter)->GetRRect().getBounds())) {
-          [maskView clipRRect:(*iter)->GetRRect() matrix:finalTransform];
-          needMask = YES;
+        if ((*iter)->GetRRect().getBounds().contains(boundingRect)) {
+          break;
         }
+        [maskView clipRRect:(*iter)->GetRRect() matrix:finalTransform];
+        needMask = YES;
         break;
       case kClipPath:
-        if (RectClipsRect(boundingRect, (*iter)->GetPath().getBounds())) {
-          [maskView clipPath:(*iter)->GetPath() matrix:finalTransform];
-          needMask = YES;
+        if ((*iter)->GetPath().getBounds().contains(boundingRect)) {
+          break;
         }
+        [maskView clipPath:(*iter)->GetPath() matrix:finalTransform];
+        needMask = YES;
         break;
       case kOpacity:
         embedded_view.alpha = (*iter)->GetAlphaFloat() * embedded_view.alpha;

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

@@ -1512,10 +1512,6 @@ - (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);
@@ -1524,14 +1520,14 @@ - (void)testClipsDoNotInterceptWithPlatformViewShouldNotAddMaskView {
   stack.PushClipRect(rect);
   // Push a clip rrect, big enough to contain the entire platform view bound
   SkRect rect_for_rrect = SkRect::MakeXYWH(0, 0, 24, 24);
-  SkRRect rrect = SkRRect::MakeRectXY (rect_for_rrect, 1, 1);
+  SkRRect rrect = SkRRect::MakeRectXY(rect_for_rrect, 1, 1);
   stack.PushClipRRect(rrect);
   // Push a clip path, big enough to contain the entire platform view bound
   SkPath path = SkPath::RRect(SkRect::MakeXYWH(0, 0, 23, 23), 1, 1);
   stack.PushClipPath(path);
 
   auto embeddedViewParams =
-      std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix, SkSize::Make(10, 10), stack);
+      std::make_unique<flutter::EmbeddedViewParams>(translateMatrix, SkSize::Make(5, 5), stack);
 
   flutterPlatformViewsController->PrerollCompositeEmbeddedView(2, std::move(embeddedViewParams));
   flutterPlatformViewsController->CompositeEmbeddedView(2);