DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[iOS] Fixes DisplayLinkManager leaks (#22194)

Browse Source
This commit is contained in:
Wu Zhong 2021-01-22 03:19:51 +08:00 committed by GitHub
parent 5cf3eaed11
commit fd9a079ac1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/platform/darwin/ios/framework/Source/FlutterEngine.mm
View File

@ -635,7 +635,7 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
}
- (void)initializeDisplays {
double refresh_rate = [[[DisplayLinkManager alloc] init] displayRefreshRate];
double refresh_rate = [DisplayLinkManager displayRefreshRate];
auto display = flutter::Display(refresh_rate);
_shell->OnDisplayUpdates(flutter::DisplayUpdateType::kStartup, {display});
}

4
shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h
View File

@ -12,8 +12,6 @@
@interface DisplayLinkManager : NSObject
- (instancetype)init;
//------------------------------------------------------------------------------
/// @brief The display refresh rate used for reporting purposes. The engine does not care
/// about this for frame scheduling. It is only used by tools for instrumentation. The
@ -23,7 +21,7 @@
///
/// @return The refresh rate in frames per second.
///
- (double)displayRefreshRate;
+ (double)displayRefreshRate;
@end

32
shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
View File

@ -91,26 +91,16 @@ void VsyncWaiterIOS::AwaitVSync() {
@end
@implementation DisplayLinkManager {
fml::scoped_nsobject<CADisplayLink> display_link_;
}
@implementation DisplayLinkManager
- (instancetype)init {
self = [super init];
if (self) {
display_link_ = fml::scoped_nsobject<CADisplayLink> {
[[CADisplayLink displayLinkWithTarget:self selector:@selector(onDisplayLink:)] retain]
};
display_link_.get().paused = YES;
}
return self;
}
- (double)displayRefreshRate {
+ (double)displayRefreshRate {
if (@available(iOS 10.3, *)) {
auto preferredFPS = display_link_.get().preferredFramesPerSecond; // iOS 10.0
fml::scoped_nsobject<CADisplayLink> display_link = fml::scoped_nsobject<CADisplayLink> {
[[CADisplayLink displayLinkWithTarget:[[DisplayLinkManager new] autorelease]
selector:@selector(onDisplayLink:)] retain]
};
display_link.get().paused = YES;
auto preferredFPS = display_link.get().preferredFramesPerSecond; // iOS 10.0
// From Docs:
// The default value for preferredFramesPerSecond is 0. When this value is 0, the preferred
@ -131,10 +121,4 @@ void VsyncWaiterIOS::AwaitVSync() {
// no-op.
}
- (void)dealloc {
[display_link_.get() invalidate];
[super dealloc];
}
@end