-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Disable building XPC services when launching WebKit processes as extensions #22660
Disable building XPC services when launching WebKit processes as extensions #22660
Conversation
EWS run on previous version of this PR (hash bc62f0a) |
bc62f0a
to
5102752
Compare
EWS run on current version of this PR (hash 5102752) |
EWS run on previous version of this PR (hash 5102752) |
@@ -39,7 +39,9 @@ PROCESSED_INFOPLIST="${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}" | |||
UNPROCESSED_INFOPLIST="${INFOPLIST_FILE}" | |||
COPIED_INFOPLIST="${WEB_CONTENT_RESOURCES_PATH}/Info-WebContent.plist" | |||
echo "Copying Info.plist from ${UNPROCESSED_INFOPLIST} to ${COPIED_INFOPLIST}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should move this line inside the if block too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, good point, will fix.
Thanks for reviewing!
<string>com.apple.webkit.gpu.extension</string> | ||
<string>com.apple.web-browser-engine.gpu</string> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are these strings changing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think they were always wrong, and we used to have a post-build script that would fix them up.
// Fallback to legacy extension identifiers | ||
// This fallback is temporary and should be removed when possible. See rdar://120793705. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make this a FIXME to remove it.
@@ -25,6 +25,7 @@ | |||
|
|||
PRODUCT_NAME = com.apple.WebKit.GPU; | |||
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME); | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: delete these blank lines when you have a chance
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!
<string>com.apple.webkit.gpu.extension</string> | ||
<string>com.apple.web-browser-engine.gpu</string> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think they were always wrong, and we used to have a post-build script that would fix them up.
I think this is referring to behavior from reverted code. It might be best to just say that it adds a temporary fallback using the old extension bundle IDs, since they may be cached on the system. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Marking r- because we can't land this until we make internal changes to delete existing XPC services when installing roots. See #22643 (review) for my reasoning.
5102752
to
e3e8d35
Compare
EWS run on previous version of this PR (hash e3e8d35) |
e3e8d35
to
9c99841
Compare
EWS run on previous version of this PR (hash 9c99841) |
Has anything changed since my last review, or was this just a rebase? |
9c99841
to
e921936
Compare
EWS run on current version of this PR (hash e921936) |
EWS run on previous version of this PR (hash e921936) |
Fixed! |
e921936
to
3be115d
Compare
EWS run on previous version of this PR (hash 3be115d) |
Yes, I have verified that this patch is compatible with newer and older OS builds. |
3be115d
to
4d016d7
Compare
EWS run on current version of this PR (hash 4d016d7) |
EWS run on previous version of this PR (hash 4d016d7) |
4d016d7
to
9a3d7f9
Compare
EWS run on current version of this PR (hash 9a3d7f9) |
β¦nsions https://bugs.webkit.org/show_bug.cgi?id=267248 rdar://120677588 Reviewed by Elliot Williams, Brent Fulgham and Timothy Hatcher. Disable building XPC services when launching WebKit processes as extensions. Additonally, this patch is changing the bundle ID of the extensions to match the XPC service bundle IDs. This is to ensure that existing bundle ID checks will continue to work. Also disable fallback to XPC service launch, since these are not being built anymore. Instead, add a temporary fallback using the old extension bundle IDs, since they may be cached on the system. This patch is relanding https://commits.webkit.org/272887@main and https://commits.webkit.org/272868@main. * Source/WebKit/Configurations/BaseExtension.xcconfig: * Source/WebKit/Configurations/BaseXPCService.xcconfig: * Source/WebKit/Configurations/GPUExtension.xcconfig: * Source/WebKit/Configurations/GPUService.xcconfig: * Source/WebKit/Configurations/NetworkService.xcconfig: * Source/WebKit/Configurations/NetworkingExtension.xcconfig: * Source/WebKit/Configurations/WebContentCaptivePortalExtension.xcconfig: * Source/WebKit/Configurations/WebContentExtension.xcconfig: * Source/WebKit/Configurations/WebContentService.xcconfig: * Source/WebKit/UIProcess/Launcher/ProcessLauncher.h: (WebKit::ProcessLauncher::setIsRetryingLaunch): (WebKit::ProcessLauncher::isRetryingLaunch const): * Source/WebKit/UIProcess/Launcher/cocoa/ProcessLauncherCocoa.mm: (WebKit::serviceNameAndIdentifier): (WebKit::launchWithExtensionKit): (WebKit::ProcessLauncher::launchProcess): * Source/WebKit/WebKit.xcodeproj/project.pbxproj: Canonical link: https://commits.webkit.org/273113@main
9a3d7f9
to
a945ee0
Compare
Committed 273113@main (a945ee0): https://commits.webkit.org/273113@main Reviewed commits have been landed. Closing PR #22660 and removing active labels. |
a945ee0
9a3d7f9