Changeset 140481 in webkit

Timestamp:

Jan 22, 2013, 3:36:58 PM (12 years ago)

Author:

ap@apple.com

Message:

[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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/RunLoopMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-22  Alexey Proskuryakov  <ap@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-22  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/platform/mac/RunLoopMac.mm

@@ -53 +53 @@
 {
     ASSERT(m_runLoop == CFRunLoopGetCurrent());
-    
-    if (m_runLoop == main()->m_runLoop && m_nestingLevel == 1 && s_useApplicationRunLoopOnMainRunLoop) {
-        [[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 && s_useApplicationRunLoopOnMainRunLoop) {
+        ASSERT([NSApp isRunning]);
+        [NSApp stop:nil];
         NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined
                                             location:NSMakePoint(0, 0)