Changeset 225863 in webkit


Ignore:
Timestamp:
Dec 13, 2017 12:19:08 PM (6 years ago)
Author:
pvollan@apple.com
Message:

REGRESSION(225597): Can't select a text box or web view on a page when VO is on.
https://bugs.webkit.org/show_bug.cgi?id=180756
<rdar://problem/35996158>

Reviewed by Brent Fulgham.

Source/WebCore:

No new tests.

  • platform/mac/EventLoopMac.mm:

(WebCore::EventLoop::cycle):

Source/WebKit:

  • Platform/IPC/mac/ConnectionMac.mm:

(IPC::AccessibilityProcessSuspendedNotification):

  • UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::shouldLeakBoost):

  • WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist:
  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeProcess):

Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r225862 r225863  
     12017-12-13  Per Arne Vollan  <pvollan@apple.com>
     2
     3        REGRESSION(225597): Can't select a text box or web view on a page when VO is on.
     4        https://bugs.webkit.org/show_bug.cgi?id=180756
     5        <rdar://problem/35996158>
     6
     7        Reviewed by Brent Fulgham.
     8
     9        No new tests.
     10
     11        * platform/mac/EventLoopMac.mm:
     12        (WebCore::EventLoop::cycle):
     13
    1142017-12-13  Antoine Quint  <graouts@apple.com>
    215
  • trunk/Source/WebCore/platform/mac/EventLoopMac.mm

    r225597 r225863  
    3131void EventLoop::cycle()
    3232{
     33#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
    3334    if (![NSApp isRunning]) {
    3435        [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.05]];
    3536        return;
    3637    }
     38#endif
    3739    [NSApp setWindowsNeedUpdate:YES];
    3840    if (NSEvent *event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate dateWithTimeIntervalSinceNow:0.05] inMode:NSDefaultRunLoopMode dequeue:YES])
  • trunk/Source/WebKit/ChangeLog

    r225858 r225863  
     12017-12-13  Per Arne Vollan  <pvollan@apple.com>
     2
     3        REGRESSION(225597): Can't select a text box or web view on a page when VO is on.
     4        https://bugs.webkit.org/show_bug.cgi?id=180756
     5        <rdar://problem/35996158>
     6
     7        Reviewed by Brent Fulgham.
     8
     9        * Platform/IPC/mac/ConnectionMac.mm:
     10        (IPC::AccessibilityProcessSuspendedNotification):
     11        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
     12        (WebKit::shouldLeakBoost):
     13        * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist:
     14        * WebProcess/WebProcess.cpp:
     15        (WebKit::WebProcess::initializeProcess):
     16
    1172017-12-13  Brent Fulgham  <bfulgham@apple.com>
    218
  • trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm

    r225597 r225863  
    587587{
    588588#if PLATFORM(MAC)
     589#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
    589590    // Calling _AXUIElementNotifyProcessSuspendStatus will crash if the NSApplication event loop is not running.
    590591    if (![NSApp isRunning])
    591592        return;
     593#endif
    592594    _AXUIElementNotifyProcessSuspendStatus(suspended ? AXSuspendStatusSuspended : AXSuspendStatusRunning);
    593595#elif PLATFORM(IOS)
  • trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm

    r225597 r225863  
    7777    return true;
    7878#else
     79#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     80    // Boost the WebContent process if the NSApplication run loop is not used.
     81    if (launchOptions.processType == ProcessLauncher::ProcessType::Web)
     82        return true;
     83#endif
    7984    // On Mac, leak a boost onto the NetworkProcess.
    80     return launchOptions.processType == ProcessLauncher::ProcessType::Network
    81         || launchOptions.processType == ProcessLauncher::ProcessType::Web;
     85    return launchOptions.processType == ProcessLauncher::ProcessType::Network;
    8286#endif
    8387}
  • trunk/Source/WebKit/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist

    r225597 r225863  
    4646                <string>Application</string>
    4747                <key>RunLoopType</key>
    48                 <string>NSRunLoop</string>
     48                <string>_NSApplicationMain</string>
    4949                <key>_MultipleInstances</key>
    5050                <true/>
  • trunk/Source/WebKit/WebProcess/WebProcess.cpp

    r225751 r225863  
    217217void WebProcess::initializeProcess(const ChildProcessInitializationParameters& parameters)
    218218{
    219 #if PLATFORM(COCOA) && !PLATFORM(IOS)
     219#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
    220220    // This call is needed when the WebProcess is not running the NSApplication event loop.
    221221    // Otherwise, calling enableSandboxStyleFileQuarantine() will fail.
Note: See TracChangeset for help on using the changeset viewer.