Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit f2cf4fe

Browse files
author
[email protected]
committed
Revert r245501
https://bugs.webkit.org/show_bug.cgi?id=198007 That change did not fix <rdar://problem/49808949> but it caused <rdar://problem/50967271> so out it goes. * Shared/API/Cocoa/WKMain.h: Added. * Shared/API/Cocoa/WKMain.mm: Added. (WKXPCServiceMain): * Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp: Added. (main): * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm: (main): Deleted. * UIProcess/Launcher/mac/ProcessLauncherMac.mm: (WebKit::ProcessLauncher::launchProcess): * WebKit.xcodeproj/project.pbxproj: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@245562 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 27f7f6d commit f2cf4fe

File tree

7 files changed

+141
-6
lines changed

7 files changed

+141
-6
lines changed

‎Source/WebKit/ChangeLog

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
2019-05-20 Alex Christensen <[email protected]>
2+
3+
Revert r245501
4+
https://bugs.webkit.org/show_bug.cgi?id=198007
5+
6+
That change did not fix <rdar://problem/49808949> but it caused <rdar://problem/50967271> so out it goes.
7+
8+
* Shared/API/Cocoa/WKMain.h: Added.
9+
* Shared/API/Cocoa/WKMain.mm: Added.
10+
(WKXPCServiceMain):
11+
* Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp: Added.
12+
(main):
13+
* Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
14+
(main): Deleted.
15+
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
16+
(WebKit::ProcessLauncher::launchProcess):
17+
* WebKit.xcodeproj/project.pbxproj:
18+
119
2019-05-20 Wenson Hsieh <[email protected]>
220

321
[iOS] Layout viewport size on google.com increases after rotating to landscape and back

‎Source/WebKit/Shared/API/Cocoa/WKMain.h

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* Copyright (C) 2019 Apple Inc. All rights reserved.
3+
*
4+
* Redistribution and use in source and binary forms, with or without
5+
* modification, are permitted provided that the following conditions
6+
* are met:
7+
* 1. Redistributions of source code must retain the above copyright
8+
* notice, this list of conditions and the following disclaimer.
9+
* 2. Redistributions in binary form must reproduce the above copyright
10+
* notice, this list of conditions and the following disclaimer in the
11+
* documentation and/or other materials provided with the distribution.
12+
*
13+
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15+
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17+
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23+
* THE POSSIBILITY OF SUCH DAMAGE.
24+
*/
25+
26+
#pragma once
27+
28+
#include <WebKit/WKBase.h>
29+
#include <WebKit/WKFoundation.h>
30+
31+
#ifdef __cplusplus
32+
extern "C" {
33+
#endif
34+
35+
WK_EXPORT int WKXPCServiceMain(int argc, const char** argv) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
36+
37+
#ifdef __cplusplus
38+
}
39+
#endif

‎Source/WebKit/Shared/API/Cocoa/WKMain.mm

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
* Copyright (C) 2019 Apple Inc. All rights reserved.
3+
*
4+
* Redistribution and use in source and binary forms, with or without
5+
* modification, are permitted provided that the following conditions
6+
* are met:
7+
* 1. Redistributions of source code must retain the above copyright
8+
* notice, this list of conditions and the following disclaimer.
9+
* 2. Redistributions in binary form must reproduce the above copyright
10+
* notice, this list of conditions and the following disclaimer in the
11+
* documentation and/or other materials provided with the distribution.
12+
*
13+
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15+
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17+
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23+
* THE POSSIBILITY OF SUCH DAMAGE.
24+
*/
25+
26+
#include "config.h"
27+
#include "WKMain.h"
28+
29+
#include "XPCServiceEntryPoint.h"
30+
31+
int WKXPCServiceMain(int argc, const char** argv)
32+
{
33+
return WebKit::XPCServiceMain(argc, argv);
34+
}

‎Source/WebKit/Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* Copyright (C) 2019 Apple Inc. All rights reserved.
3+
*
4+
* Redistribution and use in source and binary forms, with or without
5+
* modification, are permitted provided that the following conditions
6+
* are met:
7+
* 1. Redistributions of source code must retain the above copyright
8+
* notice, this list of conditions and the following disclaimer.
9+
* 2. Redistributions in binary form must reproduce the above copyright
10+
* notice, this list of conditions and the following disclaimer in the
11+
* documentation and/or other materials provided with the distribution.
12+
*
13+
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15+
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17+
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23+
* THE POSSIBILITY OF SUCH DAMAGE.
24+
*/
25+
26+
#include <WebKit/WKMain.h>
27+
28+
int main(int argc, const char** argv)
29+
{
30+
return WKXPCServiceMain(argc, argv);
31+
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,3 @@ int XPCServiceMain(int, const char**)
149149
}
150150

