Title: [240885] trunk/Source/WebKit
- Revision
- 240885
- Author
- achristen...@apple.com
- Date
- 2019-02-01 15:32:42 -0800 (Fri, 01 Feb 2019)
Log Message
Move XPCService entry points from mac directory to new Cocoa directory
https://bugs.webkit.org/show_bug.cgi?id=194129
Reviewed by Chris Dumez.
* Configurations/NetworkService.xcconfig:
* Configurations/PluginService.64.xcconfig:
* Configurations/WebContentService.xcconfig:
* NetworkProcess/EntryPoint/Cocoa: Copied from Source/WebKit/NetworkProcess/EntryPoint/mac.
* NetworkProcess/EntryPoint/mac: Removed.
* PluginProcess/EntryPoint/Cocoa: Copied from Source/WebKit/PluginProcess/EntryPoint/mac.
* PluginProcess/EntryPoint/mac: Removed.
* Shared/EntryPointUtilities/Cocoa: Copied from Source/WebKit/Shared/EntryPointUtilities/mac.
* Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h:
* Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm:
* Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
* Shared/EntryPointUtilities/mac: Removed.
* SourcesCocoa.txt:
* WebKit.xcodeproj/project.pbxproj:
* WebProcess/EntryPoint/Cocoa: Copied from Source/WebKit/WebProcess/EntryPoint/mac.
* WebProcess/EntryPoint/mac: Removed.
Modified Paths
Added Paths
- trunk/Source/WebKit/NetworkProcess/EntryPoint/Cocoa/
- trunk/Source/WebKit/NetworkProcess/EntryPoint/Cocoa/Daemon/
- trunk/Source/WebKit/PluginProcess/EntryPoint/Cocoa/
- trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/
- trunk/Source/WebKit/WebProcess/EntryPoint/Cocoa/
Removed Paths
- trunk/Source/WebKit/NetworkProcess/EntryPoint/mac/
- trunk/Source/WebKit/PluginProcess/EntryPoint/mac/
- trunk/Source/WebKit/Shared/EntryPointUtilities/mac/
- trunk/Source/WebKit/WebProcess/EntryPoint/mac/
Diff
Modified: trunk/Source/WebKit/ChangeLog (240884 => 240885)
--- trunk/Source/WebKit/ChangeLog 2019-02-01 23:29:36 UTC (rev 240884)
+++ trunk/Source/WebKit/ChangeLog 2019-02-01 23:32:42 UTC (rev 240885)
@@ -1,3 +1,27 @@
+2019-02-01 Alex Christensen <achristen...@webkit.org>
+
+ Move XPCService entry points from mac directory to new Cocoa directory
+ https://bugs.webkit.org/show_bug.cgi?id=194129
+
+ Reviewed by Chris Dumez.
+
+ * Configurations/NetworkService.xcconfig:
+ * Configurations/PluginService.64.xcconfig:
+ * Configurations/WebContentService.xcconfig:
+ * NetworkProcess/EntryPoint/Cocoa: Copied from Source/WebKit/NetworkProcess/EntryPoint/mac.
+ * NetworkProcess/EntryPoint/mac: Removed.
+ * PluginProcess/EntryPoint/Cocoa: Copied from Source/WebKit/PluginProcess/EntryPoint/mac.
+ * PluginProcess/EntryPoint/mac: Removed.
+ * Shared/EntryPointUtilities/Cocoa: Copied from Source/WebKit/Shared/EntryPointUtilities/mac.
+ * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h:
+ * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm:
+ * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
+ * Shared/EntryPointUtilities/mac: Removed.
+ * SourcesCocoa.txt:
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebProcess/EntryPoint/Cocoa: Copied from Source/WebKit/WebProcess/EntryPoint/mac.
+ * WebProcess/EntryPoint/mac: Removed.
+
2019-02-01 Wenson Hsieh <wenson_hs...@apple.com>
[iOS] Consistent 1 sec hang when triggering modal alerts while handling synchronous touch events
Modified: trunk/Source/WebKit/Configurations/NetworkService.xcconfig (240884 => 240885)
--- trunk/Source/WebKit/Configurations/NetworkService.xcconfig 2019-02-01 23:29:36 UTC (rev 240884)
+++ trunk/Source/WebKit/Configurations/NetworkService.xcconfig 2019-02-01 23:32:42 UTC (rev 240885)
@@ -37,8 +37,8 @@
PRODUCT_NAME = com.apple.WebKit.Networking;
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-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=iphone*] = NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-iOS.plist;
+INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-OSX.plist;
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
OTHER_LDFLAGS[sdk=macosx*] = $(inherited) $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
Modified: trunk/Source/WebKit/Configurations/PluginService.64.xcconfig (240884 => 240885)
--- trunk/Source/WebKit/Configurations/PluginService.64.xcconfig 2019-02-01 23:29:36 UTC (rev 240884)
+++ trunk/Source/WebKit/Configurations/PluginService.64.xcconfig 2019-02-01 23:32:42 UTC (rev 240885)
@@ -27,7 +27,7 @@
PRODUCT_NAME = com.apple.WebKit.Plugin.64;
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.64.Info.plist;
+INFOPLIST_FILE = PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist;
WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
Modified: trunk/Source/WebKit/Configurations/WebContentService.xcconfig (240884 => 240885)
--- trunk/Source/WebKit/Configurations/WebContentService.xcconfig 2019-02-01 23:29:36 UTC (rev 240884)
+++ trunk/Source/WebKit/Configurations/WebContentService.xcconfig 2019-02-01 23:32:42 UTC (rev 240885)
@@ -41,8 +41,8 @@
PRODUCT_NAME_Development = com.apple.WebKit.WebContent.Development;
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-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=iphone*] = WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist;
+INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-OSX.plist;
WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
Modified: trunk/Source/WebKit/SourcesCocoa.txt (240884 => 240885)
--- trunk/Source/WebKit/SourcesCocoa.txt 2019-02-01 23:29:36 UTC (rev 240884)
+++ trunk/Source/WebKit/SourcesCocoa.txt 2019-02-01 23:32:42 UTC (rev 240885)
@@ -39,7 +39,7 @@
NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
-NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm
+NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm
NetworkProcess/ios/NetworkProcessIOS.mm
@@ -81,7 +81,7 @@
Platform/unix/EnvironmentUtilities.cpp
-PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm @no-unify
+PluginProcess/EntryPoint/Cocoa/XPCService/PluginServiceEntryPoint.mm @no-unify
PluginProcess/mac/PluginControllerProxyMac.mm @no-unify
PluginProcess/mac/PluginProcessMac.mm @no-unify
@@ -147,8 +147,8 @@
Shared/Cocoa/WKNSURLRequest.mm
Shared/Cocoa/WKObject.mm
-Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
-Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm
+Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm
+Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm
Shared/ios/AuxiliaryProcessIOS.mm
Shared/ios/InteractionInformationAtPosition.mm
@@ -493,7 +493,7 @@
WebProcess/cocoa/VideoFullscreenManager.mm
WebProcess/cocoa/WebProcessCocoa.mm
-WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm
+WebProcess/EntryPoint/Cocoa/XPCService/WebContentServiceEntryPoint.mm
WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (240884 => 240885)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-02-01 23:29:36 UTC (rev 240884)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-02-01 23:32:42 UTC (rev 240885)
@@ -8035,7 +8035,7 @@
BC82839616B47EC400A278FE /* XPCServiceMain.mm */,
);
name = XPCService;
- path = mac/XPCService;
+ path = Cocoa/XPCService;
sourceTree = "<group>";
};
BC82837C16B45DA500A278FE /* EntryPoint */ = {
@@ -8061,7 +8061,7 @@
BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */,
);
name = XPCService;
- path = mac/XPCService;
+ path = Cocoa/XPCService;
sourceTree = "<group>";
};
BC8283A216B4BD9100A278FE /* NetworkService */ = {
@@ -8080,7 +8080,7 @@
BC8283EF16B4F8E200A278FE /* PluginServiceEntryPoint.mm */,
);
name = XPCService;
- path = mac/XPCService;
+ path = Cocoa/XPCService;
sourceTree = "<group>";
};
BC8283E916B4F8E200A278FE /* PluginService */ = {
@@ -8147,7 +8147,7 @@
BC82839816B48DC000A278FE /* WebContentServiceEntryPoint.mm */,
);
name = XPCService;
- path = mac/XPCService;
+ path = Cocoa/XPCService;
sourceTree = "<group>";
};
BCACC43F16B24CAA00B6E092 /* WebContentService */ = {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
