Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (220500 => 220501)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2017-08-10 00:42:24 UTC (rev 220500)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2017-08-10 01:07:09 UTC (rev 220501)
@@ -3383,7 +3383,7 @@
51F060DD1654317500F3282C /* WebRTCResolverMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebRTCResolverMessageReceiver.cpp; sourceTree = "<group>"; };
51F060DD1654317500F3282E /* NetworkRTCProviderMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkRTCProviderMessageReceiver.cpp; sourceTree = "<group>"; };
51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebResourceLoaderMessages.h; sourceTree = "<group>"; };
- 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Databases.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+ 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Storage.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Storage.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
51F886A31F2C214A00C193EF /* WKTestingSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKTestingSupport.cpp; sourceTree = "<group>"; };
51F886A41F2C214A00C193EF /* WKTestingSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKTestingSupport.h; sourceTree = "<group>"; };
51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleDOMWindowExtension.h; sourceTree = "<group>"; };
@@ -4503,10 +4503,10 @@
034768DFFF38A50411DB9C8B /* Products */ = {
isa = PBXGroup;
children = (
- 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */,
BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */,
BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.xpc */,
BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */,
+ 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Storage.xpc */,
BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */,
1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */,
510031F61379CACB00C8DFE4 /* SecItemShim.dylib */,
@@ -4765,6 +4765,7 @@
1A4F976A100E7B6600637A18 /* Base.xcconfig */,
5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */,
BCACC40D16B0B7BE00B6E092 /* BaseXPCService.xcconfig */,
+ A7BD9863194653D400D35698 /* Databases-iOS.entitlements */,
1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */,
1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */,
7C0BB9A918DCDF5A0006C086 /* Network-iOS.entitlements */,
@@ -4776,7 +4777,6 @@
37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */,
A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
5183B3931379F85C00E8754E /* Shim.xcconfig */,
- A7BD9863194653D400D35698 /* Databases-iOS.entitlements */,
51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */,
1A4F976E100E7B6600637A18 /* Version.xcconfig */,
7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */,
@@ -5961,11 +5961,11 @@
2DA944BB188511DD00ED86DB /* ios */,
510CC7DC16138E2900D03ED3 /* mac */,
413075971DE84ED70039EC69 /* webrtc */,
- 46DF06391F3905E5001980BB /* NetworkCORSPreflightChecker.cpp */,
- 46DF063A1F3905E5001980BB /* NetworkCORSPreflightChecker.h */,
513A16491630A9BF005D7D22 /* NetworkConnectionToWebProcess.cpp */,
513A164A1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h */,
513A164B1630A9BF005D7D22 /* NetworkConnectionToWebProcess.messages.in */,
+ 46DF06391F3905E5001980BB /* NetworkCORSPreflightChecker.cpp */,
+ 46DF063A1F3905E5001980BB /* NetworkCORSPreflightChecker.h */,
532159511DBAE6FC0054AA3C /* NetworkDataTask.cpp */,
5CBC9B891C6524A500A8FDCF /* NetworkDataTask.h */,
539EB5461DC2EE40009D48CF /* NetworkDataTaskBlob.cpp */,
@@ -8483,6 +8483,7 @@
5302583C1DCBBD2200DA89C2 /* NetworkCaptureResource.h in Headers */,
513A164D1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h in Headers */,
51DD9F2916367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h in Headers */,
+ 46DF063C1F3905F8001980BB /* NetworkCORSPreflightChecker.h in Headers */,
5CBC9B8E1C652CA000A8FDCF /* NetworkDataTask.h in Headers */,
53BA47D11DC2EF5E004DF4AD /* NetworkDataTaskBlob.h in Headers */,
532159561DBAE72D0054AA3C /* NetworkDataTaskCocoa.h in Headers */,
@@ -8587,7 +8588,6 @@
1AF1AC6C1651759E00C17D7F /* RemoteLayerTreeTransaction.h in Headers */,
E1B78471163F24690007B692 /* RemoteNetworkingContext.h in Headers */,
1A5704FC1BE1751100874AF1 /* RemoteObjectInvocation.h in Headers */,
- 46DF063C1F3905F8001980BB /* NetworkCORSPreflightChecker.h in Headers */,
1AC1338018590AE400F3EC05 /* RemoteObjectRegistry.h in Headers */,
1AC1338618590C4600F3EC05 /* RemoteObjectRegistryMessages.h in Headers */,
0F594790187B3B3A00437857 /* RemoteScrollingCoordinator.h in Headers */,
@@ -9267,7 +9267,7 @@
);
name = Databases;
productName = Networking;
- productReference = 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */;
+ productReference = 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Storage.xpc */;
productType = "com.apple.product-type.xpc-service";
};
8DC2EF4F0486A6940098B216 /* WebKit */ = {
@@ -9732,7 +9732,7 @@
"$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Networking.xpc",
"$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.32.xpc",
"$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.64.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Databases.xpc",
+ "$(BUILT_PRODUCTS_DIR)/$(WK_STORAGE_SERVICE_PRODUCT_NAME).xpc",
);
name = "Copy XPC services for engineering builds";
outputPaths = (
@@ -9740,11 +9740,11 @@
"$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc",
"$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
"$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
- "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Databases.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/$(WK_STORAGE_SERVICE_PRODUCT_NAME).xpc",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PA
TH}/com.apple.WebKit.Plugin.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\nfi\n";
+ shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/${WK_STORAGE_SERVICE_PRODUCT_NAME}.xpc\" \"${XPC_SERVICES_PATH}/${WK_STORAGE_SERVICE_PRODUCT_NAME}.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${
XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\nfi\n";
};
C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
isa = PBXShellScriptBuildPhase;
@@ -9870,7 +9870,6 @@
BCEE966C112FAF57006BCC24 /* Attachment.cpp in Sources */,
E1A31735134CEA80007C9A4F /* AttributedString.mm in Sources */,
512F589612A8838800629530 /* AuthenticationChallengeProxy.cpp in Sources */,
- 46DF063B1F3905F8001980BB /* NetworkCORSPreflightChecker.cpp in Sources */,
512F589812A8838800629530 /* AuthenticationDecisionListener.cpp in Sources */,
518E8EF816B2091C00E91429 /* AuthenticationManager.cpp in Sources */,
518E8EFB16B2091C00E91429 /* AuthenticationManager.mac.mm in Sources */,
@@ -10034,6 +10033,7 @@
5302583B1DCBBD2200DA89C2 /* NetworkCaptureResource.cpp in Sources */,
513A164C1630A9BF005D7D22 /* NetworkConnectionToWebProcess.cpp in Sources */,
51DD9F2816367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp in Sources */,
+ 46DF063B1F3905F8001980BB /* NetworkCORSPreflightChecker.cpp in Sources */,
532159541DBAE71D0054AA3C /* NetworkDataTask.cpp in Sources */,
53BA47D01DC2EF5E004DF4AD /* NetworkDataTaskBlob.cpp in Sources */,
5CBC9B8D1C65279C00A8FDCF /* NetworkDataTaskCocoa.mm in Sources */,
@@ -10093,6 +10093,7 @@
2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */,
5C85C7881C3F23CE0061A4FA /* PendingDownload.cpp in Sources */,
832ED18B1E2FE157006BA64A /* PerActivityStateCPUUsageSampler.cpp in Sources */,
+ 462107D81F38DBDB00DD7810 /* PingLoad.cpp in Sources */,
0F5E200318E77051003EC3E5 /* PlatformCAAnimationRemote.mm in Sources */,
2DA049B3180CCCD300AAFA9E /* PlatformCALayerRemote.cpp in Sources */,
2D8710161828415D0018FA01 /* PlatformCALayerRemoteCustom.mm in Sources */,
@@ -10211,7 +10212,6 @@
51E35209180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm in Sources */,
51E35200180F5D0F00E53BE9 /* StorageToWebProcessConnection.cpp in Sources */,
5118E9AC1F295977003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp in Sources */,
- 462107D81F38DBDB00DD7810 /* PingLoad.cpp in Sources */,
1AE00D6B18327C1200087DD7 /* StringReference.cpp in Sources */,
296BD85E15019BC30071F424 /* StringUtilities.mm in Sources */,
1ZZ417EF12C00D87002BE67B /* TextCheckerCompletion.cpp in Sources */,