Title: [149441] trunk/Source/WebKit2
- Revision
- 149441
- Author
- [email protected]
- Date
- 2013-05-01 11:14:59 -0700 (Wed, 01 May 2013)
Log Message
<rdar://problem/13781156> Launching NetworkProcess broken on some OS versions.
Reviewed by Anders Carlsson.
Adapt to LaunchServices changes.
* Shared/mac/ChildProcessMac.mm:
(WebKit::ChildProcess::setApplicationIsDaemon):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (149440 => 149441)
--- trunk/Source/WebKit2/ChangeLog 2013-05-01 18:10:59 UTC (rev 149440)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-01 18:14:59 UTC (rev 149441)
@@ -1,3 +1,14 @@
+2013-05-01 Alexey Proskuryakov <[email protected]>
+
+ <rdar://problem/13781156> Launching NetworkProcess broken on some OS versions.
+
+ Reviewed by Anders Carlsson.
+
+ Adapt to LaunchServices changes.
+
+ * Shared/mac/ChildProcessMac.mm:
+ (WebKit::ChildProcess::setApplicationIsDaemon):
+
2013-05-01 Martin Robinson <[email protected]>
[GTK] [WebKit2] Add a setting to control whether or not accelerated 2D canvas is enabled
Modified: trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm (149440 => 149441)
--- trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2013-05-01 18:10:59 UTC (rev 149440)
+++ trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2013-05-01 18:14:59 UTC (rev 149441)
@@ -47,6 +47,12 @@
#endif
#endif
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+typedef bool (^LSServerConnectionAllowedBlock) ( CFDictionaryRef optionsRef );
+extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);
+extern "C" CFDictionaryRef _LSApplicationCheckIn(int sessionID, CFDictionaryRef applicationInfo);
+#endif
+
extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon);
using namespace WebCore;
@@ -85,6 +91,11 @@
{
OSStatus error = SetApplicationIsDaemon(true);
ASSERT_UNUSED(error, error == noErr);
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ _LSSetApplicationLaunchServicesServerConnectionStatus(0, 0);
+ RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(-2, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
+#endif
}
void ChildProcess::platformInitialize()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
