Title: [284661] trunk/Source/WebKit
- Revision
- 284661
- Author
- [email protected]
- Date
- 2021-10-21 17:46:35 -0700 (Thu, 21 Oct 2021)
Log Message
Unreviewed, reverting r284570.
No longer needed
Reverted changeset:
"Remove com.apple.webkit.adattributiond.plist from build
temporarily"
https://bugs.webkit.org/show_bug.cgi?id=232045
https://commits.webkit.org/r284570
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (284660 => 284661)
--- trunk/Source/WebKit/ChangeLog 2021-10-22 00:46:04 UTC (rev 284660)
+++ trunk/Source/WebKit/ChangeLog 2021-10-22 00:46:35 UTC (rev 284661)
@@ -1,3 +1,16 @@
+2021-10-21 Alex Christensen <[email protected]>
+
+ Unreviewed, reverting r284570.
+
+ No longer needed
+
+ Reverted changeset:
+
+ "Remove com.apple.webkit.adattributiond.plist from build
+ temporarily"
+ https://bugs.webkit.org/show_bug.cgi?id=232045
+ https://commits.webkit.org/r284570
+
2021-10-21 Chris Dumez <[email protected]>
Call to [NSURL URLByAppendingPathComponent:] under NetworkSessionCocoa() may be inefficient
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp (284660 => 284661)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp 2021-10-22 00:46:04 UTC (rev 284660)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp 2021-10-22 00:46:35 UTC (rev 284661)
@@ -51,6 +51,9 @@
#if ENABLE(ARKIT_INLINE_PREVIEW)
setModelElementCacheDirectory(WebsiteDataStore::defaultModelElementCacheDirectory());
#endif
+#if PLATFORM(IOS)
+ setPCMMachServiceName("com.apple.webkit.adattributiond.service");
+#endif
}
}
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (284660 => 284661)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-10-22 00:46:04 UTC (rev 284660)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-10-22 00:46:35 UTC (rev 284661)
@@ -14582,7 +14582,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "echo \"not copying adattributiond plist\"\n";
+ shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == iphoneos ]]; then\n DAEMON_PLIST_SOURCE=\"${SRCROOT}/Shared/EntryPointUtilities/Cocoa/Daemon/com.apple.webkit.adattributiond.plist\"\n DAEMON_PLIST_DESTINATION=\"${DSTROOT}/System/Library/LaunchDaemons/com.apple.webkit.adattributiond.plist\"\n echo \"copying adattributiond plist\"\n echo plutil -convert binary1 -o \"${DAEMON_PLIST_DESTINATION}\" \"${DAEMON_PLIST_SOURCE}\"\n plutil -convert binary1 -o \"${DAEMON_PLIST_DESTINATION}\" \"${DAEMON_PLIST_SOURCE}\"\nelse\n echo \"not copying adattributiond plist\"\nfi\n";
};
E1AC2E2C20F7B95800B0897D /* Unlock Keychain */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
