Title: [139240] trunk/Source/WebKit2
- Revision
- 139240
- Author
- a...@apple.com
- Date
- 2013-01-09 14:12:37 -0800 (Wed, 09 Jan 2013)
Log Message
Local builds of NetworkProcess should have a process icon
https://bugs.webkit.org/show_bug.cgi?id=106489
Reviewed by Mark Rowe.
* Resources/WebKit.icns: Copied from Source/WebKit2/WebProcess/mac/WebKit.icns.
* WebProcess/mac/WebKit.icns: Removed.
Copied to a shared location. We don't have different icons, so just using WebKit one.
* Configurations/NetworkProcess.xcconfig:
* NetworkProcess/Info.plist:
* WebKit2.xcodeproj/project.pbxproj:
Same changes as for WebProcess.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (139239 => 139240)
--- trunk/Source/WebKit2/ChangeLog 2013-01-09 22:03:48 UTC (rev 139239)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-09 22:12:37 UTC (rev 139240)
@@ -1,3 +1,19 @@
+2013-01-09 Alexey Proskuryakov <a...@apple.com>
+
+ Local builds of NetworkProcess should have a process icon
+ https://bugs.webkit.org/show_bug.cgi?id=106489
+
+ Reviewed by Mark Rowe.
+
+ * Resources/WebKit.icns: Copied from Source/WebKit2/WebProcess/mac/WebKit.icns.
+ * WebProcess/mac/WebKit.icns: Removed.
+ Copied to a shared location. We don't have different icons, so just using WebKit one.
+
+ * Configurations/NetworkProcess.xcconfig:
+ * NetworkProcess/Info.plist:
+ * WebKit2.xcodeproj/project.pbxproj:
+ Same changes as for WebProcess.
+
2013-01-09 Andras Becsi <andras.be...@digia.com>
[Qt][WK2] Fix a typo in in the double-tap-to-zoom logic
Modified: trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig (139239 => 139240)
--- trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig 2013-01-09 22:03:48 UTC (rev 139239)
+++ trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig 2013-01-09 22:12:37 UTC (rev 139240)
@@ -27,3 +27,11 @@
PRODUCT_NAME = NetworkProcess;
INFOPLIST_FILE = NetworkProcess/Info.plist;
INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework;
+
+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;
Modified: trunk/Source/WebKit2/NetworkProcess/Info.plist (139239 => 139240)
--- trunk/Source/WebKit2/NetworkProcess/Info.plist 2013-01-09 22:03:48 UTC (rev 139239)
+++ trunk/Source/WebKit2/NetworkProcess/Info.plist 2013-01-09 22:12:37 UTC (rev 139240)
@@ -26,5 +26,7 @@
<true/>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
+ <key>CFBundleIconFile</key>
+ <string>${APP_ICON}</string>
</dict>
</plist>
Copied: trunk/Source/WebKit2/Resources/WebKit.icns (from rev 139082, trunk/Source/WebKit2/WebProcess/mac/WebKit.icns)
(Binary files differ)
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (139239 => 139240)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-09 22:03:48 UTC (rev 139239)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-09 22:12:37 UTC (rev 139240)
@@ -1047,6 +1047,7 @@
E199875E142C045400BB2DE7 /* SimplePDFPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = E199875C142BFC9700BB2DE7 /* SimplePDFPlugin.mm */; };
E1A31732134CEA6C007C9A4F /* AttributedString.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A31731134CEA6C007C9A4F /* AttributedString.h */; };
E1A31735134CEA80007C9A4F /* AttributedString.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1A31734134CEA80007C9A4F /* AttributedString.mm */; };
+ E1A9A852169E2025002D7176 /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; };
E1AEA22F14687BDB00804569 /* WKFullKeyboardAccessWatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E1AEA22D14687BDB00804569 /* WKFullKeyboardAccessWatcher.h */; };
E1AEA23014687BDB00804569 /* WKFullKeyboardAccessWatcher.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1AEA22E14687BDB00804569 /* WKFullKeyboardAccessWatcher.mm */; };
E1B78471163F24690007B692 /* RemoteNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B78470163F24690007B692 /* RemoteNetworkingContext.h */; };
@@ -2331,7 +2332,7 @@
D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSearchPopupMenu.h; sourceTree = "<group>"; };
DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = "<group>"; };
DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeWebWheelEventMac.mm; sourceTree = "<group>"; };
- E133FD891423DD7F00FC7BFB /* WebKit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = WebKit.icns; path = WebProcess/mac/WebKit.icns; sourceTree = "<group>"; };
+ E133FD891423DD7F00FC7BFB /* WebKit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = WebKit.icns; path = Resources/WebKit.icns; sourceTree = "<group>"; };
E134F01512EA5D11004EC58D /* WKPrintingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPrintingView.h; sourceTree = "<group>"; };
E134F01912EA5D99004EC58D /* WKPrintingView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKPrintingView.mm; sourceTree = "<group>"; };
E13A8A2C162879AC00392929 /* SharedWorkerProcess.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SharedWorkerProcess.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2546,6 +2547,7 @@
6D8A91A511F0EFD100DD01FE /* com.apple.WebProcess.sb.in */,
1CBC945D16515ED200D68AAE /* Dock.pdf */,
089C1666FE841158C02AAC07 /* InfoPlist.strings */,
+ E133FD891423DD7F00FC7BFB /* WebKit.icns */,
);
name = Resources;
sourceTree = "<group>";
@@ -4067,7 +4069,6 @@
isa = PBXGroup;
children = (
BC8A501011765AF700757573 /* Info.plist */,
- E133FD891423DD7F00FC7BFB /* WebKit.icns */,
);
name = WebProcess;
sourceTree = "<group>";
@@ -5298,6 +5299,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ E1A9A852169E2025002D7176 /* WebKit.icns in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Deleted: trunk/Source/WebKit2/WebProcess/mac/WebKit.icns
(Binary files differ)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
