Title: [240520] trunk/Source
- Revision
- 240520
- Author
- achristen...@apple.com
- Date
- 2019-01-25 15:41:30 -0800 (Fri, 25 Jan 2019)
Log Message
Move logic from ChildProcess::setApplicationIsDaemon to NetworkProcess::initializeProcess
https://bugs.webkit.org/show_bug.cgi?id=193844
Reviewed by Andy Estes.
Source/WebCore/PAL:
* pal/spi/mac/HIServicesSPI.h:
Source/WebKit:
This simplifies ChildProcess and removes NetworkProcess-specific code from this generic abstraction.
* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::NetworkProcess::initializeProcess):
* Shared/ios/ChildProcessIOS.mm:
(WebKit::ChildProcess::setApplicationIsDaemon): Deleted.
* Shared/mac/ChildProcessMac.mm:
(WebKit::ChildProcess::setApplicationIsDaemon): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (240519 => 240520)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-01-25 23:40:23 UTC (rev 240519)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-01-25 23:41:30 UTC (rev 240520)
@@ -1,3 +1,12 @@
+2019-01-25 Alex Christensen <achristen...@webkit.org>
+
+ Move logic from ChildProcess::setApplicationIsDaemon to NetworkProcess::initializeProcess
+ https://bugs.webkit.org/show_bug.cgi?id=193844
+
+ Reviewed by Andy Estes.
+
+ * pal/spi/mac/HIServicesSPI.h:
+
2019-01-25 David Kilzer <ddkil...@apple.com>
Move soft-linking of Lookup.framework out of LookupSPI.h
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h (240519 => 240520)
--- trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h 2019-01-25 23:40:23 UTC (rev 240519)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h 2019-01-25 23:41:30 UTC (rev 240520)
@@ -123,5 +123,6 @@
CoreDragRef CoreDragGetCurrentDrag();
OSStatus CoreDragSetImage(CoreDragRef, CGPoint imageOffset, CoreDragImageSpec*, CGSRegionObj imageShape, float overallAlpha);
const UInt8* AXTextMarkerGetBytePtr(AXTextMarkerRef);
+OSStatus SetApplicationIsDaemon(Boolean);
WTF_EXTERN_C_END
Modified: trunk/Source/WebKit/ChangeLog (240519 => 240520)
--- trunk/Source/WebKit/ChangeLog 2019-01-25 23:40:23 UTC (rev 240519)
+++ trunk/Source/WebKit/ChangeLog 2019-01-25 23:41:30 UTC (rev 240520)
@@ -1,3 +1,19 @@
+2019-01-25 Alex Christensen <achristen...@webkit.org>
+
+ Move logic from ChildProcess::setApplicationIsDaemon to NetworkProcess::initializeProcess
+ https://bugs.webkit.org/show_bug.cgi?id=193844
+
+ Reviewed by Andy Estes.
+
+ This simplifies ChildProcess and removes NetworkProcess-specific code from this generic abstraction.
+
+ * NetworkProcess/mac/NetworkProcessMac.mm:
+ (WebKit::NetworkProcess::initializeProcess):
+ * Shared/ios/ChildProcessIOS.mm:
+ (WebKit::ChildProcess::setApplicationIsDaemon): Deleted.
+ * Shared/mac/ChildProcessMac.mm:
+ (WebKit::ChildProcess::setApplicationIsDaemon): Deleted.
+
2019-01-25 Keith Rollin <krol...@apple.com>
Update Xcode projects with "Apply Configuration to XCFileLists" build target
Modified: trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm (240519 => 240520)
--- trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm 2019-01-25 23:40:23 UTC (rev 240519)
+++ trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm 2019-01-25 23:41:30 UTC (rev 240520)
@@ -42,6 +42,7 @@
#import <notify.h>
#import <pal/spi/cf/CFNetworkSPI.h>
#import <pal/spi/cocoa/LaunchServicesSPI.h>
+#import <pal/spi/mac/HIServicesSPI.h>
#import <sysexits.h>
#import <wtf/FileSystem.h>
#import <wtf/MemoryPressureHandler.h>
@@ -52,8 +53,13 @@
void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
{
+#if PLATFORM(MAC) && !PLATFORM(IOSMAC)
// Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>).
- setApplicationIsDaemon();
+ OSStatus error = SetApplicationIsDaemon(true);
+ ASSERT_UNUSED(error, error == noErr);
+#endif
+
+ launchServicesCheckIn();
}
void NetworkProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
Modified: trunk/Source/WebKit/Shared/ios/ChildProcessIOS.mm (240519 => 240520)
--- trunk/Source/WebKit/Shared/ios/ChildProcessIOS.mm 2019-01-25 23:40:23 UTC (rev 240519)
+++ trunk/Source/WebKit/Shared/ios/ChildProcessIOS.mm 2019-01-25 23:41:30 UTC (rev 240520)
@@ -46,10 +46,6 @@
namespace WebKit {
-void ChildProcess::setApplicationIsDaemon()
-{
-}
-
void ChildProcess::platformInitialize()
{
FloatingPointEnvironment& floatingPointEnvironment = FloatingPointEnvironment::singleton();
Modified: trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm (240519 => 240520)
--- trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm 2019-01-25 23:40:23 UTC (rev 240519)
+++ trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm 2019-01-25 23:41:30 UTC (rev 240520)
@@ -76,9 +76,6 @@
extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);
extern "C" CFDictionaryRef _LSApplicationCheckIn(LSSessionID sessionID, CFDictionaryRef applicationInfo);
-extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon);
-
-
namespace WebKit {
using namespace WebCore;
@@ -152,17 +149,6 @@
ASSERT_UNUSED(kr, kr == KERN_SUCCESS);
}
-void ChildProcess::setApplicationIsDaemon()
-{
-#if !PLATFORM(IOSMAC)
- OSStatus error = SetApplicationIsDaemon(true);
- ASSERT_UNUSED(error, error == noErr);
-#endif
-
- // FIXME: Is this needed in iOSMac?
- launchServicesCheckIn();
-}
-
void ChildProcess::launchServicesCheckIn()
{
_LSSetApplicationLaunchServicesServerConnectionStatus(0, 0);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
