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

Commit 234e4a1

Browse files
author
George Wright
committed
Review updates
1 parent 14ea073 commit 234e4a1

2 files changed

Lines changed: 8 additions & 20 deletions

File tree

shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ @implementation FlutterDartProject {
1616
NSBundle* _dartBundle;
1717
NSString* _assetsPath;
1818
NSString* _ICUDataPath;
19-
NSArray* _entrypointArguments;
2019
}
2120

2221
- (instancetype)init {
@@ -28,10 +27,10 @@ - (instancetype)initWithPrecompiledDartBundle:(NSBundle*)bundle {
2827
NSAssert(self, @"Super init cannot be nil");
2928

3029
_dartBundle = bundle ?: [NSBundle bundleWithIdentifier:kAppBundleIdentifier];
31-
_entrypointArguments = [[NSProcessInfo processInfo] arguments];
30+
_dartEntrypointArguments = [[NSProcessInfo processInfo] arguments];
3231
// Remove the first element as it's the binary name
33-
_entrypointArguments =
34-
[_entrypointArguments subarrayWithRange:NSMakeRange(1, _entrypointArguments.count - 1)];
32+
_dartEntrypointArguments = [_dartEntrypointArguments
33+
subarrayWithRange:NSMakeRange(1, _dartEntrypointArguments.count - 1)];
3534
return self;
3635
}
3736

@@ -82,12 +81,4 @@ - (NSString*)ICUDataPath {
8281
return arguments;
8382
}
8483

85-
- (void)setDartEntrypointArguments:(NSArray*)arguments {
86-
_entrypointArguments = arguments;
87-
}
88-
89-
- (NSArray*)dartEntrypointArguments {
90-
return _entrypointArguments;
91-
}
92-
9384
@end

shell/platform/darwin/macos/framework/Source/FlutterEngine.mm

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,9 @@ - (BOOL)runWithEntrypoint:(NSString*)entrypoint {
264264
std::transform(switches.begin(), switches.end(), std::back_inserter(argv),
265265
[](const std::string& arg) -> const char* { return arg.c_str(); });
266266

267-
NSArray* entrypointArguments = [_project dartEntrypointArguments];
268-
NSEnumerator* enumerator = [entrypointArguments objectEnumerator];
269-
NSString* argument;
270-
std::vector<const char*> dart_entrypoint_args;
271-
while (argument = [enumerator nextObject]) {
272-
dart_entrypoint_args.push_back([argument UTF8String]);
267+
std::vector<const char*> dartEntrypointArgs;
268+
for (NSString* argument in [_project dartEntrypointArguments]) {
269+
dartEntrypointArgs.push_back([argument UTF8String]);
273270
}
274271

275272
FlutterProjectArgs flutterArguments = {};
@@ -281,8 +278,8 @@ - (BOOL)runWithEntrypoint:(NSString*)entrypoint {
281278
flutterArguments.platform_message_callback = (FlutterPlatformMessageCallback)OnPlatformMessage;
282279
flutterArguments.custom_dart_entrypoint = entrypoint.UTF8String;
283280
flutterArguments.shutdown_dart_vm_when_done = true;
284-
flutterArguments.dart_entrypoint_argc = dart_entrypoint_args.size();
285-
flutterArguments.dart_entrypoint_argv = dart_entrypoint_args.data();
281+
flutterArguments.dart_entrypoint_argc = dartEntrypointArgs.size();
282+
flutterArguments.dart_entrypoint_argv = dartEntrypointArgs.data();
286283

287284
static size_t sTaskRunnerIdentifiers = 0;
288285
const FlutterTaskRunnerDescription cocoa_task_runner_description = {

0 commit comments

Comments
 (0)