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

Reland [ios] Refactor IOSSurface factory and unify surface creation #22016

Merged
fluttergithubbot merged 3 commits into from
Oct 29, 2020
Merged

Reland [ios] Refactor IOSSurface factory and unify surface creation #22016

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
004b2a5
Reland "[ios] Refactor IOSSurface factory and unify surface creation"
iskakaushik Oct 20, 2020
5fe7cca
Recreate platform view controller even if it exists
iskakaushik Oct 20, 2020
e4fbbb1
temporary fix for a memory leak
iskakaushik Oct 29, 2020
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
Prev Previous commit
temporary fix for a memory leak 
see: flutter/flutter#69305
  • Loading branch information
@iskakaushik
iskakaushik committed Oct 29, 2020
commit e4fbbb166adb8f8553066618b7d8429a11cde0a1
6 changes: 6 additions & 0 deletions shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,12 @@
for (UIView* sub_view in [flutter_view subviews]) {
[sub_view removeFromSuperview];
}
// See: https://github.com/flutter/flutter/issues/69305
for (auto it = touch_interceptors_.begin(); it != touch_interceptors_.end(); it++) {
FlutterTouchInterceptingView* view = it->second.get();
[view removeFromSuperview];
}
touch_interceptors_.clear();
views_.clear();
composition_order_.clear();
active_composition_order_.clear();
Expand Down
4 changes: 2 additions & 2 deletions testing/ios/IosUnitTests/IosUnitTests.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@
/* Begin XCBuildConfiguration section */
0D6AB6D022BB05E200EEE540 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 0D6AB73E22BD8F0200EEE540 /* FlutterEngineConfig.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down Expand Up @@ -391,6 +392,7 @@
};
0D6AB6D122BB05E200EEE540 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 0D6AB73E22BD8F0200EEE540 /* FlutterEngineConfig.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down Expand Up @@ -484,7 +486,6 @@
};
0D6AB6D622BB05E200EEE540 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 0D6AB73E22BD8F0200EEE540 /* FlutterEngineConfig.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
Expand Down Expand Up @@ -528,7 +529,6 @@
};
0D6AB6D722BB05E200EEE540 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 0D6AB73E22BD8F0200EEE540 /* FlutterEngineConfig.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
Expand Down
7 changes: 7 additions & 0 deletions testing/ios/IosUnitTests/IosUnitTests.xcodeproj/xcshareddata/xcschemes/IosUnitTests.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
systemAttachmentLifetime = "keepNever">
<AdditionalOptions>
<AdditionalOption
key = "MallocStackLogging"
value = ""
isEnabled = "YES">
</AdditionalOption>
</AdditionalOptions>
<Testables>
<TestableReference
skipped = "NO">
Expand Down