firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: Extract constant for CADisableMinimumFrameDurationOnPhone (flutter/engine#56659)

Browse Source 
In our vsync waiter and related tests, we hardcode the "CADisableMinimumFrameDurationOnPhone" key in several places. This pulls those into a constant kCADisableMinimumFrameDurationOnPhoneKey declared in the vsync waiter header, which is non-public, and uses that instead.

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
This commit is contained in:
Chris Bracken 2024-11-17 15:21:10 -08:00 committed by GitHub
parent c9f8ebef70
commit d82d8cf3cd
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm
View File

@ -2093,7 +2093,7 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
- (void)testSetupKeyboardAnimationVsyncClientWillCreateNewVsyncClientForFlutterViewController { - (void)testSetupKeyboardAnimationVsyncClientWillCreateNewVsyncClientForFlutterViewController {
id bundleMock = OCMPartialMock([NSBundle mainBundle]); id bundleMock = OCMPartialMock([NSBundle mainBundle]);
OCMStub([bundleMock objectForInfoDictionaryKey:@"CADisableMinimumFrameDurationOnPhone"]) OCMStub([bundleMock objectForInfoDictionaryKey:kCADisableMinimumFrameDurationOnPhoneKey])
.andReturn(@YES); .andReturn(@YES);
id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]]; id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
double maxFrameRate = 120; double maxFrameRate = 120;

4
engine/src/flutter/shell/platform/darwin/ios/framework/Source/VsyncWaiterIosTest.mm
View File

@ -53,7 +53,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(const std::string& name) {
auto thread_task_runner = CreateNewThread("VsyncWaiterIosTest"); auto thread_task_runner = CreateNewThread("VsyncWaiterIosTest");
auto callback = [](std::unique_ptr<flutter::FrameTimingsRecorder> recorder) {}; auto callback = [](std::unique_ptr<flutter::FrameTimingsRecorder> recorder) {};
id bundleMock = OCMPartialMock([NSBundle mainBundle]); id bundleMock = OCMPartialMock([NSBundle mainBundle]);
OCMStub([bundleMock objectForInfoDictionaryKey:@"CADisableMinimumFrameDurationOnPhone"]) OCMStub([bundleMock objectForInfoDictionaryKey:kCADisableMinimumFrameDurationOnPhoneKey])
.andReturn(@YES); .andReturn(@YES);
id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]]; id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
double maxFrameRate = 120; double maxFrameRate = 120;
@ -75,7 +75,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(const std::string& name) {
auto thread_task_runner = CreateNewThread("VsyncWaiterIosTest"); auto thread_task_runner = CreateNewThread("VsyncWaiterIosTest");
auto callback = [](std::unique_ptr<flutter::FrameTimingsRecorder> recorder) {}; auto callback = [](std::unique_ptr<flutter::FrameTimingsRecorder> recorder) {};
id bundleMock = OCMPartialMock([NSBundle mainBundle]); id bundleMock = OCMPartialMock([NSBundle mainBundle]);
OCMStub([bundleMock objectForInfoDictionaryKey:@"CADisableMinimumFrameDurationOnPhone"]) OCMStub([bundleMock objectForInfoDictionaryKey:kCADisableMinimumFrameDurationOnPhoneKey])
.andReturn(@NO); .andReturn(@NO);
id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]]; id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
double maxFrameRate = 120; double maxFrameRate = 120;

21
engine/src/flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h
View File

@ -11,13 +11,24 @@
#include "flutter/shell/common/variable_refresh_rate_reporter.h" #include "flutter/shell/common/variable_refresh_rate_reporter.h"
#include "flutter/shell/common/vsync_waiter.h" #include "flutter/shell/common/vsync_waiter.h"
//------------------------------------------------------------------------------
/// @brief Info.plist key enabling the full range of ProMotion refresh rates for CADisplayLink
/// callbacks and CAAnimation animations in the app.
///
/// @see
/// https://developer.apple.com/documentation/quartzcore/optimizing_promotion_refresh_rates_for_iphone_13_pro_and_ipad_pro#3885321
///
extern NSString* const kCADisableMinimumFrameDurationOnPhoneKey;
@interface DisplayLinkManager : NSObject @interface DisplayLinkManager : NSObject
// Whether the max refresh rate on iPhone Pro-motion devices are enabled. //------------------------------------------------------------------------------
// This reflects the value of `CADisableMinimumFrameDurationOnPhone` in the /// @brief Whether the max refresh rate on iPhone ProMotion devices are enabled. This reflects
// info.plist file. /// the value of `CADisableMinimumFrameDurationOnPhone` in the info.plist file. On iPads
// /// that support ProMotion, the max refresh rate is always enabled.
// Note on iPads that support Pro-motion, the max refresh rate is always enabled. ///
/// @return YES if the max refresh rate on ProMotion devices is enabled.
///
@property(class, nonatomic, readonly) BOOL maxRefreshRateEnabledOnIPhone; @property(class, nonatomic, readonly) BOOL maxRefreshRateEnabledOnIPhone;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

4
engine/src/flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
View File

@ -18,6 +18,8 @@
FLUTTER_ASSERT_ARC FLUTTER_ASSERT_ARC
NSString* const kCADisableMinimumFrameDurationOnPhoneKey = @"CADisableMinimumFrameDurationOnPhone";
@interface VSyncClient () @interface VSyncClient ()
@property(nonatomic, assign, readonly) double refreshRate; @property(nonatomic, assign, readonly) double refreshRate;
@end @end
@ -170,7 +172,7 @@ double VsyncWaiterIOS::GetRefreshRate() const {
} }
+ (BOOL)maxRefreshRateEnabledOnIPhone { + (BOOL)maxRefreshRateEnabledOnIPhone {
return [[NSBundle.mainBundle objectForInfoDictionaryKey:@"CADisableMinimumFrameDurationOnPhone"] return [[NSBundle.mainBundle objectForInfoDictionaryKey:kCADisableMinimumFrameDurationOnPhoneKey]
boolValue]; boolValue];
} }