151151
} // namespace WebKit
152-
153-
int main(int argc, const char** argv)
154-
{
155-
return WebKit::XPCServiceMain(argc, argv);
156-
}

‎Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ static bool shouldLeakBoost(const ProcessLauncher::LaunchOptions& launchOptions)
200200

201201
auto errorHandlerImpl = [weakProcessLauncher = makeWeakPtr(*this), listeningPort] (xpc_object_t event) {
202202
ASSERT(!event || xpc_get_type(event) == XPC_TYPE_ERROR);
203-
203+
204204
auto processLauncher = weakProcessLauncher.get();
205205
if (!processLauncher)
206206
return;

‎Source/WebKit/WebKit.xcodeproj/project.pbxproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,6 +1097,12 @@
10971097
5CD286571E7235C90094FDC8 /* WKContentRuleListStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD2864F1E722F440094FDC8 /* WKContentRuleListStoreInternal.h */; };
10981098
5CD286581E7235D10094FDC8 /* WKContentRuleListStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD286501E722F440094FDC8 /* WKContentRuleListStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
10991099
5CE85B201C88E64B0070BFCE /* PingLoad.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE85B1F1C88E6430070BFCE /* PingLoad.h */; };
1100+
5CE9120D2293C219005BEC78 /* WKMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CE9120C2293C1E0005BEC78 /* WKMain.mm */; };
1101+
5CE912102293C277005BEC78 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CE9120F2293C25F005BEC78 /* AuxiliaryProcessMain.cpp */; };
1102+
5CE912112293C278005BEC78 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CE9120F2293C25F005BEC78 /* AuxiliaryProcessMain.cpp */; };
1103+
5CE912122293C278005BEC78 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CE9120F2293C25F005BEC78 /* AuxiliaryProcessMain.cpp */; };
1104+
5CE912132293C279005BEC78 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CE9120F2293C25F005BEC78 /* AuxiliaryProcessMain.cpp */; };
1105+
5CE912142293C280005BEC78 /* WKMain.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE9120B2293C1E0005BEC78 /* WKMain.h */; settings = {ATTRIBUTES = (Private, ); }; };
11001106
617A52D81F43A9DA00DCDC0A /* ServiceWorkerClientFetchMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 617A52D71F43A9B600DCDC0A /* ServiceWorkerClientFetchMessageReceiver.cpp */; };
11011107
63108F961F96719C00A0DB84 /* _WKApplicationManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 63108F941F96719C00A0DB84 /* _WKApplicationManifest.h */; settings = {ATTRIBUTES = (Private, ); }; };
11021108
63108F991F9671F700A0DB84 /* _WKApplicationManifestInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 63108F981F9671F700A0DB84 /* _WKApplicationManifestInternal.h */; };
@@ -3568,6 +3574,9 @@
35683574
5CD2864F1E722F440094FDC8 /* WKContentRuleListStoreInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentRuleListStoreInternal.h; sourceTree = "<group>"; };
35693575
5CD286501E722F440094FDC8 /* WKContentRuleListStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentRuleListStorePrivate.h; sourceTree = "<group>"; };
35703576
5CE85B1F1C88E6430070BFCE /* PingLoad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PingLoad.h; sourceTree = "<group>"; };
3577+
5CE9120B2293C1E0005BEC78 /* WKMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMain.h; sourceTree = "<group>"; };
3578+
5CE9120C2293C1E0005BEC78 /* WKMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKMain.mm; sourceTree = "<group>"; };
3579+
5CE9120F2293C25F005BEC78 /* AuxiliaryProcessMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AuxiliaryProcessMain.cpp; path = Cocoa/AuxiliaryProcessMain.cpp; sourceTree = "<group>"; };
35713580
5CFECB031E1ED1C800F88504 /* LegacyCustomProtocolManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LegacyCustomProtocolManager.cpp; sourceTree = "<group>"; };
35723581
5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = BaseTarget.xcconfig; sourceTree = "<group>"; };
35733582
617A52D71F43A9B600DCDC0A /* ServiceWorkerClientFetchMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ServiceWorkerClientFetchMessageReceiver.cpp; path = DerivedSources/WebKit2/ServiceWorkerClientFetchMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -6430,6 +6439,8 @@
64306439
37A709A81E3EA40C00CA5969 /* WKDataDetectorTypesInternal.h */,
64316440
F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */,
64326441
37DFA6FF1810BB92001F4A9F /* WKFoundation.h */,
6442+
5CE9120B2293C1E0005BEC78 /* WKMain.h */,
6443+
5CE9120C2293C1E0005BEC78 /* WKMain.mm */,
64336444
1A9E32991822E1CC00F5D04C /* WKRemoteObject.h */,
64346445
1A9E32981822E1CC00F5D04C /* WKRemoteObject.mm */,
64356446
1A9E329D1822FEDD00F5D04C /* WKRemoteObjectCoder.h */,
@@ -8204,6 +8215,7 @@
82048215
isa = PBXGroup;
82058216
children = (
82068217
BC82836B16B3587900A278FE /* XPCService */,
8218+
5CE9120F2293C25F005BEC78 /* AuxiliaryProcessMain.cpp */,
82078219
);
82088220
path = EntryPointUtilities;
82098221
sourceTree = "<group>";
@@ -9963,6 +9975,7 @@
99639975
2DD5E129210ADC7B00DB6012 /* WKKeyboardScrollingAnimator.h in Headers */,
99649976
51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */,
99659977
2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */,
9978+
5CE912142293C280005BEC78 /* WKMain.h in Headers */,
99669979
C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */,
99679980
C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */,
99689981
1AB40EE61BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h in Headers */,
@@ -10940,6 +10953,7 @@
1094010953
isa = PBXSourcesBuildPhase;
1094110954
buildActionMask = 2147483647;
1094210955
files = (
10956+
5CE912112293C278005BEC78 /* AuxiliaryProcessMain.cpp in Sources */,
1094310957
5C9A9112228F69CC005C5B17 /* XPCServiceMain.mm in Sources */,
1094410958
);
1094510959
runOnlyForDeploymentPostprocessing = 0;
@@ -11305,6 +11319,7 @@
1130511319
2D931169212F61B200044BFE /* WKContentView.mm in Sources */,
1130611320
2D93116A212F61B500044BFE /* WKContentViewInteraction.mm in Sources */,
1130711321
637281A321ADC744009E0DE6 /* WKDownloadProgress.mm in Sources */,
11322+
5CE9120D2293C219005BEC78 /* WKMain.mm in Sources */,
1130811323
4657D88A22664A2F005DE823 /* WKOrientationAccessAlert.mm in Sources */,
1130911324
5CA26D83217AD1B800F97A35 /* WKSafeBrowsingWarning.mm in Sources */,
1131011325
1DB01944211CF005009FB3E8 /* WKShareSheet.mm in Sources */,
@@ -11317,6 +11332,7 @@
1131711332
isa = PBXSourcesBuildPhase;
1131811333
buildActionMask = 2147483647;
1131911334
files = (
11335+
5CE912102293C277005BEC78 /* AuxiliaryProcessMain.cpp in Sources */,
1132011336
5C9A9111228F69CC005C5B17 /* XPCServiceMain.mm in Sources */,
1132111337
);
1132211338
runOnlyForDeploymentPostprocessing = 0;
@@ -11325,6 +11341,7 @@
1132511341
isa = PBXSourcesBuildPhase;
1132611342
buildActionMask = 2147483647;
1132711343
files = (
11344+
5CE912122293C278005BEC78 /* AuxiliaryProcessMain.cpp in Sources */,
1132811345
5C9A9113228F69CD005C5B17 /* XPCServiceMain.mm in Sources */,
1132911346
);
1133011347
runOnlyForDeploymentPostprocessing = 0;
@@ -11333,6 +11350,7 @@
1133311350
isa = PBXSourcesBuildPhase;
1133411351
buildActionMask = 2147483647;
1133511352
files = (
11353+
5CE912132293C279005BEC78 /* AuxiliaryProcessMain.cpp in Sources */,
1133611354
5C9A9114228F69CE005C5B17 /* XPCServiceMain.mm in Sources */,
1133711355
);
1133811356
runOnlyForDeploymentPostprocessing = 0;

0 commit comments

Comments
 (0)