Diff
Modified: trunk/Source/WebKit/ChangeLog (282882 => 282883)
--- trunk/Source/WebKit/ChangeLog 2021-09-22 20:04:19 UTC (rev 282882)
+++ trunk/Source/WebKit/ChangeLog 2021-09-22 21:05:52 UTC (rev 282883)
@@ -1,3 +1,17 @@
+2021-09-22 Alex Christensen <achristen...@webkit.org>
+
+ Move PCMDaemon to WebKit.framework and rename it to AdAttributionDaemon
+ https://bugs.webkit.org/show_bug.cgi?id=230516
+
+ Reviewed by Brent Fulgham.
+
+ Also, open iOS NetworkProcess's sandbox to allow connecting to it.
+
+ * Configurations/AdAttributionDaemon.xcconfig: Renamed from Tools/TestWebKitAPI/Configurations/TestPCMDaemon.xcconfig.
+ * Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb:
+ * Shared/EntryPointUtilities/Cocoa/Daemon/AdAttributionDaemon.c: Renamed from Tools/TestWebKitAPI/cocoa/TestPCMDaemonMain.c.
+ * WebKit.xcodeproj/project.pbxproj:
+
2021-09-22 Chris Dumez <cdu...@apple.com>
Drop makeRef() and use Ref { } instead
Copied: trunk/Source/WebKit/Configurations/AdAttributionDaemon.xcconfig (from rev 282882, trunk/Tools/TestWebKitAPI/Configurations/TestPCMDaemon.xcconfig) (0 => 282883)
--- trunk/Source/WebKit/Configurations/AdAttributionDaemon.xcconfig (rev 0)
+++ trunk/Source/WebKit/Configurations/AdAttributionDaemon.xcconfig 2021-09-22 21:05:52 UTC (rev 282883)
@@ -0,0 +1,32 @@
+// Copyright (C) 2021 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "BaseTarget.xcconfig"
+
+PRODUCT_NAME = AdAttributionDaemon;
+
+OTHER_LDFLAGS = -framework WebKit;
+FRAMEWORK_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR);
+
+INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
+INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Daemons;
Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb (282882 => 282883)
--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb 2021-09-22 20:04:19 UTC (rev 282882)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb 2021-09-22 21:05:52 UTC (rev 282883)
@@ -686,6 +686,8 @@
(literal "/dev/dtracehelper"))
)
+(allow mach-lookup (global-name "com.apple.webkit.adattributiond.service"))
+
;; Access to MobileGestalt
(allow mach-lookup
(global-name "com.apple.mobilegestalt.xpc"))
Copied: trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/AdAttributionDaemon.c (from rev 282882, trunk/Tools/TestWebKitAPI/cocoa/TestPCMDaemonMain.c) (0 => 282883)
--- trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/AdAttributionDaemon.c (rev 0)
+++ trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/AdAttributionDaemon.c 2021-09-22 21:05:52 UTC (rev 282883)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <os/availability.h>
+#include <WebKit/WKMain.h>
+
+int main(int argc, const char** argv)
+{
+ WKPCMDaemonMain(argc, argv);
+}
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (282882 => 282883)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-09-22 20:04:19 UTC (rev 282882)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-09-22 21:05:52 UTC (rev 282883)
@@ -14,6 +14,7 @@
BCFFCA8A160D6DEA003DF315 /* Add XPCServices symlink */,
);
dependencies = (
+ 5CAF7AA926F93F9F0003F19E /* PBXTargetDependency */,
5742A2FA2535619D00B7BA14 /* PBXTargetDependency */,
BCA8D46815BCE0D6009DC1F1 /* PBXTargetDependency */,
372EBB492017E6CF00085064 /* PBXTargetDependency */,
@@ -1285,6 +1286,7 @@
5CABDC8622C40FDE001EDE8E /* WKMessageListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
5CABDC8722C40FED001EDE8E /* APIMessageListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CABDC8322C40FA7001EDE8E /* APIMessageListener.h */; };
5CADDE05215046BD0067D309 /* WKWebProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C74300E21500492004BFA17 /* WKWebProcess.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 5CAF7AA726F93AB00003F19E /* AdAttributionDaemon.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CAF7AA526F93A950003F19E /* AdAttributionDaemon.c */; };
5CAFDE452130846300B1F7E1 /* _WKInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE422130843500B1F7E1 /* _WKInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE442130843600B1F7E1 /* _WKInspectorInternal.h */; };
5CB6AE442609799C00B6ED5A /* ReasonSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB6AE432609799C00B6ED5A /* ReasonSPI.h */; };
@@ -2182,6 +2184,20 @@
remoteGlobalIDString = 5742A2E52535613F00B7BA14;
remoteInfo = WebAuthentication;
};
+ 5CAF7A9B26F93A750003F19E /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = E1AC2E2720F7B94C00B0897D;
+ remoteInfo = "Unlock Keychain";
+ };
+ 5CAF7AA826F93F9F0003F19E /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 5CAF7A9926F93A750003F19E;
+ remoteInfo = PCMDaemon;
+ };
A15797402582AE7300528236 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -2245,6 +2261,13 @@
remoteGlobalIDString = CD95493426159004008372D9;
remoteInfo = WebKitSwift;
};
+ DFEE369926FAD112007C78E0 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+ remoteInfo = WebKit;
+ };
E1AC2E2D20F7B98800B0897D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -4546,6 +4569,9 @@
5CABDC8422C40FCC001EDE8E /* WKMessageListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKMessageListener.cpp; sourceTree = "<group>"; };
5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMessageListener.h; sourceTree = "<group>"; };
5CADDE0D2151AA010067D309 /* AuthenticationChallengeDisposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeDisposition.h; sourceTree = "<group>"; };
+ 5CAF7AA426F93A750003F19E /* AdAttributionDaemon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = AdAttributionDaemon; sourceTree = BUILT_PRODUCTS_DIR; };
+ 5CAF7AA526F93A950003F19E /* AdAttributionDaemon.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = AdAttributionDaemon.c; sourceTree = "<group>"; };
+ 5CAF7AA626F93AA50003F19E /* AdAttributionDaemon.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AdAttributionDaemon.xcconfig; sourceTree = "<group>"; };
5CAFDE422130843500B1F7E1 /* _WKInspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKInspector.h; sourceTree = "<group>"; };
5CAFDE432130843600B1F7E1 /* _WKInspector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKInspector.mm; sourceTree = "<group>"; };
5CAFDE442130843600B1F7E1 /* _WKInspectorInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKInspectorInternal.h; sourceTree = "<group>"; };
@@ -4593,8 +4619,8 @@
5CD2864E1E722F440094FDC8 /* WKContentRuleListStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKContentRuleListStore.mm; sourceTree = "<group>"; };
5CD2864F1E722F440094FDC8 /* WKContentRuleListStoreInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentRuleListStoreInternal.h; sourceTree = "<group>"; };
5CD286501E722F440094FDC8 /* WKContentRuleListStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentRuleListStorePrivate.h; sourceTree = "<group>"; };
+ 5CD748B523C8EB190092A999 /* WebURLSchemeHandlerIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURLSchemeHandlerIdentifier.h; sourceTree = "<group>"; };
5CD748B523C8EB190092A9B5 /* NetworkResourceLoadIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkResourceLoadIdentifier.h; sourceTree = "<group>"; };
- 5CD748B523C8EB190092A999 /* WebURLSchemeHandlerIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURLSchemeHandlerIdentifier.h; sourceTree = "<group>"; };
5CE0C366229F2D3D003695F0 /* APIContextMenuElementInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIContextMenuElementInfo.cpp; sourceTree = "<group>"; };
5CE0C367229F2D3E003695F0 /* APIContextMenuElementInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIContextMenuElementInfo.h; sourceTree = "<group>"; };
5CE0C368229F2D4A003695F0 /* WKContextMenuElementInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKContextMenuElementInfo.mm; sourceTree = "<group>"; };
@@ -6149,6 +6175,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 5CAF7A9F26F93A750003F19E /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
8DC2EF560486A6940098B216 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -6209,6 +6242,7 @@
034768DFFF38A50411DB9C8B /* Products */ = {
isa = PBXGroup;
children = (
+ 5CAF7AA426F93A750003F19E /* AdAttributionDaemon */,
2D9FB228237523830049F936 /* com.apple.WebKit.GPU.xpc */,
BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */,
BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */,
@@ -6644,6 +6678,7 @@
1A4F9769100E7B6600637A18 /* Configurations */ = {
isa = PBXGroup;
children = (
+ 5CAF7AA626F93AA50003F19E /* AdAttributionDaemon.xcconfig */,
A1EDD2D91884ACE000BBFE98 /* All.xcconfig */,
1A4F976A100E7B6600637A18 /* Base.xcconfig */,
5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */,
@@ -9414,6 +9449,7 @@
5CB9310326E8375B0032B1C0 /* Daemon */ = {
isa = PBXGroup;
children = (
+ 5CAF7AA526F93A950003F19E /* AdAttributionDaemon.c */,
5CB9310426E837FC0032B1C0 /* PCMDaemonEntryPoint.h */,
5CB9310526E837FD0032B1C0 /* PCMDaemonEntryPoint.mm */,
);
@@ -11858,6 +11894,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 5CAF7A9C26F93A750003F19E /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
8DC2EF500486A6940098B216 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@@ -13394,6 +13437,25 @@
productReference = 5742A2F72535613F00B7BA14 /* com.apple.WebKit.WebAuthn.xpc */;
productType = "com.apple.product-type.xpc-service";
};
+ 5CAF7A9926F93A750003F19E /* AdAttributionDaemon */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 5CAF7AA026F93A750003F19E /* Build configuration list for PBXNativeTarget "AdAttributionDaemon" */;
+ buildPhases = (
+ 5CAF7A9C26F93A750003F19E /* Headers */,
+ 5CAF7A9D26F93A750003F19E /* Sources */,
+ 5CAF7A9F26F93A750003F19E /* Frameworks */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ DFEE369A26FAD112007C78E0 /* PBXTargetDependency */,
+ 5CAF7A9A26F93A750003F19E /* PBXTargetDependency */,
+ );
+ name = AdAttributionDaemon;
+ productName = PluginProcessShim;
+ productReference = 5CAF7AA426F93A750003F19E /* AdAttributionDaemon */;
+ productType = "com.apple.product-type.tool";
+ };
8DC2EF4F0486A6940098B216 /* WebKit */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit" */;
@@ -13604,6 +13666,7 @@
E1AC2E2720F7B94C00B0897D /* Unlock Keychain */,
5325BDCD21DFF47700A0DEE1 /* Apply Configuration to XCFileLists */,
942DB232257EE6D4009BD80A /* EmptyDSTROOT */,
+ 5CAF7A9926F93A750003F19E /* AdAttributionDaemon */,
);
};
/* End PBXProject section */
@@ -14279,6 +14342,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 5CAF7A9D26F93A750003F19E /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 5CAF7AA726F93AB00003F19E /* AdAttributionDaemon.c in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
8DC2EF540486A6940098B216 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -14848,6 +14919,16 @@
target = 5742A2E52535613F00B7BA14 /* WebAuthn */;
targetProxy = 5742A2F92535619D00B7BA14 /* PBXContainerItemProxy */;
};
+ 5CAF7A9A26F93A750003F19E /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = E1AC2E2720F7B94C00B0897D /* Unlock Keychain */;
+ targetProxy = 5CAF7A9B26F93A750003F19E /* PBXContainerItemProxy */;
+ };
+ 5CAF7AA926F93F9F0003F19E /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 5CAF7A9926F93A750003F19E /* AdAttributionDaemon */;
+ targetProxy = 5CAF7AA826F93F9F0003F19E /* PBXContainerItemProxy */;
+ };
A15797412582AE7300528236 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 8DC2EF4F0486A6940098B216 /* WebKit */;
@@ -14893,6 +14974,11 @@
target = CD95493426159004008372D9 /* WebKitSwift */;
targetProxy = CD0C36DC2639D3B4004E35D8 /* PBXContainerItemProxy */;
};
+ DFEE369A26FAD112007C78E0 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 8DC2EF4F0486A6940098B216 /* WebKit */;
+ targetProxy = DFEE369926FAD112007C78E0 /* PBXContainerItemProxy */;
+ };
E1AC2E2E20F7B98800B0897D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E1AC2E2720F7B94C00B0897D /* Unlock Keychain */;
@@ -15122,6 +15208,33 @@
};
name = Production;
};
+ 5CAF7AA126F93A750003F19E /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 5CAF7AA626F93AA50003F19E /* AdAttributionDaemon.xcconfig */;
+ buildSettings = {
+ OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Debug;
+ };
+ 5CAF7AA226F93A750003F19E /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 5CAF7AA626F93AA50003F19E /* AdAttributionDaemon.xcconfig */;
+ buildSettings = {
+ OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Release;
+ };
+ 5CAF7AA326F93A750003F19E /* Production */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 5CAF7AA626F93AA50003F19E /* AdAttributionDaemon.xcconfig */;
+ buildSettings = {
+ OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Production;
+ };
5D22D69B11A7534600BF30E5 /* Production */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1A4F976A100E7B6600637A18 /* Base.xcconfig */;
@@ -15464,6 +15577,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
+ 5CAF7AA026F93A750003F19E /* Build configuration list for PBXNativeTarget "AdAttributionDaemon" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 5CAF7AA126F93A750003F19E /* Debug */,
+ 5CAF7AA226F93A750003F19E /* Release */,
+ 5CAF7AA326F93A750003F19E /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
942DB236257EE6D4009BD80A /* Build configuration list for PBXAggregateTarget "EmptyDSTROOT" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Modified: trunk/Tools/ChangeLog (282882 => 282883)
--- trunk/Tools/ChangeLog 2021-09-22 20:04:19 UTC (rev 282882)
+++ trunk/Tools/ChangeLog 2021-09-22 21:05:52 UTC (rev 282883)
@@ -1,3 +1,14 @@
+2021-09-22 Alex Christensen <achristen...@webkit.org>
+
+ Move PCMDaemon to WebKit.framework and rename it to AdAttributionDaemon
+ https://bugs.webkit.org/show_bug.cgi?id=230516
+
+ Reviewed by Brent Fulgham.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:
+ (TestWebKitAPI::testPCMDaemonLocation):
+
2021-09-22 Brady Eidson <beid...@apple.com>
Disable FTP.
Deleted: trunk/Tools/TestWebKitAPI/Configurations/TestPCMDaemon.xcconfig (282882 => 282883)
--- trunk/Tools/TestWebKitAPI/Configurations/TestPCMDaemon.xcconfig 2021-09-22 20:04:19 UTC (rev 282882)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestPCMDaemon.xcconfig 2021-09-22 21:05:52 UTC (rev 282883)
@@ -1,27 +0,0 @@
-// Copyright (C) 2021 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRODUCT_NAME = TestPCMDaemon;
-
-OTHER_LDFLAGS = -framework WebKit;
-FRAMEWORK_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR);
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (282882 => 282883)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2021-09-22 20:04:19 UTC (rev 282882)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2021-09-22 21:05:52 UTC (rev 282883)
@@ -36,7 +36,6 @@
537CF84822EFD72000C6EBB3 /* Check .xcfilelists */,
);
dependencies = (
- 5C1B1D1C26EC2EEC00882DA2 /* PBXTargetDependency */,
7C83E0301D0A5E1B00FEBCF3 /* PBXTargetDependency */,
7C83E0321D0A5E1D00FEBCF3 /* PBXTargetDependency */,
);
@@ -482,7 +481,6 @@
5C121E8D2410704900486F9B /* ContentWorldPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C121E8C2410703200486F9B /* ContentWorldPlugIn.mm */; };
5C16F8FC230C94370074C4A8 /* TextSize.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C16F8FB230C942B0074C4A8 /* TextSize.mm */; };
5C19A5241FD0F60100EEA323 /* CookiePrivateBrowsing.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C19A5231FD0F32600EEA323 /* CookiePrivateBrowsing.mm */; };
- 5C1B1D1726EC27DE00882DA2 /* TestPCMDaemonMain.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C1B1D1626EC27C500882DA2 /* TestPCMDaemonMain.c */; };
5C23DF0B2246015800F454B6 /* Challenge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C23DF0A2245C9D700F454B6 /* Challenge.mm */; };
5C2936931D5BF70D00DEAB1E /* CookieAcceptPolicy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C2936911D5BF63E00DEAB1E /* CookieAcceptPolicy.mm */; };
5C2936961D5C00ED00DEAB1E /* CookieMessage.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5C2936941D5BFD1900DEAB1E /* CookieMessage.html */; };
@@ -1304,13 +1302,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 5C1B1D1B26EC2EEC00882DA2 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 5C1B1D0826EC278500882DA2;
- remoteInfo = TestPCMDaemon;
- };
5C9D922122D7DC84008E9266 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
@@ -2348,9 +2339,6 @@
5C121E8C2410703200486F9B /* ContentWorldPlugIn.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ContentWorldPlugIn.mm; sourceTree = "<group>"; };
5C16F8FB230C942B0074C4A8 /* TextSize.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextSize.mm; sourceTree = "<group>"; };
5C19A5231FD0F32600EEA323 /* CookiePrivateBrowsing.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CookiePrivateBrowsing.mm; sourceTree = "<group>"; };
- 5C1B1D1426EC278500882DA2 /* TestPCMDaemon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TestPCMDaemon; sourceTree = BUILT_PRODUCTS_DIR; };
- 5C1B1D1626EC27C500882DA2 /* TestPCMDaemonMain.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = TestPCMDaemonMain.c; path = cocoa/TestPCMDaemonMain.c; sourceTree = "<group>"; };
- 5C1B1D1A26EC284E00882DA2 /* TestPCMDaemon.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = TestPCMDaemon.xcconfig; sourceTree = "<group>"; };
5C23DF0A2245C9D700F454B6 /* Challenge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Challenge.mm; sourceTree = "<group>"; };
5C2936911D5BF63E00DEAB1E /* CookieAcceptPolicy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CookieAcceptPolicy.mm; sourceTree = "<group>"; };
5C2936941D5BFD1900DEAB1E /* CookieMessage.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = CookieMessage.html; sourceTree = "<group>"; };
@@ -3184,13 +3172,6 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
- 5C1B1D0E26EC278500882DA2 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
7C83DF641D0A590C00FEBCF3 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -3335,7 +3316,6 @@
5C72E8CE244FFCE400381EB7 /* TestLegacyDownloadDelegate.mm */,
2D1C04A51D76298B000A6816 /* TestNavigationDelegate.h */,
2D1C04A61D76298B000A6816 /* TestNavigationDelegate.mm */,
- 5C1B1D1626EC27C500882DA2 /* TestPCMDaemonMain.c */,
516281232325C17A00BB7E42 /* TestPDFDocument.h */,
516281242325C17B00BB7E42 /* TestPDFDocument.mm */,
A14FC58D1B8AE36500D107EB /* TestProtocol.h */,
@@ -3394,7 +3374,6 @@
1AB674ADFE9D54B511CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
- 5C1B1D1426EC278500882DA2 /* TestPCMDaemon */,
8DD76FA10486AA7600D96B5E /* TestWebKitAPI */,
7C83E0231D0A5AE400FEBCF3 /* TestWTF */,
BC575980126E74AF006F0F12 /* InjectedBundleTestWebKitAPI.bundle */,
@@ -4326,7 +4305,6 @@
BC90957F12554CF900083756 /* DebugRelease.xcconfig */,
BC575AE2126E88B1006F0F12 /* InjectedBundle.xcconfig */,
A1B89B99221E029F00EB4CEA /* SDKVariant.xcconfig */,
- 5C1B1D1A26EC284E00882DA2 /* TestPCMDaemon.xcconfig */,
5735F0251F3A4EA6000EE801 /* TestWebKitAPI-iOS.entitlements */,
51EB125324C66BCB000CB030 /* TestWebKitAPI-macOS-internal.entitlements */,
7AB0173923FB2BF0002F8366 /* TestWebKitAPI-macOS.entitlements */,
@@ -5016,23 +4994,6 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
- 5C1B1D0826EC278500882DA2 /* TestPCMDaemon */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 5C1B1D1126EC278500882DA2 /* Build configuration list for PBXNativeTarget "TestPCMDaemon" */;
- buildPhases = (
- 5C1B1D0B26EC278500882DA2 /* Sources */,
- 5C1B1D0E26EC278500882DA2 /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = TestPCMDaemon;
- productInstallPath = "$(HOME)/bin";
- productName = TestPCMDaemon;
- productReference = 5C1B1D1426EC278500882DA2 /* TestPCMDaemon */;
- productType = "com.apple.product-type.tool";
- };
7C83DE951D0A590C00FEBCF3 /* TestWTFLibrary */ = {
isa = PBXNativeTarget;
buildConfigurationList = 7C83DF651D0A590C00FEBCF3 /* Build configuration list for PBXNativeTarget "TestWTFLibrary" */;
@@ -5192,7 +5153,6 @@
BC57597F126E74AF006F0F12 /* InjectedBundleTestWebKitAPI */,
A13EBB481B87339E00097110 /* WebProcessPlugIn */,
537CF84322EFD64100C6EBB3 /* Apply Configuration to XCFileLists */,
- 5C1B1D0826EC278500882DA2 /* TestPCMDaemon */,
);
};
/* End PBXProject section */
@@ -5269,14 +5229,6 @@
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
- 5C1B1D0B26EC278500882DA2 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 5C1B1D1726EC27DE00882DA2 /* TestPCMDaemonMain.c in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
7C83DE961D0A590C00FEBCF3 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -6146,11 +6098,6 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- 5C1B1D1C26EC2EEC00882DA2 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 5C1B1D0826EC278500882DA2 /* TestPCMDaemon */;
- targetProxy = 5C1B1D1B26EC2EEC00882DA2 /* PBXContainerItemProxy */;
- };
5C9D922222D7DC84008E9266 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 5C9D921422D7DA02008E9266 /* Generate Unified Sources */;
@@ -6233,22 +6180,6 @@
};
name = Release;
};
- 5C1B1D1226EC278500882DA2 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 5C1B1D1A26EC284E00882DA2 /* TestPCMDaemon.xcconfig */;
- buildSettings = {
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Debug;
- };
- 5C1B1D1326EC278500882DA2 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 5C1B1D1A26EC284E00882DA2 /* TestPCMDaemon.xcconfig */;
- buildSettings = {
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Release;
- };
5C9D921A22D7DA02008E9266 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -6377,15 +6308,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 5C1B1D1126EC278500882DA2 /* Build configuration list for PBXNativeTarget "TestPCMDaemon" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 5C1B1D1226EC278500882DA2 /* Debug */,
- 5C1B1D1326EC278500882DA2 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
5C9D921922D7DA02008E9266 /* Build configuration list for PBXAggregateTarget "Generate Unified Sources" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm (282882 => 282883)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm 2021-09-22 20:04:19 UTC (rev 282882)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm 2021-09-22 21:05:52 UTC (rev 282883)
@@ -387,7 +387,7 @@
static RetainPtr<NSURL> testPCMDaemonLocation()
{
- return [currentExecutableDirectory() URLByAppendingPathComponent:@"TestPCMDaemon" isDirectory:NO];
+ return [currentExecutableDirectory() URLByAppendingPathComponent:@"AdAttributionDaemon" isDirectory:NO];
}
#if HAVE(OS_LAUNCHD_JOB)
Deleted: trunk/Tools/TestWebKitAPI/cocoa/TestPCMDaemonMain.c (282882 => 282883)
--- trunk/Tools/TestWebKitAPI/cocoa/TestPCMDaemonMain.c 2021-09-22 20:04:19 UTC (rev 282882)
+++ trunk/Tools/TestWebKitAPI/cocoa/TestPCMDaemonMain.c 2021-09-22 21:05:52 UTC (rev 282883)
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2021 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <os/availability.h>
-#include <WebKit/WKMain.h>
-
-int main(int argc, const char** argv)
-{
- WKPCMDaemonMain(argc, argv);
-}
