Diff
Modified: trunk/Source/WebKit2/ChangeLog (140635 => 140636)
--- trunk/Source/WebKit2/ChangeLog 2013-01-24 03:24:32 UTC (rev 140635)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-24 03:30:45 UTC (rev 140636)
@@ -1,3 +1,31 @@
+2013-01-23 Sam Weinig <[email protected]>
+
+ Cleanup the names of the WebKit2 xpc services
+ https://bugs.webkit.org/show_bug.cgi?id=107759
+
+ Reviewed by Anders Carlsson.
+
+ Renames:
+ com.apple.WebKit2.WebProcessService -> com.apple.WebKit.WebContent
+ com.apple.WebKit2.WebProcessServiceForWebKitDevelopment -> com.apple.WebKit.WebContent.Development
+
+ * Configurations/BaseXPCService.xcconfig: Copied from Source/WebKit2/Configurations/WebProcessService.xcconfig.
+ * Configurations/WebContentService.xcconfig: Copied from Source/WebKit2/Configurations/WebProcessService.xcconfig.
+ * Configurations/WebContentServiceForDevelopment.xcconfig: Copied from Source/WebKit2/Configurations/WebProcessServiceForWebKitDevelopment.xcconfig.
+ * Configurations/WebProcessService.xcconfig: Removed.
+ * Configurations/WebProcessServiceForWebKitDevelopment.xcconfig: Removed.
+ Rename config files to match new service names and add base config.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::connectToWebProcessServiceForWebKitDevelopment):
+ (WebKit::createWebProcessServiceForWebKitDevelopment):
+ (WebKit::createWebProcessService):
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebKit2Service: Removed.
+ * WebProcessService/Info.plist:
+ * WebProcessServiceForWebKitDevelopment/Info.plist:
+ Update for new names.
+
2013-01-23 Seulgi Kim <[email protected]>
Coordinated Graphics : Reduce the number of calls to Functional and number of IPC messages by sending the created/deleted layers in a vector.
Copied: trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig (from rev 140567, trunk/Source/WebKit2/Configurations/WebProcessService.xcconfig) (0 => 140636)
--- trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig (rev 0)
+++ trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2013-01-24 03:30:45 UTC (rev 140636)
@@ -0,0 +1,39 @@
+// Copyright (C) 2012, 2013 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"
+
+GCC_ENABLE_OBJC_GC = NO;
+PRODUCT_NAME = com.apple.WebKit.$(TARGET_NAME:rfc1034identifier);
+INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
+
+APP_ICON = $(APP_ICON_$(CONFIGURATION));
+APP_ICON_Debug = WebKit.icns;
+APP_ICON_Release = WebKit.icns;
+APP_ICON_Production = ;
+
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
+EXCLUDED_SOURCE_FILE_NAMES_Production = WebKit.icns;
+
+WRAPPER_EXTENSION = xpc;
+MACH_O_TYPE = mh_execute;
Copied: trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig (from rev 140567, trunk/Source/WebKit2/Configurations/WebProcessServiceForWebKitDevelopment.xcconfig) (0 => 140636)
--- trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig (rev 0)
+++ trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2013-01-24 03:30:45 UTC (rev 140636)
@@ -0,0 +1,27 @@
+// Copyright (C) 2012, 2013 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 "BaseXPCService.xcconfig"
+
+PRODUCT_NAME = com.apple.WebKit.WebContent.Development;
+INFOPLIST_FILE = WebProcessServiceForWebKitDevelopment/Info.plist;
Copied: trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (from rev 140567, trunk/Source/WebKit2/Configurations/WebProcessService.xcconfig) (0 => 140636)
--- trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (rev 0)
+++ trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2013-01-24 03:30:45 UTC (rev 140636)
@@ -0,0 +1,27 @@
+// Copyright (C) 2012, 2013 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 "BaseXPCService.xcconfig"
+
+PRODUCT_NAME = com.apple.WebKit.WebContent;
+INFOPLIST_FILE = WebProcessService/Info.plist;
Deleted: trunk/Source/WebKit2/Configurations/WebProcessService.xcconfig (140635 => 140636)
--- trunk/Source/WebKit2/Configurations/WebProcessService.xcconfig 2013-01-24 03:24:32 UTC (rev 140635)
+++ trunk/Source/WebKit2/Configurations/WebProcessService.xcconfig 2013-01-24 03:30:45 UTC (rev 140636)
@@ -1,40 +0,0 @@
-// Copyright (C) 2012 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"
-
-GCC_ENABLE_OBJC_GC = NO;
-PRODUCT_NAME = com.apple.WebKit2.$(TARGET_NAME:rfc1034identifier);
-INFOPLIST_FILE = WebProcessService/Info.plist;
-INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
-
-APP_ICON = $(APP_ICON_$(CONFIGURATION));
-APP_ICON_Debug = WebKit.icns;
-APP_ICON_Release = WebKit.icns;
-APP_ICON_Production = ;
-
-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
-EXCLUDED_SOURCE_FILE_NAMES_Production = WebKit.icns;
-
-WRAPPER_EXTENSION = xpc;
-MACH_O_TYPE = mh_execute;
Deleted: trunk/Source/WebKit2/Configurations/WebProcessServiceForWebKitDevelopment.xcconfig (140635 => 140636)
--- trunk/Source/WebKit2/Configurations/WebProcessServiceForWebKitDevelopment.xcconfig 2013-01-24 03:24:32 UTC (rev 140635)
+++ trunk/Source/WebKit2/Configurations/WebProcessServiceForWebKitDevelopment.xcconfig 2013-01-24 03:30:45 UTC (rev 140636)
@@ -1,26 +0,0 @@
-// Copyright (C) 2012 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 "WebProcessService.xcconfig"
-
-INFOPLIST_FILE = WebProcessServiceForWebKitDevelopment/Info.plist;
Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (140635 => 140636)
--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2013-01-24 03:24:32 UTC (rev 140635)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2013-01-24 03:30:45 UTC (rev 140636)
@@ -145,7 +145,7 @@
static void connectToWebProcessServiceForWebKitDevelopment(const ProcessLauncher::LaunchOptions&, ProcessLauncher* that, DidFinishLaunchingProcessFunction didFinishLaunchingProcessFunction, UUIDHolder* instanceUUID)
{
// Create a connection to the WebKit2 XPC service.
- xpc_connection_t connection = xpc_connection_create("com.apple.WebKit2.WebProcessServiceForWebKitDevelopment", 0);
+ xpc_connection_t connection = xpc_connection_create("com.apple.WebKit.WebContent.Development", 0);
xpc_connection_set_instance(connection, instanceUUID->uuid);
// XPC requires having an event handler, even if it is not used.
@@ -208,7 +208,7 @@
// FIXME: This UUID should be stored on the WebProcessProxy.
RefPtr<UUIDHolder> instanceUUID = UUIDHolder::create();
- xpc_connection_t reExecConnection = xpc_connection_create("com.apple.WebKit2.WebProcessServiceForWebKitDevelopment", 0);
+ xpc_connection_t reExecConnection = xpc_connection_create("com.apple.WebKit.WebContent.Development", 0);
xpc_connection_set_instance(reExecConnection, instanceUUID->uuid);
// Keep the ProcessLauncher alive while we do the re-execing (balanced in event handler).
@@ -261,7 +261,7 @@
RefPtr<UUIDHolder> instanceUUID = UUIDHolder::create();
// Create a connection to the WebKit2 XPC service.
- xpc_connection_t connection = xpc_connection_create("com.apple.WebKit2.WebProcessService", 0);
+ xpc_connection_t connection = xpc_connection_create("com.apple.WebKit.WebContent", 0);
xpc_connection_set_instance(connection, instanceUUID->uuid);
// XPC requires having an event handler, even if it is not used.
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (140635 => 140636)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-24 03:24:32 UTC (rev 140635)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-24 03:30:45 UTC (rev 140636)
@@ -1985,7 +1985,7 @@
BC33E0D012408E8600360F3F /* InjectedBundleRangeHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleRangeHandle.cpp; sourceTree = "<group>"; };
BC39C4331626366F008BC689 /* WKDOMRange.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKDOMRange.mm; sourceTree = "<group>"; };
BC39C4341626366F008BC689 /* WKDOMRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMRange.h; sourceTree = "<group>"; };
- BC3DE46615A91763008D26FC /* com.apple.WebKit2.WebProcessService.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit2.WebProcessService.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+ BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.WebContent.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
BC3DE46815A91763008D26FC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
BC4075D7124FF0270068F20A /* WKArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKArray.cpp; sourceTree = "<group>"; };
BC4075D8124FF0270068F20A /* WKArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKArray.h; sourceTree = "<group>"; };
@@ -2141,12 +2141,13 @@
BCA8C6A711E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageLoaderClient.h; sourceTree = "<group>"; };
BCA8C6AD11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageUIClient.cpp; sourceTree = "<group>"; };
BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageUIClient.h; sourceTree = "<group>"; };
- BCA8D46A15BCE160009DC1F1 /* WebProcessService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebProcessService.xcconfig; sourceTree = "<group>"; };
BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseManagerProxyClient.h; sourceTree = "<group>"; };
BCAC111E12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDatabaseManagerProxyClient.cpp; sourceTree = "<group>"; };
- BCAE9DE9160C097400A33217 /* com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+ BCACC40D16B0B7BE00B6E092 /* BaseXPCService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BaseXPCService.xcconfig; sourceTree = "<group>"; };
+ BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebContentService.xcconfig; sourceTree = "<group>"; };
+ BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebContentService.Development.xcconfig; sourceTree = "<group>"; };
+ BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContentForDevelopment.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.WebContentForDevelopment.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
BCAE9DEF160C097500A33217 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- BCAE9E00160C0B4100A33217 /* WebProcessServiceForWebKitDevelopment.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebProcessServiceForWebKitDevelopment.xcconfig; sourceTree = "<group>"; };
BCAE9E01160C12DA00A33217 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = WebProcessService/Info.plist; sourceTree = "<group>"; };
BCAE9E04160C137800A33217 /* WebProcessServiceForWebKitDevelopmentMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessServiceForWebKitDevelopmentMain.mm; sourceTree = "<group>"; };
BCAE9E06160C139A00A33217 /* WebProcessServiceMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebProcessServiceMain.mm; path = WebProcessService/WebProcessServiceMain.mm; sourceTree = "<group>"; };
@@ -2485,8 +2486,8 @@
034768DFFF38A50411DB9C8B /* Products */ = {
isa = PBXGroup;
children = (
- BC3DE46615A91763008D26FC /* com.apple.WebKit2.WebProcessService.xpc */,
- BCAE9DE9160C097400A33217 /* com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc */,
+ BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */,
+ BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContentForDevelopment.xpc */,
510CC80E1613C79900D03ED3 /* NetworkProcess.app */,
BCDE094213272496001259FB /* PluginProcess.app */,
1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */,
@@ -2641,6 +2642,7 @@
children = (
1A4F976A100E7B6600637A18 /* Base.xcconfig */,
5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */,
+ BCACC40D16B0B7BE00B6E092 /* BaseXPCService.xcconfig */,
1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */,
1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */,
510CC8461613C7C600D03ED3 /* NetworkProcess.xcconfig */,
@@ -2648,10 +2650,10 @@
E13A8A4B16287A1B00392929 /* SharedWorkerProcess.xcconfig */,
5183B3931379F85C00E8754E /* Shim.xcconfig */,
1A4F976E100E7B6600637A18 /* Version.xcconfig */,
+ BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */,
+ BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */,
BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */,
5DAD7294116FF70B00EE5396 /* WebProcess.xcconfig */,
- BCA8D46A15BCE160009DC1F1 /* WebProcessService.xcconfig */,
- BCAE9E00160C0B4100A33217 /* WebProcessServiceForWebKitDevelopment.xcconfig */,
);
path = Configurations;
sourceTree = "<group>";
@@ -5162,9 +5164,9 @@
productReference = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */;
productType = "com.apple.product-type.framework";
};
- BC3DE46515A91763008D26FC /* WebProcessService */ = {
+ BC3DE46515A91763008D26FC /* WebContent */ = {
isa = PBXNativeTarget;
- buildConfigurationList = BC3DE47615A91764008D26FC /* Build configuration list for PBXNativeTarget "WebProcessService" */;
+ buildConfigurationList = BC3DE47615A91764008D26FC /* Build configuration list for PBXNativeTarget "WebContent" */;
buildPhases = (
BC3DE46215A91763008D26FC /* Sources */,
BCDC308D15FDB99A006B6695 /* Frameworks */,
@@ -5174,14 +5176,14 @@
);
dependencies = (
);
- name = WebProcessService;
+ name = WebContent;
productName = WebKit2Service;
- productReference = BC3DE46615A91763008D26FC /* com.apple.WebKit2.WebProcessService.xpc */;
+ productReference = BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */;
productType = "com.apple.product-type.bundle";
};
- BCAE9DE8160C097400A33217 /* WebProcessServiceForWebKitDevelopment */ = {
+ BCAE9DE8160C097400A33217 /* WebContent.Development */ = {
isa = PBXNativeTarget;
- buildConfigurationList = BCAE9DF6160C097500A33217 /* Build configuration list for PBXNativeTarget "WebProcessServiceForWebKitDevelopment" */;
+ buildConfigurationList = BCAE9DF6160C097500A33217 /* Build configuration list for PBXNativeTarget "WebContent.Development" */;
buildPhases = (
BCAE9DE5160C097400A33217 /* Sources */,
BCAE9DE6160C097400A33217 /* Frameworks */,
@@ -5191,9 +5193,9 @@
);
dependencies = (
);
- name = WebProcessServiceForWebKitDevelopment;
+ name = WebContent.Development;
productName = WebProcessServiceForWebKitDevelopment;
- productReference = BCAE9DE9160C097400A33217 /* com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc */;
+ productReference = BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContentForDevelopment.xpc */;
productType = "com.apple.product-type.bundle";
};
BCDE093313272496001259FB /* PluginProcess */ = {
@@ -5267,8 +5269,8 @@
C0CE72851247E66800BC0EC4 /* Derived Sources */,
1AC25FAF12A48EA700BD2671 /* PluginProcessShim */,
510031EA1379CACB00C8DFE4 /* SecItemShim */,
- BC3DE46515A91763008D26FC /* WebProcessService */,
- BCAE9DE8160C097400A33217 /* WebProcessServiceForWebKitDevelopment */,
+ BC3DE46515A91763008D26FC /* WebContent */,
+ BCAE9DE8160C097400A33217 /* WebContent.Development */,
);
};
/* End PBXProject section */
@@ -5444,17 +5446,17 @@
files = (
);
inputPaths = (
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit2.WebProcessService.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc",
+ "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.WebContent.xpc",
+ "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.WebContent.Development.xpc",
);
name = "Copy XPC services for engineering builds";
outputPaths = (
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices/com.apple.WebKit2.WebProcessService.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices/com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices/com.apple.WebKit.WebContent.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices/com.apple.WebKit.WebContent.Development.xpc",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nXPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices\"\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit2.WebProcessService.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit2.WebProcessService.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc\"\n";
+ shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nXPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices\"\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.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\n";
};
C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
isa = PBXShellScriptBuildPhase;
@@ -6107,12 +6109,12 @@
};
BCA8D46815BCE0D6009DC1F1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = BC3DE46515A91763008D26FC /* WebProcessService */;
+ target = BC3DE46515A91763008D26FC /* WebContent */;
targetProxy = BCA8D46715BCE0D6009DC1F1 /* PBXContainerItemProxy */;
};
BCAE9DFD160C0AB000A33217 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = BCAE9DE8160C097400A33217 /* WebProcessServiceForWebKitDevelopment */;
+ target = BCAE9DE8160C097400A33217 /* WebContent.Development */;
targetProxy = BCAE9DFC160C0AB000A33217 /* PBXContainerItemProxy */;
};
BCDE093413272496001259FB /* PBXTargetDependency */ = {
@@ -6337,42 +6339,42 @@
};
BC3DE47315A91764008D26FC /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BCA8D46A15BCE160009DC1F1 /* WebProcessService.xcconfig */;
+ baseConfigurationReference = BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */;
buildSettings = {
};
name = Debug;
};
BC3DE47415A91764008D26FC /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BCA8D46A15BCE160009DC1F1 /* WebProcessService.xcconfig */;
+ baseConfigurationReference = BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */;
buildSettings = {
};
name = Release;
};
BC3DE47515A91764008D26FC /* Production */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BCA8D46A15BCE160009DC1F1 /* WebProcessService.xcconfig */;
+ baseConfigurationReference = BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */;
buildSettings = {
};
name = Production;
};
BCAE9DF7160C097500A33217 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BCAE9E00160C0B4100A33217 /* WebProcessServiceForWebKitDevelopment.xcconfig */;
+ baseConfigurationReference = BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */;
buildSettings = {
};
name = Debug;
};
BCAE9DF8160C097500A33217 /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BCAE9E00160C0B4100A33217 /* WebProcessServiceForWebKitDevelopment.xcconfig */;
+ baseConfigurationReference = BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */;
buildSettings = {
};
name = Release;
};
BCAE9DF9160C097500A33217 /* Production */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BCAE9E00160C0B4100A33217 /* WebProcessServiceForWebKitDevelopment.xcconfig */;
+ baseConfigurationReference = BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */;
buildSettings = {
};
name = Production;
@@ -6521,7 +6523,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
- BC3DE47615A91764008D26FC /* Build configuration list for PBXNativeTarget "WebProcessService" */ = {
+ BC3DE47615A91764008D26FC /* Build configuration list for PBXNativeTarget "WebContent" */ = {
isa = XCConfigurationList;
buildConfigurations = (
BC3DE47315A91764008D26FC /* Debug */,
@@ -6531,7 +6533,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
- BCAE9DF6160C097500A33217 /* Build configuration list for PBXNativeTarget "WebProcessServiceForWebKitDevelopment" */ = {
+ BCAE9DF6160C097500A33217 /* Build configuration list for PBXNativeTarget "WebContent.Development" */ = {
isa = XCConfigurationList;
buildConfigurations = (
BCAE9DF7160C097500A33217 /* Debug */,
Modified: trunk/Source/WebKit2/WebProcessService/Info.plist (140635 => 140636)
--- trunk/Source/WebKit2/WebProcessService/Info.plist 2013-01-24 03:24:32 UTC (rev 140635)
+++ trunk/Source/WebKit2/WebProcessService/Info.plist 2013-01-24 03:30:45 UTC (rev 140636)
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
- <string>com.apple.WebKit2.WebProcessService</string>
+ <string>com.apple.WebKit.WebContent</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Modified: trunk/Source/WebKit2/WebProcessServiceForWebKitDevelopment/Info.plist (140635 => 140636)
--- trunk/Source/WebKit2/WebProcessServiceForWebKitDevelopment/Info.plist 2013-01-24 03:24:32 UTC (rev 140635)
+++ trunk/Source/WebKit2/WebProcessServiceForWebKitDevelopment/Info.plist 2013-01-24 03:30:45 UTC (rev 140636)
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
- <string>com.apple.WebKit2.WebProcessServiceForWebKitDevelopment</string>
+ <string>com.apple.WebKit.WebContent.Development</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
