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

Commit 3162aaa

Browse files
authored
Migrate FlutterViewController to ARC (#55669)
Migrates `FlutterViewController` from manual reference counting to ARC. Eliminates use of scoped_nsobject and scoped_nsprotocol, and migrates ivars to property syntax where possible. No semantic changes, therefore no changes to tests. Issue: flutter/flutter#137801 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent b7c3af4 commit 3162aaa

File tree

3 files changed

+401
-372
lines changed

3 files changed

+401
-372
lines changed

shell/platform/darwin/ios/BUILD.gn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ source_set("flutter_framework_source_arc") {
105105
"framework/Source/FlutterUndoManagerPlugin.mm",
106106
"framework/Source/FlutterView.h",
107107
"framework/Source/FlutterView.mm",
108+
"framework/Source/FlutterViewController.mm",
109+
"framework/Source/FlutterViewController_Internal.h",
108110
"framework/Source/FlutterViewResponder.h",
109111
"framework/Source/KeyCodeMap.g.mm",
110112
"framework/Source/KeyCodeMap_Internal.h",
@@ -175,6 +177,7 @@ source_set("flutter_framework_source_arc") {
175177
"//flutter/shell/platform/darwin/graphics",
176178
"//flutter/shell/platform/embedder:embedder_as_internal_library",
177179
"//flutter/shell/profiling:profiling",
180+
"//flutter/third_party/spring_animation",
178181
]
179182
}
180183

@@ -189,8 +192,6 @@ source_set("flutter_framework_source") {
189192
# iOS embedder is migrating to ARC.
190193
# New files are highly encouraged to be in ARC.
191194
# To add new files in ARC, add them to the `flutter_framework_source_arc` target.
192-
"framework/Source/FlutterViewController.mm",
193-
"framework/Source/FlutterViewController_Internal.h",
194195
"platform_view_ios.h",
195196
"platform_view_ios.mm",
196197
]
@@ -210,7 +211,6 @@ source_set("flutter_framework_source") {
210211
"//flutter/shell/platform/darwin/common:framework_common",
211212
"//flutter/shell/platform/embedder:embedder_as_internal_library",
212213
"//flutter/shell/profiling:profiling",
213-
"//flutter/third_party/spring_animation",
214214
]
215215

216216
public_configs = [

0 commit comments

Comments
 (0)