Title: [140587] tags/Safari-537.26.4/Source/WebCore
- Revision
- 140587
- Author
- lforsch...@apple.com
- Date
- 2013-01-23 14:13:54 -0800 (Wed, 23 Jan 2013)
Log Message
Merged r140481. <rdar://problem/13048210>
Modified Paths
Diff
Modified: tags/Safari-537.26.4/Source/WebCore/ChangeLog (140586 => 140587)
--- tags/Safari-537.26.4/Source/WebCore/ChangeLog 2013-01-23 21:56:20 UTC (rev 140586)
+++ tags/Safari-537.26.4/Source/WebCore/ChangeLog 2013-01-23 22:13:54 UTC (rev 140587)
@@ -1,3 +1,17 @@
+2013-01-23 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r140481
+
+ 2013-01-22 Alexey Proskuryakov <a...@apple.com>
+
+ [WK2] WebProcessService is not terminated when page is closed
+ https://bugs.webkit.org/show_bug.cgi?id=107595
+
+ Reviewed by Anders Carlsson.
+
+ * platform/mac/RunLoopMac.mm: (WebCore::RunLoop::stop): Allow stopping XPC service
+ run loop. Also, harmonized NSApp vs. [NSApplication sharedApplication] usage.
+
2013-01-18 Lucas Forschler <lforsch...@apple.com>
Merge r140087
Modified: tags/Safari-537.26.4/Source/WebCore/platform/mac/RunLoopMac.mm (140586 => 140587)
--- tags/Safari-537.26.4/Source/WebCore/platform/mac/RunLoopMac.mm 2013-01-23 21:56:20 UTC (rev 140586)
+++ tags/Safari-537.26.4/Source/WebCore/platform/mac/RunLoopMac.mm 2013-01-23 22:13:54 UTC (rev 140587)
@@ -45,9 +45,10 @@
void RunLoop::stop()
{
ASSERT(m_runLoop == CFRunLoopGetCurrent());
-
- if (m_runLoop == main()->m_runLoop && m_nestingLevel == 1) {
- [[NSApplication sharedApplication] stop:nil];
+ // Nesting level can be 0 if the run loop is started externally (such as the case for XPC services).
+ if (m_runLoop == main()->m_runLoop && m_nestingLevel <= 1) {
+ ASSERT([NSApp isRunning]);
+ [NSApp stop:nil];
NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined
location:NSMakePoint(0, 0)
modifierFlags:0
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
