Changeset 258557 in webkit


Ignore:
Timestamp:
Mar 17, 2020 9:59:32 AM (4 years ago)
Author:
pvollan@apple.com
Message:

[Cocoa] Disable CF prefs direct mode
​https://bugs.webkit.org/show_bug.cgi?id=209166
<rdar://problem/60517387>

Reviewed by Brent Fulgham.

Revert <​https://trac.webkit.org/changeset/258064> by disabling the CF prefs direct mode feature,
since it caused performance regressions.

Source/WebKit:

  • Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:
  • Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:

(WebKit::XPCServiceMain):

  • UIProcess/Cocoa/PreferenceObserver.mm:
  • UIProcess/Cocoa/WebPageProxyCocoa.mm:

(WebKit::WebPageProxy::grantAccessToPreferenceService):

  • UIProcess/Cocoa/WebProcessPoolCocoa.mm:
  • UIProcess/Cocoa/WebProcessProxyCocoa.mm:
  • UIProcess/WebProcessPool.h:
  • UIProcess/WebProcessProxy.h:
  • WebProcess/WebProcess.h:
  • WebProcess/WebProcess.messages.in:

Source/WTF:

  • wtf/PlatformEnable.h:
Location:
trunk/Source
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r258547 r258557  
     12020-03-17  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Cocoa] Disable CF prefs direct mode
     4        https://bugs.webkit.org/show_bug.cgi?id=209166
     5        <rdar://problem/60517387>
     6
     7        Reviewed by Brent Fulgham.
     8
     9        Revert <https://trac.webkit.org/changeset/258064> by disabling the CF prefs direct mode feature,
     10        since it caused performance regressions.
     11
     12        * wtf/PlatformEnable.h:
     13
    1142020-03-17  Philippe Normand  <pnormand@igalia.com>
    215

  • trunk/Source/WTF/wtf/PlatformEnable.h

    r258181 r258557  
    872872#endif
    873873
    874 #define ENABLE_CFPREFS_DIRECT_MODE 1
     874#define ENABLE_CFPREFS_DIRECT_MODE 0

  • trunk/Source/WebKit/ChangeLog

    r258549 r258557  
     12020-03-17  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Cocoa] Disable CF prefs direct mode
     4        https://bugs.webkit.org/show_bug.cgi?id=209166
     5        <rdar://problem/60517387>
     6
     7        Reviewed by Brent Fulgham.
     8
     9        Revert <https://trac.webkit.org/changeset/258064> by disabling the CF prefs direct mode feature,
     10        since it caused performance regressions.
     11
     12        * Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:
     13        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
     14        (WebKit::XPCServiceMain):
     15        * UIProcess/Cocoa/PreferenceObserver.mm:
     16        * UIProcess/Cocoa/WebPageProxyCocoa.mm:
     17        (WebKit::WebPageProxy::grantAccessToPreferenceService):
     18        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     19        * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
     20        * UIProcess/WebProcessPool.h:
     21        * UIProcess/WebProcessProxy.h:
     22        * WebProcess/WebProcess.h:
     23        * WebProcess/WebProcess.messages.in:
     24
    1252020-03-17  Commit Queue  <commit-queue@webkit.org>
    226

  • trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb

    r258496 r258557  
    537537    (global-name "com.apple.logd")
    538538    (global-name "com.apple.logd.events")
     539    (global-name "com.apple.cfprefsd.daemon")
    539540)
    540541

  • trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm

    r258512 r258557  
    115115        _CFPrefsSetDirectModeEnabled(YES);
    116116    }
     117#else
     118    UNUSED_PARAM(argc);
     119    UNUSED_PARAM(argv);
    117120#endif
    118121

  • trunk/Source/WebKit/UIProcess/Cocoa/PreferenceObserver.mm

    r258515 r258557  
    221221- (void)preferenceDidChange:(NSString *)domain key:(NSString *)key encodedValue:(NSString *)encodedValue
    222222{
     223#if ENABLE(CFPREFS_DIRECT_MODE)
    223224    Optional<String> encodedString;
    224225    if (encodedValue)
    … …  
    226227    for (auto* processPool : WebKit::WebProcessPool::allProcessPools())
    227228        processPool->notifyPreferencesChanged(domain, key, encodedString);
     229#endif
    228230}
    229231@end

  • trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm

    r258086 r258557  
    353353void WebPageProxy::grantAccessToPreferenceService()
    354354{
     355#if ENABLE(CFPREFS_DIRECT_MODE)
    355356    process().unblockPreferenceServiceIfNeeded();
     357#endif
    356358}
    357359

  • trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r258518 r258557  
    852852}
    853853
     854#if ENABLE(CFPREFS_DIRECT_MODE)
    854855void WebProcessPool::notifyPreferencesChanged(const String& domain, const String& key, const Optional<String>& encodedValue)
    855856{
    … …  
    857858        process->send(Messages::WebProcess::NotifyPreferencesChanged(domain, key, encodedValue), 0);
    858859}
     860#endif
    859861
    860862} // namespace WebKit

  • trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm

    r258359 r258557  
    230230}
    231231
     232#if ENABLE(CFPREFS_DIRECT_MODE)
    232233void WebProcessProxy::unblockPreferenceServiceIfNeeded()
    233234{
    … …  
    246247    m_hasSentMessageToUnblockPreferenceService = true;
    247248}
    248 
    249 }
     249#endif
     250
     251}

  • trunk/Source/WebKit/UIProcess/WebProcessPool.h

    r258064 r258557  
    542542    bool useSeparateServiceWorkerProcess() const { return m_useSeparateServiceWorkerProcess; }
    543543
    544 #if PLATFORM(COCOA)
     544#if ENABLE(CFPREFS_DIRECT_MODE)
    545545    void notifyPreferencesChanged(const String& domain, const String& key, const Optional<String>& encodedValue);
    546546#endif

  • trunk/Source/WebKit/UIProcess/WebProcessProxy.h

    r258180 r258557  
    339339#if PLATFORM(COCOA)
    340340    void unblockAccessibilityServerIfNeeded();
     341#if ENABLE(CFPREFS_DIRECT_MODE)
    341342    void unblockPreferenceServiceIfNeeded();
     343#endif
    342344#endif
    343345

  • trunk/Source/WebKit/WebProcess/WebProcess.h

    r258335 r258557  
    303303    void enableRemoteWebInspector(const SandboxExtension::Handle&);
    304304#endif
     305    void unblockAccessibilityServer(const SandboxExtension::Handle&);
     306#if ENABLE(CFPREFS_DIRECT_MODE)
    305307    void notifyPreferencesChanged(const String& domain, const String& key, const Optional<String>& encodedValue);
    306     void unblockAccessibilityServer(const SandboxExtension::Handle&);
    307308    void unblockPreferenceService(const SandboxExtension::Handle&);
     309#endif
    308310#endif
    309311

  • trunk/Source/WebKit/WebProcess/WebProcess.messages.in

    r258340 r258557  
    168168
    169169#if PLATFORM(COCOA)
     170    UnblockAccessibilityServer(WebKit::SandboxExtension::Handle handle)
     171#if ENABLE(CFPREFS_DIRECT_MODE)
    170172    NotifyPreferencesChanged(String domain, String key, Optional<String> encodedValue)
    171     UnblockAccessibilityServer(WebKit::SandboxExtension::Handle handle)
    172173    UnblockPreferenceService(WebKit::SandboxExtension::Handle handle)
    173174#endif
     175#endif
    174176}

  • trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in

    r258518 r258557  
    679679#endif
    680680    (global-name "com.apple.PowerManagement.control")
    681 #if !ENABLE(CFPREFS_DIRECT_MODE)
    682681    (global-name "com.apple.cfprefsd.daemon")
    683 #endif
    684682    (global-name "com.apple.coreservices.launchservicesd")
    685683    (global-name "com.apple.lsd.mapdb")
Note: See TracChangeset for help on using the changeset viewer.