Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[macOS] Fix FlutterViewController retain cycle #42317

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ void OnKeyboardLayoutChanged(CFNotificationCenterRef center,

@implementation FlutterViewWrapper {
FlutterView* _flutterView;
FlutterViewController* _controller;
__weak FlutterViewController* _controller;
}

- (instancetype)initWithFlutterView:(FlutterView*)view
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ - (bool)testViewWillAppearCalledMultipleTimes;
- (bool)testFlutterViewIsConfigured;
- (bool)testLookupKeyAssets;
- (bool)testLookupKeyAssetsWithPackage;
- (bool)testViewControllerIsReleased;

+ (void)respondFalseForSendEvent:(const FlutterKeyEvent&)event
callback:(nullable FlutterKeyEventCallback)callback
Expand Down Expand Up @@ -251,6 +252,10 @@ id MockGestureEvent(NSEventType type, NSEventPhase phase, double magnification,
ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testLookupKeyAssetsWithPackage]);
}

TEST(FlutterViewControllerTest, testViewControllerIsReleased) {
ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testViewControllerIsReleased]);
}

} // namespace flutter::testing

#pragma mark - FlutterViewControllerTestObjC
Expand Down Expand Up @@ -1016,4 +1021,24 @@ - (bool)testModifierKeysAreSynthesizedOnMouseMove {
return true;
}

- (bool)testViewControllerIsReleased {
__weak FlutterViewController* weakController;
@autoreleasepool {
id engineMock = flutter::testing::CreateMockFlutterEngine(@"");

FlutterRenderer* renderer_ = [[FlutterRenderer alloc] initWithFlutterEngine:engineMock];
OCMStub([engineMock renderer]).andReturn(renderer_);

FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
nibName:@""
bundle:nil];
[viewController loadView];
weakController = viewController;
}

EXPECT_EQ(weakController, nil);

return true;
}

@end