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

Commit 571fac4

Browse files
authored
fml: delete scoped_nsobject.h,mm (#56382)
fml::scoped_nsobject and fml::scoped_nsprotocol classes are no longer necessary now that the entire codebase has been migrated to ARC. This also eliminates the fml_arc_unittests target which tests that code. All references to that target in documentation, run_tests.py have been removed. This target was used in various `et` build/query unit tests and has been replaced with the fml_unittests target in those cases. Issue: flutter/flutter#137801
1 parent 80d3453 commit 571fac4

12 files changed

+10
-548
lines changed

BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ group("unittests") {
186186
"//flutter/display_list:display_list_rendertests",
187187
"//flutter/display_list:display_list_unittests",
188188
"//flutter/flow:flow_unittests",
189-
"//flutter/fml:fml_arc_unittests",
190189
"//flutter/fml:fml_unittests",
191190
"//flutter/lib/ui:ui_unittests",
192191
"//flutter/runtime:dart_plugin_registrant_unittests",

CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ $ ./run_tests.py --variant=host_debug_unopt_arm64 --type=engine
256256
| felt | n/a | The test runner for flutter web. See //lib/web_ui |
257257
| flow_unittests | engine | |
258258
| flutter_tester | dart | Launcher for engine dart tests. |
259-
| fml_arc_unittests | engine | |
260259
| fml_unittests | engine | Unit tests for //fml |
261260
| framework_common_unittests | engine(mac) | |
262261
| gpu_surface_metal_unittests | engine(mac) | |

ci/licenses_golden/excluded_files

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@
107107
../../../flutter/fml/message_loop_unittests.cc
108108
../../../flutter/fml/paths_unittests.cc
109109
../../../flutter/fml/platform/darwin/cf_utils_unittests.mm
110-
../../../flutter/fml/platform/darwin/scoped_nsobject_arc_unittests.mm
111-
../../../flutter/fml/platform/darwin/scoped_nsobject_unittests.mm
112110
../../../flutter/fml/platform/darwin/string_range_sanitization_unittests.mm
113111
../../../flutter/fml/platform/fuchsia/log_interest_listener_unittests.cc
114112
../../../flutter/fml/platform/win/file_win_unittests.cc

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42733,8 +42733,6 @@ ORIGIN: ../../../flutter/fml/platform/darwin/scoped_block.h + ../../../flutter/L
4273342733
ORIGIN: ../../../flutter/fml/platform/darwin/scoped_block.mm + ../../../flutter/LICENSE
4273442734
ORIGIN: ../../../flutter/fml/platform/darwin/scoped_nsautorelease_pool.cc + ../../../flutter/LICENSE
4273542735
ORIGIN: ../../../flutter/fml/platform/darwin/scoped_nsautorelease_pool.h + ../../../flutter/LICENSE
42736-
ORIGIN: ../../../flutter/fml/platform/darwin/scoped_nsobject.h + ../../../flutter/LICENSE
42737-
ORIGIN: ../../../flutter/fml/platform/darwin/scoped_nsobject.mm + ../../../flutter/LICENSE
4273842736
ORIGIN: ../../../flutter/fml/platform/darwin/scoped_policy.h + ../../../flutter/LICENSE
4273942737
ORIGIN: ../../../flutter/fml/platform/darwin/scoped_typeref.h + ../../../flutter/LICENSE
4274042738
ORIGIN: ../../../flutter/fml/platform/darwin/string_range_sanitization.h + ../../../flutter/LICENSE
@@ -45597,8 +45595,6 @@ FILE: ../../../flutter/fml/platform/darwin/scoped_block.h
4559745595
FILE: ../../../flutter/fml/platform/darwin/scoped_block.mm
4559845596
FILE: ../../../flutter/fml/platform/darwin/scoped_nsautorelease_pool.cc
4559945597
FILE: ../../../flutter/fml/platform/darwin/scoped_nsautorelease_pool.h
45600-
FILE: ../../../flutter/fml/platform/darwin/scoped_nsobject.h
45601-
FILE: ../../../flutter/fml/platform/darwin/scoped_nsobject.mm
4560245598
FILE: ../../../flutter/fml/platform/darwin/scoped_policy.h
4560345599
FILE: ../../../flutter/fml/platform/darwin/scoped_typeref.h
4560445600
FILE: ../../../flutter/fml/platform/darwin/string_range_sanitization.h

fml/BUILD.gn

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ source_set("fml") {
156156
"platform/darwin/scoped_block.mm",
157157
"platform/darwin/scoped_nsautorelease_pool.cc",
158158
"platform/darwin/scoped_nsautorelease_pool.h",
159-
"platform/darwin/scoped_nsobject.h",
160-
"platform/darwin/scoped_nsobject.mm",
161159
"platform/darwin/scoped_policy.h",
162160
"platform/darwin/scoped_typeref.h",
163161
"platform/darwin/string_range_sanitization.h",
@@ -374,10 +372,6 @@ if (enable_unittests) {
374372
]
375373
}
376374

377-
if (is_mac || is_ios) {
378-
sources += [ "platform/darwin/scoped_nsobject_unittests.mm" ]
379-
}
380-
381375
if (is_fuchsia) {
382376
sources += [ "platform/fuchsia/log_interest_listener_unittests.cc" ]
383377
}
@@ -408,18 +402,4 @@ if (enable_unittests) {
408402
libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
409403
}
410404
}
411-
412-
executable("fml_arc_unittests") {
413-
testonly = true
414-
if (is_mac || is_ios) {
415-
cflags_objcc = flutter_cflags_objc_arc
416-
sources = [ "platform/darwin/scoped_nsobject_arc_unittests.mm" ]
417-
}
418-
419-
deps = [
420-
":fml_fixtures",
421-
"//flutter/fml",
422-
"//flutter/testing",
423-
]
424-
}
425405
}

fml/platform/darwin/scoped_nsobject.h

Lines changed: 0 additions & 248 deletions
This file was deleted.

fml/platform/darwin/scoped_nsobject.mm

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)