Diff
Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184277 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 07:02:48 UTC (rev 184277)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 07:04:38 UTC (rev 184278)
@@ -1,5 +1,57 @@
2015-05-13 Babak Shafiei <[email protected]>
+ Merge r184215.
+
+ 2015-05-12 Anders Carlsson <[email protected]>
+
+ Production builds should link against the shims directly
+ https://bugs.webkit.org/show_bug.cgi?id=144922
+ rdar://problem/19708579
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/NetworkService.xcconfig:
+ Point to an Info.plist that has DYLD_INSERT_LIBRARIES set on 10.10 and earlier.
+ Link directly against SecItemShim.dylib where possible.
+
+ * Configurations/PluginProcessShim.xcconfig:
+ Set the install name and install path.
+
+ * Configurations/PluginService.32.xcconfig:
+ Point to an Info.plist that has DYLD_INSERT_LIBRARIES set on 10.10 and earlier.
+ Link directly against PluginProcessShim.dylib where possible.
+
+ * Configurations/PluginService.64.xcconfig:
+ Point to an Info.plist that has DYLD_INSERT_LIBRARIES set on 10.10 and earlier.
+ Link directly against PluginProcessShim.dylib where possible.
+
+ * Configurations/SecItemShim.xcconfig:
+ Set the install name and install path.
+
+ * Configurations/WebContentService.xcconfig:
+ Point to an Info.plist that has DYLD_INSERT_LIBRARIES set on 10.10 and earlier.
+ Link directly against WebProcessShim.dylib where possible.
+
+ * Configurations/WebProcessShim.xcconfig:
+ Set the install name and install path.
+
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Copied from Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist.
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist:
+ Add an Info.plist for 10.9 and 10.10 and remove DYLD_INSERT_LIBRARIES from the non-legacy plist.
+
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Copied from Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist.
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist:
+ Add an Info.plist for 10.9 and 10.10 and remove DYLD_INSERT_LIBRARIES from the non-legacy plist.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add new files.
+
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Copied from Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist.
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist:
+ Add an Info.plist for 10.9 and 10.10 and remove DYLD_INSERT_LIBRARIES from the non-legacy plist.
+
+2015-05-13 Babak Shafiei <[email protected]>
+
Merge r184125.
2015-05-11 Anders Carlsson <[email protected]>
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Configurations/NetworkService.xcconfig (184277 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/Configurations/NetworkService.xcconfig 2015-05-13 07:02:48 UTC (rev 184277)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Configurations/NetworkService.xcconfig 2015-05-13 07:04:38 UTC (rev 184278)
@@ -28,5 +28,12 @@
PRODUCT_NAME = com.apple.WebKit.Networking;
INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
+INFOPLIST_FILE[sdk=macosx10.9*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist;
+INFOPLIST_FILE[sdk=macosx10.10*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist;
CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = Configurations/Network-iOS.entitlements;
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = ;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = ;
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Configurations/PluginProcessShim.xcconfig (184277 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/Configurations/PluginProcessShim.xcconfig 2015-05-13 07:02:48 UTC (rev 184277)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Configurations/PluginProcessShim.xcconfig 2015-05-13 07:04:38 UTC (rev 184278)
@@ -25,5 +25,8 @@
#include "Shim.xcconfig"
+INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;
+DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;
+
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit -framework Carbon -framework QuartzCore;
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Configurations/PluginService.32.xcconfig (184277 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-05-13 07:02:48 UTC (rev 184277)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-05-13 07:04:38 UTC (rev 184278)
@@ -31,9 +31,13 @@
PRODUCT_NAME = com.apple.WebKit.Plugin.32;
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
+INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
+INFOPLIST_FILE[sdk=macosx10.10] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Configurations/PluginService.64.xcconfig (184277 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-05-13 07:02:48 UTC (rev 184277)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-05-13 07:04:38 UTC (rev 184278)
@@ -31,9 +31,13 @@
PRODUCT_NAME = com.apple.WebKit.Plugin.64;
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
+INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
+INFOPLIST_FILE[sdk=macosx10.10] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Configurations/SecItemShim.xcconfig (184277 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/Configurations/SecItemShim.xcconfig 2015-05-13 07:02:48 UTC (rev 184277)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Configurations/SecItemShim.xcconfig 2015-05-13 07:04:38 UTC (rev 184278)
@@ -25,5 +25,8 @@
#include "Shim.xcconfig"
+INSTALL_PATH_ACTUAL[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;
+DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;
+
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Security;
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Configurations/WebContentService.xcconfig (184277 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/Configurations/WebContentService.xcconfig 2015-05-13 07:02:48 UTC (rev 184277)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Configurations/WebContentService.xcconfig 2015-05-13 07:04:38 UTC (rev 184278)
@@ -28,6 +28,8 @@
PRODUCT_NAME = com.apple.WebKit.WebContent;
INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
+INFOPLIST_FILE[sdk=macosx10.9*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist;
+INFOPLIST_FILE[sdk=macosx10.10*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist;
BUNDLE_LOCALIZATION_KEY[sdk=iphone*] = CFBundleFollowParentLocalization;
BUNDLE_LOCALIZATION_KEY = $(BUNDLE_LOCALIZATION_KEY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
@@ -38,4 +40,6 @@
CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/WebContent-iOS.entitlements;
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Configurations/WebProcessShim.xcconfig (184277 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/Configurations/WebProcessShim.xcconfig 2015-05-13 07:02:48 UTC (rev 184277)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Configurations/WebProcessShim.xcconfig 2015-05-13 07:04:38 UTC (rev 184278)
@@ -25,5 +25,8 @@
#include "Shim.xcconfig"
+INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;
+DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;
+
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework CoreServices -framework Security;
Copied: branches/safari-601.1.32-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist (from rev 184215, trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist) (0 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist (rev 0)
+++ branches/safari-601.1.32-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist 2015-05-13 07:04:38 UTC (rev 184278)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleGetInfoString</key>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2015 Apple Inc.</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.WebKit.Networking</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>XPC!</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${SHORT_VERSION_STRING}</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>${BUNDLE_VERSION}</string>
+ <key>LSFileQuarantineEnabled</key>
+ <true/>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>WebKitEntryPoint</key>
+ <string>NetworkServiceInitializer</string>
+ <key>LSUIElement</key>
+ <true/>
+ <key>XPCService</key>
+ <dict>
+ <key>ServiceType</key>
+ <string>Application</string>
+ <key>JoinExistingSession</key>
+ <true/>
+ <key>RunLoopType</key>
+ <string>NSRunLoop</string>
+ <key>_MultipleInstances</key>
+ <true/>
+ <key>EnvironmentVariables</key>
+ <dict>
+ <key>DYLD_INSERT_LIBRARIES</key>
+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
+ </dict>
+ </dict>
+</dict>
+</plist>
Modified: branches/safari-601.1.32-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist (184277 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist 2015-05-13 07:02:48 UTC (rev 184277)
+++ branches/safari-601.1.32-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist 2015-05-13 07:04:38 UTC (rev 184278)
@@ -40,11 +40,6 @@
<string>NSRunLoop</string>
<key>_MultipleInstances</key>
<true/>
- <key>EnvironmentVariables</key>
- <dict>
- <key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
- </dict>
</dict>
</dict>
</plist>
Copied: branches/safari-601.1.32-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist (from rev 184215, trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist) (0 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist (rev 0)
+++ branches/safari-601.1.32-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist 2015-05-13 07:04:38 UTC (rev 184278)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleGetInfoString</key>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2015 Apple Inc.</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIdentifier</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>XPC!</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${SHORT_VERSION_STRING}</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>${BUNDLE_VERSION}</string>
+ <key>LSFileQuarantineEnabled</key>
+ <true/>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>WebKitEntryPoint</key>
+ <string>PluginServiceInitializer</string>
+ <key>LSUIElement</key>
+ <true/>
+ <key>NSSupportsAutomaticGraphicsSwitching</key>
+ <true/>
+ <key>NSSupportsAppNap</key>
+ <true/>
+ <key>XPCService</key>
+ <dict>
+ <key>ServiceType</key>
+ <string>Application</string>
+ <key>RunLoopType</key>
+ <string>_NSApplicationMain</string>
+ <key>JoinExistingSession</key>
+ <true/>
+ <key>_MultipleInstances</key>
+ <true/>
+ <key>_AbandonCoalition</key>
+ <true/>
+ <key>EnvironmentVariables</key>
+ <dict>
+ <key>DYLD_INSERT_LIBRARIES</key>
+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
+ <key>NSStringDisableTagged</key>
+ <string>YES</string>
+ </dict>
+ </dict>
+</dict>
+</plist>
Modified: branches/safari-601.1.32-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist (184277 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist 2015-05-13 07:02:48 UTC (rev 184277)
+++ branches/safari-601.1.32-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist 2015-05-13 07:04:38 UTC (rev 184278)
@@ -48,8 +48,6 @@
<true/>
<key>EnvironmentVariables</key>
<dict>
- <key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
<key>NSStringDisableTagged</key>
<string>YES</string>
</dict>
Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (184277 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-13 07:02:48 UTC (rev 184277)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-13 07:04:38 UTC (rev 184278)
@@ -2419,6 +2419,8 @@
1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UpdateInfo.cpp; sourceTree = "<group>"; };
1A6509CD18B4146200614332 /* WKProcessPoolPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPoolPrivate.h; sourceTree = "<group>"; };
1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewInternal.h; sourceTree = "<group>"; };
+ 1A6D141F1B0167D500785FF0 /* Info-OSX-10.9-10.10.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX-10.9-10.10.plist"; sourceTree = "<group>"; };
+ 1A6D14211B01681600785FF0 /* PluginService.32-64-10.9-10.10.Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "PluginService.32-64-10.9-10.10.Info.plist"; path = "PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist"; sourceTree = SOURCE_ROOT; };
1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLine.h; sourceTree = "<group>"; };
1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLinePOSIX.cpp; sourceTree = "<group>"; };
1A6FB7AC11E64B6800DB1371 /* PluginView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginView.cpp; sourceTree = "<group>"; };
@@ -2436,6 +2438,7 @@
1A7865B816CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessConnectionManagerMessages.h; sourceTree = "<group>"; };
1A7C6CD81378950800B9C04D /* EnvironmentVariables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EnvironmentVariables.cpp; sourceTree = "<group>"; };
1A7C6CD91378950800B9C04D /* EnvironmentVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EnvironmentVariables.h; sourceTree = "<group>"; };
+ 1A7DA54D1AFD8B380018239D /* Info-OSX-10.9-10.10.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX-10.9-10.10.plist"; sourceTree = "<group>"; };
1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessageHandler.h; sourceTree = "<group>"; };
1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKScriptMessage.mm; sourceTree = "<group>"; };
1A7E377718E4A4FE003D0FFF /* WKScriptMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessage.h; sourceTree = "<group>"; };
@@ -6873,6 +6876,7 @@
isa = PBXGroup;
children = (
26659AA0185FAAED004303DD /* Info-iOS.plist */,
+ 1A6D141F1B0167D500785FF0 /* Info-OSX-10.9-10.10.plist */,
BC8283A316B4BD9100A278FE /* Info-OSX.plist */,
);
path = NetworkService;
@@ -6901,6 +6905,7 @@
BC8283E916B4F8E200A278FE /* PluginService */ = {
isa = PBXGroup;
children = (
+ 1A6D14211B01681600785FF0 /* PluginService.32-64-10.9-10.10.Info.plist */,
BCFCA89516DE96CB00074069 /* PluginService.32-64.Info.plist */,
);
name = PluginService;
@@ -6995,6 +7000,7 @@
isa = PBXGroup;
children = (
375FB4731883415600BE34D4 /* Info-iOS.plist */,
+ 1A7DA54D1AFD8B380018239D /* Info-OSX-10.9-10.10.plist */,
BCACC44016B24CAA00B6E092 /* Info-OSX.plist */,
);
path = WebContentService;
Copied: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist (from rev 184215, trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist) (0 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist (rev 0)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist 2015-05-13 07:04:38 UTC (rev 184278)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleGetInfoString</key>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2015 Apple Inc.</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.WebKit.WebContent</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>XPC!</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${SHORT_VERSION_STRING}</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>${BUNDLE_VERSION}</string>
+ <key>LSFileQuarantineEnabled</key>
+ <true/>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>WebKitEntryPoint</key>
+ <string>WebContentServiceInitializer</string>
+ <key>LSUIElement</key>
+ <true/>
+ <key>NSSupportsAutomaticGraphicsSwitching</key>
+ <true/>
+ <key>NSSupportsAppNap</key>
+ <true/>
+ <key>NSMainNibFile</key>
+ <string>WebContentProcess</string>
+ <key>XPCService</key>
+ <dict>
+ <key>JoinExistingSession</key>
+ <true/>
+ <key>ServiceType</key>
+ <string>Application</string>
+ <key>RunLoopType</key>
+ <string>_NSApplicationMain</string>
+ <key>_MultipleInstances</key>
+ <true/>
+ <key>EnvironmentVariables</key>
+ <dict>
+ <key>DYLD_INSERT_LIBRARIES</key>
+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
+ </dict>
+ </dict>
+</dict>
+</plist>
Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist (184277 => 184278)
--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist 2015-05-13 07:02:48 UTC (rev 184277)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist 2015-05-13 07:04:38 UTC (rev 184278)
@@ -46,11 +46,6 @@
<string>_NSApplicationMain</string>
<key>_MultipleInstances</key>
<true/>
- <key>EnvironmentVariables</key>
- <dict>
- <key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
- </dict>
</dict>
</dict>
</plist>
