Changeset 295287 in webkit

Timestamp:

Jun 6, 2022, 8:22:21 AM (4 years ago)

Author:

pvollan@apple.com

Message:

Eagerly soft link Data Detection frameworks
​https://bugs.webkit.org/show_bug.cgi?id=241267

Reviewed by Geoffrey Garen.

Eagerly soft link Data Detection frameworks in the WebContent process. There are two motivations behind this change.
First, soft linking frameworks may lead to communication with launchd. Doing the soft linking before the WebContent
process has finished launching, will help our effort in blocking launchd post launch. Second, the data detection
frameworks are normally used in every WebContent process, and eagerly soft linking them should be a performance
improvement. Ideally, these frameworks should be hard linked or weak linked. However, that would most likely create
cycles in the build dependencies.

• Source/WebCore/PAL/pal/cocoa/DataDetectorsCoreSoftLink.h:
• Source/WebCore/PAL/pal/cocoa/DataDetectorsCoreSoftLink.mm:
• Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::softlinkDataDetectorsFrameworks):
(WebKit::WebProcess::platformInitializeWebProcess):

Canonical link: ​https://commits.webkit.org/251333@main

Location:

trunk/Source

Files:

• WebCore/PAL/pal/cocoa/DataDetectorsCoreSoftLink.h (modified) (1 diff)
• WebCore/PAL/pal/cocoa/DataDetectorsCoreSoftLink.mm (modified) (1 diff)
• WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (3 diffs)

trunk/Source/WebCore/PAL/pal/cocoa/DataDetectorsCoreSoftLink.h

@@ -30 +30 @@
 #include <pal/spi/cocoa/DataDetectorsCoreSPI.h>
 #include <wtf/SoftLinking.h>
+
+SOFT_LINK_FRAMEWORK_FOR_HEADER(PAL, DataDetectorsCore);
 
 SOFT_LINK_CLASS_FOR_HEADER(PAL, DDScannerResult)

trunk/Source/WebCore/PAL/pal/cocoa/DataDetectorsCoreSoftLink.mm

@@ -31 +31 @@
 #include <wtf/SoftLinking.h>
 
-SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE(PAL, DataDetectorsCore)
+SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE_WITH_EXPORT(PAL, DataDetectorsCore, PAL_EXPORT)
 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, DataDetectorsCore, DDScannerResult, PAL_EXPORT)
 

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -155 +155 @@
 #endif
 
+#if ENABLE(DATA_DETECTION) && PLATFORM(IOS_FAMILY)
+#import <pal/spi/ios/DataDetectorsUISPI.h>
+#endif
+
 #import <WebCore/MediaAccessibilitySoftLink.h>
 #import <pal/cf/AudioToolboxSoftLink.h>
@@ -224 +228 @@
 }
 #endif
+
+static void softlinkDataDetectorsFrameworks()
+{
+#if ENABLE(DATA_DETECTION)
+    PAL::isDataDetectorsCoreFrameworkAvailable();
+#if PLATFORM(IOS_FAMILY)
+    DataDetectorsUILibrary();
+#endif // PLATFORM(IOS_FAMILY)
+#endif // ENABLE(DATA_DETECTION)
+}
 
 void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
@@ -419 +433 @@
     if (!isParentProcessAFullWebBrowser(*this))
         disableURLSchemeCheckInDataDetectors();
+
+    // Soft link frameworks related to Data Detection before we disconnect from launchd because these frameworks connect to
+    // launchd temporarily at link time to register XPC services. See rdar://93598951 (my feature request to stop doing that)
+    softlinkDataDetectorsFrameworks();
 }