Review edits

Author: jmagman

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

@@ -176,7 +176,7 @@ - (instancetype)init {
     _availableTextures = [[NSMutableSet alloc] init];
 
     _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(onDisplayLink:)];
-    [self setMaxRefreshRate:[DisplayLinkManager displayRefreshRate] forceMax:NO];
+    [self setMaxRefreshRate:DisplayLinkManager.displayRefreshRate forceMax:NO];
     [_displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(didEnterBackground:)
@@ -214,7 +214,7 @@ - (void)onDisplayLink:(CADisplayLink*)link {
   if (_displayLinkPauseCountdown == 3) {
     _displayLink.paused = YES;
     if (_displayLinkForcedMaxRate) {
-      [self setMaxRefreshRate:[DisplayLinkManager displayRefreshRate] forceMax:NO];
+      [self setMaxRefreshRate:DisplayLinkManager.displayRefreshRate forceMax:NO];
       _displayLinkForcedMaxRate = NO;
     }
   } else {
@@ -395,7 +395,7 @@ - (void)presentOnMainThread:(FlutterTexture*)texture {
     _didSetContentsDuringThisDisplayLinkPeriod = YES;
   } else if (!_displayLinkForcedMaxRate) {
     _displayLinkForcedMaxRate = YES;
-    [self setMaxRefreshRate:[DisplayLinkManager displayRefreshRate] forceMax:YES];
+    [self setMaxRefreshRate:DisplayLinkManager.displayRefreshRate forceMax:YES];
   }
 }
 

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

@@ -1321,7 +1321,7 @@ - (void)createTouchRateCorrectionVSyncClientIfNeeded {
     return;
   }
 
-  double displayRefreshRate = [DisplayLinkManager displayRefreshRate];
+  double displayRefreshRate = DisplayLinkManager.displayRefreshRate;
   const double epsilon = 0.1;
   if (displayRefreshRate < 60.0 + epsilon) {  // displayRefreshRate <= 60.0
 

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

@@ -29,7 +29,7 @@
 ///
 /// @return     The refresh rate in frames per second.
 ///
-+ (double)displayRefreshRate;
+@property(class, nonatomic, readonly) double displayRefreshRate;
 
 @end
 
@@ -52,10 +52,11 @@
 
 - (void)pause;
 
+//------------------------------------------------------------------------------
+/// @brief      Call invalidate before releasing this object to remove from runloops.
+///
 - (void)invalidate;
 
-- (double)getRefreshRate;
-
 - (void)setMaxRefreshRate:(double)refreshRate;
 
 @end

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

@@ -15,6 +15,10 @@
 #include "flutter/fml/memory/task_runner_checker.h"
 #include "flutter/fml/trace_event.h"
 
+@interface VSyncClient ()
+@property(nonatomic, assign, readonly) double refreshRate;
+@end
+
 // When calculating refresh rate diffrence, anything within 0.1 fps is ignored.
 const static double kRefreshRateDiffToIgnore = 0.1;
 
@@ -29,7 +33,7 @@
   };
   client_ = [[VSyncClient alloc] initWithTaskRunner:task_runners_.GetUITaskRunner()
                                            callback:callback];
-  max_refresh_rate_ = [DisplayLinkManager displayRefreshRate];
+  max_refresh_rate_ = DisplayLinkManager.displayRefreshRate;
 }
 
 VsyncWaiterIOS::~VsyncWaiterIOS() {
@@ -39,7 +43,7 @@
 }
 
 void VsyncWaiterIOS::AwaitVSync() {
-  double new_max_refresh_rate = [DisplayLinkManager displayRefreshRate];
+  double new_max_refresh_rate = DisplayLinkManager.displayRefreshRate;
   if (fabs(new_max_refresh_rate - max_refresh_rate_) > kRefreshRateDiffToIgnore) {
     max_refresh_rate_ = new_max_refresh_rate;
     [client_ setMaxRefreshRate:max_refresh_rate_];
@@ -49,34 +53,33 @@
 
 // |VariableRefreshRateReporter|
 double VsyncWaiterIOS::GetRefreshRate() const {
-  return [client_ getRefreshRate];
+  return client_.refreshRate;
 }
 
 }  // namespace flutter
 
 @implementation VSyncClient {
-  flutter::VsyncWaiter::Callback callback_;
+  flutter::VsyncWaiter::Callback _callback;
   CADisplayLink* _displayLink;
-  double current_refresh_rate_;
 }
 
 - (instancetype)initWithTaskRunner:(fml::RefPtr<fml::TaskRunner>)task_runner
                           callback:(flutter::VsyncWaiter::Callback)callback {
   self = [super init];
 
   if (self) {
-    current_refresh_rate_ = [DisplayLinkManager displayRefreshRate];
+    _refreshRate = DisplayLinkManager.displayRefreshRate;
     _allowPauseAfterVsync = YES;
-    callback_ = std::move(callback);
+    _callback = std::move(callback);
     _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(onDisplayLink:)];
     _displayLink.paused = YES;
 
-    [self setMaxRefreshRate:[DisplayLinkManager displayRefreshRate]];
+    [self setMaxRefreshRate:DisplayLinkManager.displayRefreshRate];
 
     // Strongly retain the the captured link until it is added to the runloop.
     CADisplayLink* localDisplayLink = _displayLink;
     task_runner->PostTask([localDisplayLink]() {
-      [localDisplayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
+      [localDisplayLink addToRunLoop:NSRunLoop.currentRunLoop forMode:NSRunLoopCommonModes];
     });
   }
 
@@ -119,28 +122,20 @@ - (void)onDisplayLink:(CADisplayLink*)link {
   std::unique_ptr<flutter::FrameTimingsRecorder> recorder =
       std::make_unique<flutter::FrameTimingsRecorder>();
 
-  current_refresh_rate_ = round(1 / (frame_target_time - frame_start_time).ToSecondsF());
+  _refreshRate = round(1 / (frame_target_time - frame_start_time).ToSecondsF());
 
   recorder->RecordVsync(frame_start_time, frame_target_time);
   if (_allowPauseAfterVsync) {
     link.paused = YES;
   }
-  callback_(std::move(recorder));
+  _callback(std::move(recorder));
 }
 
 - (void)invalidate {
   [_displayLink invalidate];
   _displayLink = nil;  // Break retain cycle.
 }
 
-- (void)dealloc {
-  [_displayLink invalidate];
-}
-
-- (double)getRefreshRate {
-  return current_refresh_rate_;
-}
-
 - (CADisplayLink*)getDisplayLink {
   return _displayLink;
 }
@@ -164,15 +159,15 @@ + (double)displayRefreshRate {
     return preferredFPS;
   }
 
-  return [UIScreen mainScreen].maximumFramesPerSecond;
+  return UIScreen.mainScreen.maximumFramesPerSecond;
 }
 
 - (void)onDisplayLink:(CADisplayLink*)link {
   // no-op.
 }
 
 + (BOOL)maxRefreshRateEnabledOnIPhone {
-  return [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CADisableMinimumFrameDurationOnPhone"]
+  return [[NSBundle.mainBundle objectForInfoDictionaryKey:@"CADisableMinimumFrameDurationOnPhone"]
       boolValue];
 }