fixes

Author: Chris Yang

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

@@ -420,14 +420,14 @@ static bool ClipBoundsContainsPlatformViewBoundingRect(const SkRect& clip_bounds
 }
 
 void FlutterPlatformViewsController::ClipViewAddMaskView(UIView* clipView) {
-  // if (clipView.maskView) {
-  //   return;
-  // }
-  // UIView* flutterView = flutter_view_.get();
-  // CGRect frame = CGRectMake(-clipView.frame.origin.x, -clipView.frame.origin.y,
-  //                                CGRectGetWidth(flutterView.bounds),
-  //                                CGRectGetHeight(flutterView.bounds));
-  // clipView.maskView = [mask_view_pool_.get() getMaskViewWithFrame:frame];
+  if (clipView.maskView) {
+    return;
+  }
+  UIView* flutterView = flutter_view_.get();
+  CGRect frame =
+      CGRectMake(-clipView.frame.origin.x, -clipView.frame.origin.y,
+                 CGRectGetWidth(flutterView.bounds), CGRectGetHeight(flutterView.bounds));
+  clipView.maskView = [mask_view_pool_.get() getMaskViewWithFrame:frame];
 }
 
 void FlutterPlatformViewsController::ApplyMutators(const MutatorsStack& mutators_stack,
@@ -444,13 +444,10 @@ static bool ClipBoundsContainsPlatformViewBoundingRect(const SkRect& clip_bounds
   NSMutableArray* blurFilters = [[[NSMutableArray alloc] init] autorelease];
   FML_DCHECK(!clipView.maskView ||
              [clipView.maskView isKindOfClass:[FlutterClippingMaskView class]]);
-  FlutterClippingMaskView* maskView = (FlutterClippingMaskView*)clipView.maskView;
   if (mask_view_pool_.get() == nil) {
     mask_view_pool_.reset([[FlutterClippingMaskViewPool alloc] initWithCapacity:5]);
   }
-  if (maskView) {
-    [mask_view_pool_.get() markAvailable:maskView];
-  }
+  [mask_view_pool_.get() recycleMaskViews];
   clipView.maskView = nil;
   auto iter = mutators_stack.Begin();
   while (iter != mutators_stack.End()) {
@@ -533,28 +530,28 @@ static bool ClipBoundsContainsPlatformViewBoundingRect(const SkRect& clip_bounds
     [clipView applyBlurBackdropFilters:blurFilters];
   }
 
-  // CGFloat screenScale = [UIScreen mainScreen].scale;
-  // // The UIKit frame is set based on the logical resolution (points) instead of physical.
-  // //
+  CGFloat screenScale = [UIScreen mainScreen].scale;
+  // The UIKit frame is set based on the logical resolution (points) 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
-  // // 500 points in UIKit for devices that has screenScale of 2. We need to scale the
+  // However, flow is based on the physical resolution. For example, 1000 pixels in flow equals
+  // 500 points in UIKit for devices that has screenScale of 2. We need to scale the
   // transformMatrix
-  // // down to the logical resoltion before applying it to the layer of PlatformView.
-  // transformMatrix.postScale(1 / screenScale, 1 / screenScale);
-
-  // // Reverse the offset of the clipView.
-  // // The clipView's frame includes the final translate of the final transform matrix.
-  // // Thus, this translate needs to be reversed so the platform view can layout at the correct
-  // // offset.
-  // //
-  // // Note that the transforms are not applied to the clipping paths because clipping paths happen
+  // down to the logical resoltion before applying it to the layer of PlatformView.
+  transformMatrix.postScale(1 / screenScale, 1 / screenScale);
+
+  // Reverse the offset of the clipView.
+  // The clipView's frame includes the final translate of the final transform matrix.
+  // Thus, this translate needs to be reversed so the platform view can layout at the correct
+  // offset.
+  //
+  // Note that the transforms are not applied to the clipping paths because clipping paths happen
   // on
-  // // the mask view, whose origin is always (0,0) to the flutter_view.
-  // transformMatrix.postTranslate(-clipView.frame.origin.x, -clipView.frame.origin.y);
+  // the mask view, whose origin is always (0,0) to the flutter_view.
+  transformMatrix.postTranslate(-clipView.frame.origin.x, -clipView.frame.origin.y);
 
-  // embedded_view.layer.transform = flutter::GetCATransform3DFromSkMatrix(transformMatrix);
-  embedded_view.frame = clipView.bounds;
+  embedded_view.layer.transform = flutter::GetCATransform3DFromSkMatrix(transformMatrix);
+  // embedded_view.frame = clipView.bounds;
 }
 
 void FlutterPlatformViewsController::CompositeWithParams(int view_id,
@@ -880,6 +877,7 @@ static bool ClipBoundsContainsPlatformViewBoundingRect(const SkRect& clip_bounds
   if (catransaction_added_) {
     FML_DCHECK([[NSThread currentThread] isMainThread]);
     [CATransaction commit];
+
     catransaction_added_ = false;
   }
 }

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

@@ -59,7 +59,7 @@
 // Reuse a maskView from the pool, or allocate a new one.
 - (FlutterClippingMaskView*)getMaskViewWithFrame:(CGRect)frame;
 
-- (void)markAvailable:(FlutterClippingMaskView*)maskView;
+- (void)recycleMaskViews;
 
 @end
 

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

@@ -456,7 +456,7 @@ @interface FlutterClippingMaskViewPool ()
 
 @property(assign, nonatomic) NSUInteger capacity;
 @property(retain, nonatomic) NSMutableArray<FlutterClippingMaskView*>* pool;
-@property(retain, nonatomic) NSMutableSet<NSNumber*>* availableViews;
+@property(assign, nonatomic) NSUInteger availableIndex;
 
 @end
 
@@ -465,47 +465,45 @@ @implementation FlutterClippingMaskViewPool : NSObject
 - (instancetype)initWithCapacity:(NSInteger)capacity {
   if (self = [super init]) {
     _pool = [[NSMutableArray alloc] initWithCapacity:capacity];
-    _availableViews = [[NSMutableSet alloc] initWithCapacity:capacity];
     _capacity = capacity;
+    _availableIndex = 0;
   }
   return self;
 }
 
 // Reuse a maskView from the pool, or allocate a new one.
 - (FlutterClippingMaskView*)getMaskViewWithFrame:(CGRect)frame {
-  if (self.availableViews.count == 0) {
-    // No avaialble views in the pool, alloc a new one.
-    FlutterClippingMaskView* maskView =
+  FML_DCHECK(self.availableIndex <= self.capacity);
+  FlutterClippingMaskView* maskView;
+  if (self.availableIndex == self.capacity) {
+    // The pool is full, alloc a new one.
+    maskView =
         [[[FlutterClippingMaskView alloc] initWithFrame:frame
                                             screenScale:[UIScreen mainScreen].scale] autorelease];
-    if (self.pool.count < self.capacity) {
-      [self.pool addObject:maskView];
-    }
     return maskView;
   }
-  NSNumber* nextAvailable = [self.availableViews anyObject];
-  FlutterClippingMaskView* maskView = [self.pool objectAtIndex:nextAvailable.unsignedIntegerValue];
-  maskView.frame = frame;
-  [maskView reset];
-  [self.availableViews removeObject:nextAvailable];
+
+  if (self.availableIndex >= self.pool.count) {
+    // The pool doesn't have enough maskViews, alloc a new one and add to the pool.
+    maskView =
+        [[[FlutterClippingMaskView alloc] initWithFrame:frame
+                                            screenScale:[UIScreen mainScreen].scale] autorelease];
+    [self.pool addObject:maskView];
+    FML_DCHECK(self.pool.count <= self.capacity);
+  } else {
+    maskView = [self.pool objectAtIndex:self.availableIndex];
+    maskView.frame = frame;
+    [maskView reset];
+  }
+  self.availableIndex++;
   return maskView;
 }
 
-- (void)markAvailable:(FlutterClippingMaskView*)maskView {
-  FML_DCHECK(maskView != nil);
-  // O(_size)
-  NSUInteger index = [self.pool indexOfObject:maskView];
-  if (index == NSNotFound) {
-    return;
-  }
-  FML_DCHECK(index < self.capacity);
-  [self.availableViews addObject:@(index)];
-  FML_DCHECK(self.availableViews.count <= self.capacity);
+- (void)recycleMaskViews {
+  self.availableIndex = 0;
 }
 
 - (void)dealloc {
-  [_availableViews release];
-  _availableViews = nil;
   [_pool release];
   _pool = nil;
 

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

@@ -83,7 +83,6 @@ - (void)setMaxRefreshRateIfEnabled {
     return;
   }
   double maxFrameRate = fmax([DisplayLinkManager displayRefreshRate], 60);
-  // double maxFrameRate = 60;
   double minFrameRate = fmax(maxFrameRate / 2, 60);
 
   if (@available(iOS 15.0, *)) {