Title: [143543] trunk/Source/WebKit2
- Revision
- 143543
- Author
- mr...@apple.com
- Date
- 2013-02-20 17:29:03 -0800 (Wed, 20 Feb 2013)
Log Message
<https://webkit.org/b/110409> Remove duplication between 32- and 64-bit PluginService plists.
Reviewed by Dan Bernstein.
The only difference between the plists was the CFBundleIdentifier. Since the values are the
same as the product name, we can just use the value of the PRODUCT_NAME configuration setting.
* Configurations/PluginService.32.xcconfig:
* Configurations/PluginService.64.xcconfig:
* PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist: Renamed from Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32/Info.plist.
* PluginProcess/EntryPoint/mac/XPCService/PluginService.64/Info.plist: Removed.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (143542 => 143543)
--- trunk/Source/WebKit2/ChangeLog 2013-02-21 01:22:43 UTC (rev 143542)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-21 01:29:03 UTC (rev 143543)
@@ -1,3 +1,17 @@
+2013-02-20 Mark Rowe <mr...@apple.com>
+
+ <https://webkit.org/b/110409> Remove duplication between 32- and 64-bit PluginService plists.
+
+ Reviewed by Dan Bernstein.
+
+ The only difference between the plists was the CFBundleIdentifier. Since the values are the
+ same as the product name, we can just use the value of the PRODUCT_NAME configuration setting.
+
+ * Configurations/PluginService.32.xcconfig:
+ * Configurations/PluginService.64.xcconfig:
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist: Renamed from Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32/Info.plist.
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.64/Info.plist: Removed.
+
2013-02-20 Simon Fraser <simon.fra...@apple.com>
Zoomed, slow-scrolling pages keep recreating tiles when scrolled
Modified: trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig (143542 => 143543)
--- trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2013-02-21 01:22:43 UTC (rev 143542)
+++ trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2013-02-21 01:29:03 UTC (rev 143543)
@@ -25,7 +25,7 @@
ARCHS = i386;
PRODUCT_NAME = com.apple.WebKit.Plugin.32;
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32/Info.plist;
+INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
// Since this service is only used in production builds, in debug and release builds
// we don't link against WebKit2, to avoid linking errors due to not having a WebKit2
Modified: trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig (143542 => 143543)
--- trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2013-02-21 01:22:43 UTC (rev 143542)
+++ trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2013-02-21 01:29:03 UTC (rev 143543)
@@ -25,7 +25,7 @@
ARCHS = x86_64;
PRODUCT_NAME = com.apple.WebKit.Plugin.64;
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.64/Info.plist;
+INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
// Since this service is only used in production builds, in debug and release builds
// we don't link against WebKit2, to avoid linking errors due to not having a WebKit2
Deleted: trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32/Info.plist (143542 => 143543)
--- trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32/Info.plist 2013-02-21 01:22:43 UTC (rev 143542)
+++ trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32/Info.plist 2013-02-21 01:29:03 UTC (rev 143543)
@@ -1,50 +0,0 @@
-<?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-2013 Apple Inc.</string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>${EXECUTABLE_NAME}</string>
- <key>CFBundleIdentifier</key>
- <string>com.apple.WebKit.Plugin.32</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>XPCService</key>
- <dict>
- <key>ServiceType</key>
- <string>Application</string>
- <key>RunLoopType</key>
- <string>_NSApplicationMain</string>
- <key>JoinExistingSession</key>
- <true/>
- <key>_MultipleInstances</key>
- <true/>
- <key>EnvironmentVariables</key>
- <dict>
- <key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
- </dict>
- </dict>
-</dict>
-</plist>
Copied: trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist (from rev 143542, trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.64/Info.plist) (0 => 143543)
--- trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist (rev 0)
+++ trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist 2013-02-21 01:29:03 UTC (rev 143543)
@@ -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-2013 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>XPCService</key>
+ <dict>
+ <key>ServiceType</key>
+ <string>Application</string>
+ <key>RunLoopType</key>
+ <string>_NSApplicationMain</string>
+ <key>JoinExistingSession</key>
+ <true/>
+ <key>_MultipleInstances</key>
+ <true/>
+ <key>EnvironmentVariables</key>
+ <dict>
+ <key>DYLD_INSERT_LIBRARIES</key>
+ <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
+ </dict>
+ </dict>
+</dict>
+</plist>
Deleted: trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.64/Info.plist (143542 => 143543)
--- trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.64/Info.plist 2013-02-21 01:22:43 UTC (rev 143542)
+++ trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.64/Info.plist 2013-02-21 01:29:03 UTC (rev 143543)
@@ -1,50 +0,0 @@
-<?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-2013 Apple Inc.</string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>${EXECUTABLE_NAME}</string>
- <key>CFBundleIdentifier</key>
- <string>com.apple.WebKit.Plugin.64</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>XPCService</key>
- <dict>
- <key>ServiceType</key>
- <string>Application</string>
- <key>RunLoopType</key>
- <string>_NSApplicationMain</string>
- <key>JoinExistingSession</key>
- <true/>
- <key>_MultipleInstances</key>
- <true/>
- <key>EnvironmentVariables</key>
- <dict>
- <key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
- </dict>
- </dict>
-</dict>
-</plist>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
