Changeset 245501 in webkit

Timestamp:

May 19, 2019, 12:46:45 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Revert r240956
​https://bugs.webkit.org/show_bug.cgi?id=198007
<rdar://problem/49808949>

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-05-19
Reviewed by Alexey Proskuryakov.

r240956 made SafariForWebKitDevelopment crash when using WebKit nightly builds.
Since it's not needed and the binary reduction wasn't too big, just revert that revision.

• Shared/API/Cocoa/WKMain.h: Removed.
• Shared/API/Cocoa/WKMain.mm: Removed.
• Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp: Removed.
• Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:

(main):

• SourcesCocoa.txt:
• WebKit.xcodeproj/project.pbxproj:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WKMain.h (deleted)
• Shared/API/Cocoa/WKMain.mm (deleted)
• Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp (deleted)
• Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm (modified) (1 diff)
• SourcesCocoa.txt (modified) (1 diff)
• WebKit.xcodeproj/project.pbxproj (modified) (10 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-19  Alex Christensen  <achristensen@webkit.org>
+
+        Revert r240956
+        https://bugs.webkit.org/show_bug.cgi?id=198007
+        <rdar://problem/49808949>
+
+        Reviewed by Alexey Proskuryakov.
+
+        r240956 made SafariForWebKitDevelopment crash when using WebKit nightly builds.
+        Since it's not needed and the binary reduction wasn't too big, just revert that revision.
+
+        * Shared/API/Cocoa/WKMain.h: Removed.
+        * Shared/API/Cocoa/WKMain.mm: Removed.
+        * Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp: Removed.
+        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
+        (main):
+        * SourcesCocoa.txt:
+        * WebKit.xcodeproj/project.pbxproj:
+
 2019-05-18  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm

@@ -150 +150 @@
 
 } // namespace WebKit
+
+int main(int argc, const char** argv)
+{
+    return WebKit::XPCServiceMain(argc, argv);
+}

trunk/Source/WebKit/SourcesCocoa.txt

@@ -112 +112 @@
 Shared/API/Cocoa/RemoteObjectRegistry.mm
 Shared/API/Cocoa/WKBrowsingContextHandle.mm
-Shared/API/Cocoa/WKMain.mm
 Shared/API/Cocoa/WKRemoteObject.mm
 Shared/API/Cocoa/WKRemoteObjectCoder.mm

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1074 +1074 @@
                 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */; };
                 5C4B9D8B210A8CCF008F14D1 /* UndoOrRedo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B9D8A210A8C46008F14D1 /* UndoOrRedo.h */; };
-                5C5CEC30220911C700D6BBB0 /* WKMain.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5CEC2E2209114800D6BBB0 /* WKMain.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                5C5CEC32220912B300D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */; };
-                5C5CEC33220912B300D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */; };
-                5C5CEC34220912B400D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */; };
-                5C5CEC35220912B400D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */; };
                 5C5D238C227A2CDA000B9BDA /* _WKCustomHeaderFields.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5D2389227A1892000B9BDA /* _WKCustomHeaderFields.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 5C62FDF91EFC271C00CE072E /* WKURLSchemeTaskPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1084 +1079 @@
                 5C8BC797218CBB4800813886 /* SafeBrowsing.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5C8BC796218CB58A00813886 /* SafeBrowsing.xcassets */; };
                 5C8DD3801FE4521600F2A556 /* WebsiteAutoplayPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C8DD37F1FE4519200F2A556 /* WebsiteAutoplayPolicy.h */; };
+                5C9A9111228F69CC005C5B17 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
+                5C9A9112228F69CC005C5B17 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
+                5C9A9113228F69CD005C5B17 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
+                5C9A9114228F69CE005C5B17 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
                 5C9E56831DF7F1B300C9EE33 /* WKWebsitePolicies.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9E56811DF7F05500C9EE33 /* WKWebsitePolicies.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 5CA26D81217ABD5B00F97A35 /* WKSafeBrowsingWarning.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CA26D80217ABBB600F97A35 /* WKSafeBrowsingWarning.h */; };
@@ -3527 +3526 @@
                 5C46C0AE21B71AE200BC5991 /* _WKWebsiteDataStoreConfigurationInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebsiteDataStoreConfigurationInternal.h; sourceTree = "<group>"; };
                 5C4B9D8A210A8C46008F14D1 /* UndoOrRedo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UndoOrRedo.h; sourceTree = "<group>"; };
-                5C5CEC2E2209114800D6BBB0 /* WKMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMain.h; sourceTree = "<group>"; };
-                5C5CEC2F2209117E00D6BBB0 /* WKMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKMain.mm; sourceTree = "<group>"; };
-                5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AuxiliaryProcessMain.cpp; path = Cocoa/AuxiliaryProcessMain.cpp; sourceTree = "<group>"; };
                 5C5CEC382209583200D6BBB0 /* DaemonEntryPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DaemonEntryPoint.h; sourceTree = "<group>"; };
                 5C5CEC392209583200D6BBB0 /* DaemonEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DaemonEntryPoint.mm; sourceTree = "<group>"; };
@@ -6450 +6446 @@
                                 F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */,
                                 37DFA6FF1810BB92001F4A9F /* WKFoundation.h */,
-                                5C5CEC2E2209114800D6BBB0 /* WKMain.h */,
-                                5C5CEC2F2209117E00D6BBB0 /* WKMain.mm */,
                                 1A9E32991822E1CC00F5D04C /* WKRemoteObject.h */,
                                 1A9E32981822E1CC00F5D04C /* WKRemoteObject.mm */,
@@ -8219 +8213 @@
                         children = (
                                 BC82836B16B3587900A278FE /* XPCService */,
-                                5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */,
                         );
                         path = EntryPointUtilities;
@@ -9979 +9972 @@
                                 51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */,
                                 2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */,
-                                5C5CEC30220911C700D6BBB0 /* WKMain.h in Headers */,
                                 C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */,
                                 C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */,
@@ -10957 +10949 @@
                         buildActionMask = 2147483647;
                         files = (
-                                5C5CEC34220912B400D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */,
+                                5C9A9112228F69CC005C5B17 /* XPCServiceMain.mm in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -11334 +11326 @@
                         buildActionMask = 2147483647;
                         files = (
-                                5C5CEC35220912B400D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */,
+                                5C9A9111228F69CC005C5B17 /* XPCServiceMain.mm in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -11342 +11334 @@
                         buildActionMask = 2147483647;
                         files = (
-                                5C5CEC33220912B300D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */,
+                                5C9A9113228F69CD005C5B17 /* XPCServiceMain.mm in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -11350 +11342 @@
                         buildActionMask = 2147483647;
                         files = (
-                                5C5CEC32220912B300D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */,
+                                5C9A9114228F69CE005C5B17 /* XPCServiceMain.mm in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;