small changes

Author: knopp

shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h

@@ -31,9 +31,8 @@
 
 /**
  * Owned by `FlutterView`.
- * Responsible for providing surfaces for Flutter to render into and
- * as well as subsequent presentation of these surfaces.
- * The Presentation of surfaces includes management of core animation sublayers.
+ * Responsible for providing surfaces for Flutter to render into and subsequent
+ * presentation of these surfaces. Manages core animation sublayers.
  */
 @interface FlutterSurfaceManager : NSObject
 
@@ -67,8 +66,8 @@
  * Must be called on raster thread. This will schedule a commit on platform
  * thread and block raster thread until the commit is done.
  * `notify` block will be invoked on platform thread and can be used to perform
- * additional work after commit is done, such as mutating platform views.
- * It is guaranteed be called in same CATransaction.
+ * additional work, such as mutating platform views. It is guaranteed be called in
+ * same CATransaction.
  */
 - (void)present:(nonnull NSArray<FlutterSurfacePresentInfo*>*)surfaces
          notify:(nullable dispatch_block_t)notify;

shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.mm

@@ -26,10 +26,11 @@ - (instancetype)init {
   return self;
 }
 
-- (nullable FlutterSurface*)getSurfaceForSize:(CGSize)size {
+- (nullable FlutterSurface*)removeSurfaceForSize:(CGSize)size {
   @synchronized(self) {
     for (FlutterSurface* surface in _surfaces) {
       if (CGSizeEqualToSize(surface.size, size)) {
+        // By default ARC doesn't retain enumartion iteration variables.
         FlutterSurface* res = surface;
         [_surfaces removeObject:surface];
         return res;
@@ -138,7 +139,7 @@ - (FlutterSurface*)lookupSurface:(nonnull const FlutterMetalTexture*)texture {
 }
 
 - (FlutterSurface*)backBufferForSize:(CGSize)size {
-  FlutterSurface* res = [_backBufferCache getSurfaceForSize:size];
+  FlutterSurface* res = [_backBufferCache removeSurfaceForSize:size];
   if (res == nil) {
     res = [[FlutterSurface alloc] initWithSize:size device:_device];
   }
@@ -173,7 +174,7 @@ - (void)commit:(NSArray<FlutterSurfacePresentInfo*>*)surfaces {
     [_layers addObject:layer];
   }
 
-  // Update contents of surface.
+  // Update contents of surfaces.
   for (size_t i = 0; i < surfaces.count; ++i) {
     FlutterSurfacePresentInfo* info = surfaces[i];
     CALayer* layer = _layers[i];
@@ -190,7 +191,7 @@ - (void)present:(NSArray<FlutterSurfacePresentInfo*>*)surfaces notify:(dispatch_
   [commandBuffer commit];
   [commandBuffer waitUntilScheduled];
 
-  // Get the actual dimensions of the frame (relevant for resize synchronizer).
+  // Get the actual dimensions of the frame (relevant for thread synchronizer).
   CGSize size = CGSizeZero;
   for (FlutterSurfacePresentInfo* info in surfaces) {
     size = CGSizeMake(std::max(size.width, info.offset.x + info.surface.size.width),

shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager_Internal.h

@@ -14,7 +14,7 @@
 /**
  * Removes surface with given size from cache (if available) and returns it.
  */
-- (nullable FlutterSurface*)getSurfaceForSize:(CGSize)size;
+- (nullable FlutterSurface*)removeSurfaceForSize:(CGSize)size;
 
 /**
  * Removes all cached surface replacing them with new ones.