Title: [265571] branches/safari-610.1.25.1-branch/Source/WebKit
- Revision
- 265571
- Author
- alanc...@apple.com
- Date
- 2020-08-12 15:41:32 -0700 (Wed, 12 Aug 2020)
Log Message
Cherry-pick r265427. rdar://problem/66932337
Add required entitlement for Catalyst
https://bugs.webkit.org/show_bug.cgi?id=215244
Reviewed by Darin Adler.
The entitlement 'com.apple.private.webkit.use-xpc-endpoint' should be added to the WebContent process on Catalyst as well,
since it is needed on all Apple platforms. This entitlement is needed to support direct XPC communication between WebKit
processes, which is used to send the Launch Services database to the WebContent process from the Networking process. Also,
add some more logging related to this, to detect if it takes a long time for the WebContent process to receive the database.
* Scripts/process-entitlements.sh:
* WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
(WebKit::WebPage::platformDidReceiveLoadParameters):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265427 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.25.1-branch/Source/WebKit/ChangeLog (265570 => 265571)
--- branches/safari-610.1.25.1-branch/Source/WebKit/ChangeLog 2020-08-12 22:40:06 UTC (rev 265570)
+++ branches/safari-610.1.25.1-branch/Source/WebKit/ChangeLog 2020-08-12 22:41:32 UTC (rev 265571)
@@ -1,3 +1,40 @@
+2020-08-12 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r265427. rdar://problem/66932337
+
+ Add required entitlement for Catalyst
+ https://bugs.webkit.org/show_bug.cgi?id=215244
+
+ Reviewed by Darin Adler.
+
+ The entitlement 'com.apple.private.webkit.use-xpc-endpoint' should be added to the WebContent process on Catalyst as well,
+ since it is needed on all Apple platforms. This entitlement is needed to support direct XPC communication between WebKit
+ processes, which is used to send the Launch Services database to the WebContent process from the Networking process. Also,
+ add some more logging related to this, to detect if it takes a long time for the WebContent process to receive the database.
+
+ * Scripts/process-entitlements.sh:
+ * WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
+ (WebKit::WebPage::platformDidReceiveLoadParameters):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265427 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-08-10 Per Arne Vollan <pvol...@apple.com>
+
+ Add required entitlement for Catalyst
+ https://bugs.webkit.org/show_bug.cgi?id=215244
+
+ Reviewed by Darin Adler.
+
+ The entitlement 'com.apple.private.webkit.use-xpc-endpoint' should be added to the WebContent process on Catalyst as well,
+ since it is needed on all Apple platforms. This entitlement is needed to support direct XPC communication between WebKit
+ processes, which is used to send the Launch Services database to the WebContent process from the Networking process. Also,
+ add some more logging related to this, to detect if it takes a long time for the WebContent process to receive the database.
+
+ * Scripts/process-entitlements.sh:
+ * WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
+ (WebKit::WebPage::platformDidReceiveLoadParameters):
+
2020-08-05 Russell Epstein <repst...@apple.com>
Revert r265115. rdar://problem/66552761
Modified: branches/safari-610.1.25.1-branch/Source/WebKit/Scripts/process-entitlements.sh (265570 => 265571)
--- branches/safari-610.1.25.1-branch/Source/WebKit/Scripts/process-entitlements.sh 2020-08-12 22:40:06 UTC (rev 265570)
+++ branches/safari-610.1.25.1-branch/Source/WebKit/Scripts/process-entitlements.sh 2020-08-12 22:41:32 UTC (rev 265571)
@@ -104,6 +104,7 @@
{
plistbuddy Add :com.apple.security.cs.allow-jit bool YES
plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES
+ plistbuddy Add :com.apple.private.webkit.use-xpc-endpoint bool YES
if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 110000 ))
then
plistbuddy Add :com.apple.pac.shared_region_id string WebContent
@@ -122,6 +123,7 @@
plistbuddy Add :com.apple.private.network.socket-delegate bool YES
plistbuddy Add :com.apple.security.network.client bool YES
plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES
+ plistbuddy Add :com.apple.private.webkit.use-xpc-endpoint bool YES
plistbuddy Add :com.apple.private.tcc.manager.check-by-audit-token array
plistbuddy Add :com.apple.private.tcc.manager.check-by-audit-token:0 string kTCCServiceWebKitIntelligentTrackingPrevention
Modified: branches/safari-610.1.25.1-branch/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm (265570 => 265571)
--- branches/safari-610.1.25.1-branch/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm 2020-08-12 22:40:06 UTC (rev 265570)
+++ branches/safari-610.1.25.1-branch/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm 2020-08-12 22:41:32 UTC (rev 265571)
@@ -65,10 +65,14 @@
void WebPage::platformDidReceiveLoadParameters(const LoadParameters& parameters)
{
#if HAVE(LSDATABASECONTEXT)
- bool databaseUpdated = LaunchServicesDatabaseManager::singleton().waitForDatabaseUpdate(5_s);
+ auto startTime = WallTime::now();
+ bool databaseUpdated = LaunchServicesDatabaseManager::singleton().waitForDatabaseUpdate(1_s);
+ auto elapsedTime = WallTime::now() - startTime;
+ if (elapsedTime.value() > 0.5)
+ RELEASE_LOG(Loading, "Waiting for Launch Services database update took %f seconds", elapsedTime.value());
ASSERT_UNUSED(databaseUpdated, databaseUpdated);
if (!databaseUpdated)
- WTFLogAlways("Timed out waiting for Launch Services database update.");
+ RELEASE_LOG_ERROR(Loading, "Timed out waiting for Launch Services database update.");
#endif
m_dataDetectionContext = parameters.dataDetectionContext;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
