Bug 233045 – Rename ProcessLauncherMac.mm to ProcessLauncherCocoa.mm

• Component: WebKit2
• Status: RESOLVED FIXED

[Chris Dumez]

Rename ProcessLauncherMac.mm to ProcessLauncherDarwin.mm since this implementation is used by both macOS and iOS. I chose the Darwin naming (as opposed to the Cocoa one) because the implementation only relies on libXPC and Mach.

[Chris Dumez]

Created attachment 444070 [details]
Patch

[Brent Fulgham]

Comment on attachment 444070 [details]
Patch

Thank you for fixing this confusing naming. r=me!

[EWS]

Committed r285729 (244188@main): <https://commits.webkit.org/244188@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 444070 [details].

[Radar WebKit Bug Importer]

<rdar://problem/85347107>

[Darin Adler]

(In reply to Chris Dumez from comment #0)
> Rename ProcessLauncherMac.mm to ProcessLauncherDarwin.mm since this
> implementation is used by both macOS and iOS. I chose the Darwin naming (as
> opposed to the Cocoa one) because the implementation only relies on libXPC
> and Mach.

But still ".mm"? Seems like that relies on Objective-C, which we normally don’t require on non-Cocoa platforms.

[Chris Dumez]

(In reply to Darin Adler from comment #5)
> (In reply to Chris Dumez from comment #0)
> > Rename ProcessLauncherMac.mm to ProcessLauncherDarwin.mm since this
> > implementation is used by both macOS and iOS. I chose the Darwin naming (as
> > opposed to the Cocoa one) because the implementation only relies on libXPC
> > and Mach.
> 
> But still ".mm"? Seems like that relies on Objective-C, which we normally
> don’t require on non-Cocoa platforms.

Oh, I didn't realize we wanted cpp for Darwin files. I'll check if I can make it a cpp (or use Cocoa.mm naming).

[Chris Dumez]

(In reply to Chris Dumez from comment #6)
> (In reply to Darin Adler from comment #5)
> > (In reply to Chris Dumez from comment #0)
> > > Rename ProcessLauncherMac.mm to ProcessLauncherDarwin.mm since this
> > > implementation is used by both macOS and iOS. I chose the Darwin naming (as
> > > opposed to the Cocoa one) because the implementation only relies on libXPC
> > > and Mach.
> > 
> > But still ".mm"? Seems like that relies on Objective-C, which we normally
> > don’t require on non-Cocoa platforms.
> 
> Oh, I didn't realize we wanted cpp for Darwin files. I'll check if I can
> make it a cpp (or use Cocoa.mm naming).

Hmm, looks like I may need to use Cocoa.mm because of this line:
bool isWebKitDevelopmentBuild = ![[[[NSBundle bundleWithIdentifier:@"com.apple.WebKit"] bundlePath] stringByDeletingLastPathComponent] hasPrefix:systemDirectoryPath()];

[Darin Adler]

Makes sense. Certainly CFBundle and NSBundle are not part of Darwin. Anyway, no need for me to be super-nitpick-y about this.

[Chris Dumez]

Reopening for rename to Cocoa.mm

[Chris Dumez]

Reopening for rename to Cocoa.mm

[Chris Dumez]

Created attachment 444085 [details]
Patch

[Brent Fulgham]

Comment on attachment 444085 [details]
Patch

r=me

[EWS]

Committed r285737 (244196@main): <https://commits.webkit.org/244196@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 444085 [details].