Changeset 140587 in webkit


Ignore:
Timestamp:
Jan 23, 2013, 2:13:54 PM (13 years ago)
Author:
Lucas Forschler
Message:

Merged r140481. <rdar://problem/13048210>

Location:
tags/Safari-537.26.4/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • tags/Safari-537.26.4/Source/WebCore/ChangeLog

    r140179 r140587  
     12013-01-23  Lucas Forschler  <lforschler@apple.com>
     2
     3        Merge r140481
     4
     5    2013-01-22  Alexey Proskuryakov  <ap@apple.com>
     6
     7            [WK2] WebProcessService is not terminated when page is closed
     8            https://bugs.webkit.org/show_bug.cgi?id=107595
     9
     10            Reviewed by Anders Carlsson.
     11
     12            * platform/mac/RunLoopMac.mm: (WebCore::RunLoop::stop): Allow stopping XPC service
     13            run loop. Also, harmonized NSApp vs. [NSApplication sharedApplication] usage.
     14
    1152013-01-18  Lucas Forschler  <lforschler@apple.com>
    216

  • tags/Safari-537.26.4/Source/WebCore/platform/mac/RunLoopMac.mm

    r117018 r140587  
    4646{
    4747    ASSERT(m_runLoop == CFRunLoopGetCurrent());
    48    
    49     if (m_runLoop == main()->m_runLoop && m_nestingLevel == 1) {
    50         [[NSApplication sharedApplication] stop:nil];
     48    // Nesting level can be 0 if the run loop is started externally (such as the case for XPC services).
     49    if (m_runLoop == main()->m_runLoop && m_nestingLevel <= 1) {
     50        ASSERT([NSApp isRunning]);
     51        [NSApp stop:nil];
    5152        NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined
    5253                                            location:NSMakePoint(0, 0)
Note: See TracChangeset for help on using the changeset viewer.