⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 286484 in webkit


Ignore:
Timestamp:
Dec 3, 2021, 12:06:10 AM (5 years ago)
Author:
commit-queue@webkit.org
Message:

Network process does not seem to initialize logging
​https://bugs.webkit.org/show_bug.cgi?id=233360
<rdar://problem/85765854>

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2021-12-03
Reviewed by Fujii Hironori.

Source/WebCore:

Export WebCore::logLevelString(), it's the canonical
method to obtain WebCore log configuration string.
It's already used in WebKit, but not on Cocoa platform
where the export matters.

  • platform/LogInitialization.h:

Source/WebKit:

Move GPUProcess and WebProcess process creation arguments
related to logging strings to new AuxiliaryProcessCreationParameters.
Use this in all auxiliary processes GPUProcess, WebProcess,
AuthnProcess and NetworkProcess.

Use the canonical WTF::logLevelString(), WebCore::logLevelString(),
WebKit::logLevelString() to initialize Cocoa WebKit2 logging settings
for process creation arguments.

Fixes bugs where

Tools/Scripts/run-minibrowser --debug -WebKit2Logging IPCMessages

would not print IPCMessages logging for NetworkProcess.

  • GPUProcess/GPUProcess.cpp:

(WebKit::GPUProcess::initializeGPUProcess):

  • GPUProcess/GPUProcessCreationParameters.cpp:

(WebKit::GPUProcessCreationParameters::encode const):
(WebKit::GPUProcessCreationParameters::decode):

  • GPUProcess/GPUProcessCreationParameters.h:
  • NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::initializeNetworkProcess):

  • NetworkProcess/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):

  • NetworkProcess/NetworkProcessCreationParameters.h:
  • Shared/AuxiliaryProcess.cpp:

(WebKit::AuxiliaryProcess::applyProcessCreationParameters):

  • Shared/AuxiliaryProcess.h:
  • Shared/AuxiliaryProcessCreationParameters.cpp: Copied from Source/WebKit/WebAuthnProcess/WebAuthnProcessCreationParameters.cpp.

(WebKit::AuxiliaryProcessCreationParameters::encode const):
(WebKit::AuxiliaryProcessCreationParameters::decode):

  • Shared/AuxiliaryProcessCreationParameters.h: Copied from Source/WebKit/WebAuthnProcess/WebAuthnProcessCreationParameters.h.
  • Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):

  • Shared/WebProcessCreationParameters.h:
  • Sources.txt:
  • UIProcess/AuxiliaryProcessProxy.cpp:

(WebKit::AuxiliaryProcessProxy::auxiliaryProcessParameters):

  • UIProcess/AuxiliaryProcessProxy.h:
  • UIProcess/Cocoa/GPUProcessProxyCocoa.mm:

(WebKit::GPUProcessProxy::platformInitializeGPUProcessParameters):

  • UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeWebProcess):

  • UIProcess/GPU/GPUProcessProxy.cpp:

(WebKit::GPUProcessProxy::GPUProcessProxy):
(WebKit::GPUProcessProxy::platformInitializeGPUProcessParameters):

  • UIProcess/GPU/GPUProcessProxy.h:
  • UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::sendCreationParametersToNewProcess):

  • UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp:

(WebKit::WebAuthnProcessProxy::singleton):

  • UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::initializeNewWebProcess):

  • WebAuthnProcess/WebAuthnProcess.cpp:

(WebKit::WebAuthnProcess::initializeWebAuthnProcess):

  • WebAuthnProcess/WebAuthnProcessCreationParameters.cpp:

(WebKit::WebAuthnProcessCreationParameters::encode const):
(WebKit::WebAuthnProcessCreationParameters::decode):

  • WebAuthnProcess/WebAuthnProcessCreationParameters.h:
  • WebKit.xcodeproj/project.pbxproj:
  • WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

  • WebProcess/playstation/WebProcessPlayStation.cpp:

(WebKit::WebProcess::platformInitializeWebProcess):

Location:
trunk/Source
Files:
29 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r286482 r286484  
     12021-12-03  Kimmo Kinnunen  <kkinnunen@apple.com>
     2
     3        Network process does not seem to initialize logging
     4        https://bugs.webkit.org/show_bug.cgi?id=233360
     5        <rdar://problem/85765854>
     6
     7        Reviewed by Fujii Hironori.
     8
     9        Export WebCore::logLevelString(), it's the canonical
     10        method to obtain WebCore log configuration string.
     11        It's already used in WebKit, but not on Cocoa platform
     12        where the export matters.
     13
     14        * platform/LogInitialization.h:
     15
    1162021-12-02  Chris Dumez  <cdumez@apple.com>
    217

  • trunk/Source/WebCore/platform/LogInitialization.h

    r280758 r286484  
    3434
    3535WEBCORE_EXPORT WTF::LogChannels& logChannels();
    36 String logLevelString();
     36WEBCORE_EXPORT String logLevelString();
    3737
    3838#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED

  • trunk/Source/WebKit/ChangeLog

    r286483 r286484  
     12021-12-03  Kimmo Kinnunen  <kkinnunen@apple.com>
     2
     3        Network process does not seem to initialize logging
     4        https://bugs.webkit.org/show_bug.cgi?id=233360
     5        <rdar://problem/85765854>
     6
     7        Reviewed by Fujii Hironori.
     8
     9        Move GPUProcess and WebProcess process creation arguments
     10        related to logging strings to new AuxiliaryProcessCreationParameters.
     11        Use this in all auxiliary processes GPUProcess, WebProcess,
     12        AuthnProcess and NetworkProcess.
     13
     14        Use the canonical WTF::logLevelString(), WebCore::logLevelString(),
     15        WebKit::logLevelString() to initialize Cocoa WebKit2 logging settings
     16        for process creation arguments.
     17
     18        Fixes bugs where
     19         Tools/Scripts/run-minibrowser --debug -WebKit2Logging IPCMessages
     20        would not print IPCMessages logging for NetworkProcess.
     21
     22        * GPUProcess/GPUProcess.cpp:
     23        (WebKit::GPUProcess::initializeGPUProcess):
     24        * GPUProcess/GPUProcessCreationParameters.cpp:
     25        (WebKit::GPUProcessCreationParameters::encode const):
     26        (WebKit::GPUProcessCreationParameters::decode):
     27        * GPUProcess/GPUProcessCreationParameters.h:
     28        * NetworkProcess/NetworkProcess.cpp:
     29        (WebKit::NetworkProcess::initializeNetworkProcess):
     30        * NetworkProcess/NetworkProcessCreationParameters.cpp:
     31        (WebKit::NetworkProcessCreationParameters::encode const):
     32        (WebKit::NetworkProcessCreationParameters::decode):
     33        * NetworkProcess/NetworkProcessCreationParameters.h:
     34        * Shared/AuxiliaryProcess.cpp:
     35        (WebKit::AuxiliaryProcess::applyProcessCreationParameters):
     36        * Shared/AuxiliaryProcess.h:
     37        * Shared/AuxiliaryProcessCreationParameters.cpp: Copied from Source/WebKit/WebAuthnProcess/WebAuthnProcessCreationParameters.cpp.
     38        (WebKit::AuxiliaryProcessCreationParameters::encode const):
     39        (WebKit::AuxiliaryProcessCreationParameters::decode):
     40        * Shared/AuxiliaryProcessCreationParameters.h: Copied from Source/WebKit/WebAuthnProcess/WebAuthnProcessCreationParameters.h.
     41        * Shared/WebProcessCreationParameters.cpp:
     42        (WebKit::WebProcessCreationParameters::encode const):
     43        (WebKit::WebProcessCreationParameters::decode):
     44        * Shared/WebProcessCreationParameters.h:
     45        * Sources.txt:
     46        * UIProcess/AuxiliaryProcessProxy.cpp:
     47        (WebKit::AuxiliaryProcessProxy::auxiliaryProcessParameters):
     48        * UIProcess/AuxiliaryProcessProxy.h:
     49        * UIProcess/Cocoa/GPUProcessProxyCocoa.mm:
     50        (WebKit::GPUProcessProxy::platformInitializeGPUProcessParameters):
     51        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     52        (WebKit::WebProcessPool::platformInitializeWebProcess):
     53        * UIProcess/GPU/GPUProcessProxy.cpp:
     54        (WebKit::GPUProcessProxy::GPUProcessProxy):
     55        (WebKit::GPUProcessProxy::platformInitializeGPUProcessParameters):
     56        * UIProcess/GPU/GPUProcessProxy.h:
     57        * UIProcess/Network/NetworkProcessProxy.cpp:
     58        (WebKit::NetworkProcessProxy::sendCreationParametersToNewProcess):
     59        * UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp:
     60        (WebKit::WebAuthnProcessProxy::singleton):
     61        * UIProcess/WebProcessPool.cpp:
     62        (WebKit::WebProcessPool::initializeNewWebProcess):
     63        * WebAuthnProcess/WebAuthnProcess.cpp:
     64        (WebKit::WebAuthnProcess::initializeWebAuthnProcess):
     65        * WebAuthnProcess/WebAuthnProcessCreationParameters.cpp:
     66        (WebKit::WebAuthnProcessCreationParameters::encode const):
     67        (WebKit::WebAuthnProcessCreationParameters::decode):
     68        * WebAuthnProcess/WebAuthnProcessCreationParameters.h:
     69        * WebKit.xcodeproj/project.pbxproj:
     70        * WebProcess/cocoa/WebProcessCocoa.mm:
     71        (WebKit::WebProcess::platformInitializeWebProcess):
     72        * WebProcess/playstation/WebProcessPlayStation.cpp:
     73        (WebKit::WebProcess::platformInitializeWebProcess):
     74
    1752021-12-02  Tim Horton  <timothy_horton@apple.com>
    276

  • trunk/Source/WebKit/GPUProcess/GPUProcess.cpp

    r285584 r286484  
    212212void GPUProcess::initializeGPUProcess(GPUProcessCreationParameters&& parameters)
    213213{
     214    applyProcessCreationParameters(parameters.auxiliaryProcessParameters);
    214215    RELEASE_LOG(Process, "%p - GPUProcess::initializeGPUProcess:", this);
    215216    WTF::Thread::setCurrentThreadIsUserInitiated();
    … …  
    248249#endif
    249250
    250 #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
    251     WTF::logChannels().initializeLogChannelsIfNecessary(parameters.wtfLoggingChannels);
    252     WebCore::logChannels().initializeLogChannelsIfNecessary(parameters.webCoreLoggingChannels);
    253     WebKit::logChannels().initializeLogChannelsIfNecessary(parameters.webKitLoggingChannels);
    254 #endif
    255 
    256251    m_applicationVisibleName = WTFMove(parameters.applicationVisibleName);
    257252

  • trunk/Source/WebKit/GPUProcess/GPUProcessCreationParameters.cpp

    r282803 r286484  
    4242void GPUProcessCreationParameters::encode(IPC::Encoder& encoder) const
    4343{
     44    encoder << auxiliaryProcessParameters;
    4445#if ENABLE(MEDIA_STREAM)
    4546    encoder << useMockCaptureDevices;
    … …  
    6061#endif
    6162
    62     encoder << wtfLoggingChannels;
    63     encoder << webCoreLoggingChannels;
    64     encoder << webKitLoggingChannels;
    65 
    6663    encoder << applicationVisibleName;
    6764}
    … …  
    6966bool GPUProcessCreationParameters::decode(IPC::Decoder& decoder, GPUProcessCreationParameters& result)
    7067{
     68    if (!decoder.decode(result.auxiliaryProcessParameters))
     69        return false;
    7170#if ENABLE(MEDIA_STREAM)
    7271    if (!decoder.decode(result.useMockCaptureDevices))
    … …  
    113112#endif
    114113
    115     if (!decoder.decode(result.wtfLoggingChannels))
    116         return false;
    117     if (!decoder.decode(result.webCoreLoggingChannels))
    118         return false;
    119     if (!decoder.decode(result.webKitLoggingChannels))
    120         return false;
    121 
    122114    if (!decoder.decode(result.applicationVisibleName))
    123115        return false;

  • trunk/Source/WebKit/GPUProcess/GPUProcessCreationParameters.h

    r282803 r286484  
    2828#if ENABLE(GPU_PROCESS)
    2929
     30#include "AuxiliaryProcessCreationParameters.h"
    3031#include "SandboxExtension.h"
    3132#include <wtf/ProcessID.h>
     33
    3234namespace IPC {
    3335class Decoder;
    … …  
    4042    GPUProcessCreationParameters();
    4143
     44    AuxiliaryProcessCreationParameters auxiliaryProcessParameters;
    4245#if ENABLE(MEDIA_STREAM)
    4346    bool useMockCaptureDevices { false };
    … …  
    5861#endif
    5962
    60     String wtfLoggingChannels;
    61     String webCoreLoggingChannels;
    62     String webKitLoggingChannels;
    63 
    6463    String applicationVisibleName;
    6564

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

    r286012 r286484  
    324324void NetworkProcess::initializeNetworkProcess(NetworkProcessCreationParameters&& parameters)
    325325{
     326    applyProcessCreationParameters(parameters.auxiliaryProcessParameters);
    326327#if HAVE(SEC_KEY_PROXY)
    327328    WTF::setProcessPrivileges({ ProcessPrivilege::CanAccessRawCookies });

  • trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp

    r283504 r286484  
    4444void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
    4545{
     46    encoder << auxiliaryProcessParameters;
    4647    encoder << cacheModel;
    4748#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
    … …  
    7879bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProcessCreationParameters& result)
    7980{
     81    if (!decoder.decode(result.auxiliaryProcessParameters))
     82        return false;
     83
    8084    if (!decoder.decode(result.cacheModel))
    8185        return false;

  • trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h

    r283504 r286484  
    2626#pragma once
    2727
     28#include "AuxiliaryProcessCreationParameters.h"
    2829#include "CacheModel.h"
    2930#include "SandboxExtension.h"
    … …  
    5556    void encode(IPC::Encoder&) const;
    5657    static WARN_UNUSED_RETURN bool decode(IPC::Decoder&, NetworkProcessCreationParameters&);
     58
     59    AuxiliaryProcessCreationParameters auxiliaryProcessParameters;
    5760
    5861    CacheModel cacheModel { CacheModel::DocumentViewer };

  • trunk/Source/WebKit/Shared/AuxiliaryProcess.cpp

    r280795 r286484  
    2727#include "AuxiliaryProcess.h"
    2828
     29#include "AuxiliaryProcessCreationParameters.h"
    2930#include "ContentWorldShared.h"
    3031#include "LogInitialization.h"
    … …  
    246247}
    247248
     249void AuxiliaryProcess::applyProcessCreationParameters(const AuxiliaryProcessCreationParameters& parameters)
     250{
     251#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
     252    WTF::logChannels().initializeLogChannelsIfNecessary(parameters.wtfLoggingChannels);
     253    WebCore::logChannels().initializeLogChannelsIfNecessary(parameters.webCoreLoggingChannels);
     254    WebKit::logChannels().initializeLogChannelsIfNecessary(parameters.webKitLoggingChannels);
     255#endif
     256}
     257
    248258#if !PLATFORM(COCOA)
    249259void AuxiliaryProcess::platformInitialize(const AuxiliaryProcessInitializationParameters&)

  • trunk/Source/WebKit/Shared/AuxiliaryProcess.h

    r282669 r286484  
    4747class SandboxInitializationParameters;
    4848struct AuxiliaryProcessInitializationParameters;
     49struct AuxiliaryProcessCreationParameters;
    4950
    5051class AuxiliaryProcess : public IPC::Connection::Client, public IPC::MessageSender {
    … …  
    144145    virtual void dispatchSimulatedNotificationsForPreferenceChange(const String& key) { }
    145146#endif
     147    void applyProcessCreationParameters(const AuxiliaryProcessCreationParameters&);
    146148
    147149private:

  • trunk/Source/WebKit/Shared/AuxiliaryProcessCreationParameters.cpp

    r286483 r286484  
    11/*
    2  * Copyright (C) 2020 Apple Inc. All rights reserved.
     2 * Copyright (C) 2021 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2525
    2626#include "config.h"
    27 #include "WebAuthnProcessCreationParameters.h"
    28 
    29 #if ENABLE(WEB_AUTHN)
     27#include "AuxiliaryProcessCreationParameters.h"
    3028
    3129#include "ArgumentCoders.h"
    3230#include "WebCoreArgumentCoders.h"
    3331
    34 #if PLATFORM(COCOA)
    35 #include "ArgumentCodersCF.h"
    36 #endif
    37 
    3832namespace WebKit {
    3933
    40 WebAuthnProcessCreationParameters::WebAuthnProcessCreationParameters() = default;
     34AuxiliaryProcessCreationParameters::AuxiliaryProcessCreationParameters() = default;
    4135
    42 void WebAuthnProcessCreationParameters::encode(IPC::Encoder& encoder) const
     36void AuxiliaryProcessCreationParameters::encode(IPC::Encoder& encoder) const
    4337{
     38    encoder << wtfLoggingChannels;
     39    encoder << webCoreLoggingChannels;
     40    encoder << webKitLoggingChannels;
    4441}
    4542
    46 bool WebAuthnProcessCreationParameters::decode(IPC::Decoder& decoder, WebAuthnProcessCreationParameters& result)
     43bool AuxiliaryProcessCreationParameters::decode(IPC::Decoder& decoder, AuxiliaryProcessCreationParameters& result)
    4744{
     45    if (!decoder.decode(result.wtfLoggingChannels))
     46        return false;
     47    if (!decoder.decode(result.webCoreLoggingChannels))
     48        return false;
     49    if (!decoder.decode(result.webKitLoggingChannels))
     50        return false;
    4851    return true;
    4952}
    5053
    51 } // namespace WebKit
    52 
    53 #endif // ENABLE(WEB_AUTHN)
     54}

  • trunk/Source/WebKit/Shared/AuxiliaryProcessCreationParameters.h

    r286483 r286484  
    11/*
    2  * Copyright (C) 2020 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019-2021 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2626#pragma once
    2727
    28 #if ENABLE(WEB_AUTHN)
     28#include <wtf/text/WTFString.h>
    2929
    3030namespace IPC {
    … …  
    3535namespace WebKit {
    3636
    37 struct WebAuthnProcessCreationParameters {
    38     WebAuthnProcessCreationParameters();
     37// Parameters that are sent to the process object as the first message after process has started.
     38struct AuxiliaryProcessCreationParameters {
     39    AuxiliaryProcessCreationParameters();
     40
     41    String wtfLoggingChannels;
     42    String webCoreLoggingChannels;
     43    String webKitLoggingChannels;
    3944
    4045    void encode(IPC::Encoder&) const;
    41     static WARN_UNUSED_RETURN bool decode(IPC::Decoder&, WebAuthnProcessCreationParameters&);
     46    static WARN_UNUSED_RETURN bool decode(IPC::Decoder&, AuxiliaryProcessCreationParameters&);
    4247};
    4348
    4449} // namespace WebKit
    45 
    46 #endif // ENABLE(WEB_AUTHN)

  • trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

    r285634 r286484  
    4848void WebProcessCreationParameters::encode(IPC::Encoder& encoder) const
    4949{
     50    encoder << auxiliaryProcessParameters;
    5051    encoder << injectedBundlePath;
    5152    encoder << injectedBundlePathExtensionHandle;
    … …  
    6061    encoder << enableRemoteWebInspectorExtensionHandle;
    6162#endif
    62     encoder << wtfLoggingChannels;
    63     encoder << webCoreLoggingChannels;
    64     encoder << webKitLoggingChannels;
    6563#if ENABLE(MEDIA_STREAM)
    6664    encoder << audioCaptureExtensionHandle;
    … …  
    228226bool WebProcessCreationParameters::decode(IPC::Decoder& decoder, WebProcessCreationParameters& parameters)
    229227{
     228    if (!decoder.decode(parameters.auxiliaryProcessParameters))
     229        return false;
    230230    if (!decoder.decode(parameters.injectedBundlePath))
    231231        return false;
    … …  
    273273    parameters.enableRemoteWebInspectorExtensionHandle = WTFMove(*enableRemoteWebInspectorExtensionHandle);
    274274#endif
    275 
    276     if (!decoder.decode(parameters.wtfLoggingChannels))
    277         return false;
    278     if (!decoder.decode(parameters.webCoreLoggingChannels))
    279         return false;
    280     if (!decoder.decode(parameters.webKitLoggingChannels))
    281         return false;
    282 
    283275#if ENABLE(MEDIA_STREAM)
    284 
    285276    std::optional<SandboxExtension::Handle> audioCaptureExtensionHandle;
    286277    decoder >> audioCaptureExtensionHandle;

  • trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

    r285634 r286484  
    2727
    2828#include "AccessibilityPreferences.h"
     29#include "AuxiliaryProcessCreationParameters.h"
    2930#include "CacheModel.h"
    3031#include "SandboxExtension.h"
    … …  
    7475    static WARN_UNUSED_RETURN bool decode(IPC::Decoder&, WebProcessCreationParameters&);
    7576
     77    AuxiliaryProcessCreationParameters auxiliaryProcessParameters;
    7678    String injectedBundlePath;
    7779    SandboxExtension::Handle injectedBundlePathExtensionHandle;
    … …  
    9193    SandboxExtension::Handle audioCaptureExtensionHandle;
    9294#endif
    93 
    94     String wtfLoggingChannels;
    95     String webCoreLoggingChannels;
    96     String webKitLoggingChannels;
    9795
    9896    Vector<String> urlSchemesRegisteredAsEmptyDocument;

  • trunk/Source/WebKit/Sources.txt

    r286459 r286484  
    209209Shared/ActivityAssertion.cpp @no-unify
    210210Shared/AuxiliaryProcess.cpp @no-unify
     211Shared/AuxiliaryProcessCreationParameters.cpp @no-unify
    211212Shared/BlobDataFileReferenceWithSandboxExtension.cpp @no-unify
    212213Shared/CacheModel.cpp

  • trunk/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp

    r285115 r286484  
    2828
    2929#include "AuxiliaryProcessMessages.h"
     30#include "LogInitialization.h"
    3031#include "Logging.h"
    3132#include "WebPageProxy.h"
    3233#include "WebProcessProxy.h"
     34#include <WebCore/LogInitialization.h>
     35#include <wtf/LogInitialization.h>
    3336#include <wtf/RunLoop.h>
    3437
    … …  
    402405}
    403406
     407AuxiliaryProcessCreationParameters AuxiliaryProcessProxy::auxiliaryProcessParameters()
     408{
     409    AuxiliaryProcessCreationParameters parameters;
     410#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
     411    parameters.wtfLoggingChannels = WTF::logLevelString();
     412    parameters.webCoreLoggingChannels = WebCore::logLevelString();
     413    parameters.webKitLoggingChannels = WebKit::logLevelString();
     414#endif
     415    return parameters;
     416}
     417
    404418} // namespace WebKit

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

    r285115 r286484  
    2626#pragma once
    2727
     28#include "AuxiliaryProcessCreationParameters.h"
    2829#include "Connection.h"
    2930#include "MessageReceiverMap.h"
    … …  
    4849public:
    4950    virtual ~AuxiliaryProcessProxy();
     51
     52    static AuxiliaryProcessCreationParameters auxiliaryProcessParameters();
    5053
    5154    void connect();

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

    r282803 r286484  
    3636void GPUProcessProxy::platformInitializeGPUProcessParameters(GPUProcessCreationParameters& parameters)
    3737{
    38 #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
    39     parameters.wtfLoggingChannels = [[NSUserDefaults standardUserDefaults] stringForKey:@"WTFLogging"];
    40     parameters.webCoreLoggingChannels = [[NSUserDefaults standardUserDefaults] stringForKey:@"WebCoreLogging"];
    41     parameters.webKitLoggingChannels = [[NSUserDefaults standardUserDefaults] stringForKey:@"WebKit2Logging"];
    42 #endif
    43 
    4438    parameters.applicationVisibleName = applicationVisibleName();
    4539}

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

    r286214 r286484  
    399399#endif
    400400
    401 #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
    402     parameters.wtfLoggingChannels = [[NSUserDefaults standardUserDefaults] stringForKey:@"WTFLogging"];
    403     parameters.webCoreLoggingChannels = [[NSUserDefaults standardUserDefaults] stringForKey:@"WebCoreLogging"];
    404     parameters.webKitLoggingChannels = [[NSUserDefaults standardUserDefaults] stringForKey:@"WebKit2Logging"];
    405 #endif
    406 
    407401#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
    408402    // FIXME: Remove this and related parameter when <rdar://problem/29448368> is fixed.

  • trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp

    r286386 r286484  
    139139
    140140    GPUProcessCreationParameters parameters;
     141    parameters.auxiliaryProcessParameters = auxiliaryProcessParameters();
     142
    141143#if ENABLE(MEDIA_STREAM)
    142144    parameters.useMockCaptureDevices = m_useMockCaptureDevices;
    … …  
    656658void GPUProcessProxy::platformInitializeGPUProcessParameters(GPUProcessCreationParameters& parameters)
    657659{
    658 #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
    659     parameters.wtfLoggingChannels = WTF::logLevelString();
    660     parameters.webCoreLoggingChannels = WebCore::logLevelString();
    661     parameters.webKitLoggingChannels = WebKit::logLevelString();
    662 #endif
    663660}
    664661#endif

  • trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.h

    r285477 r286484  
    139139#endif
    140140
     141    GPUProcessCreationParameters processCreationParameters();
    141142    void platformInitializeGPUProcessParameters(GPUProcessCreationParameters&);
    142143

  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

    r286084 r286484  
    180180
    181181    NetworkProcessCreationParameters parameters;
     182    parameters.auxiliaryProcessParameters = auxiliaryProcessParameters();
    182183    parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure());
    183184    parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsBypassingContentSecurityPolicy());

  • trunk/Source/WebKit/UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp

    r285619 r286484  
    6464    auto createAndInitializeNewProcess = [] {
    6565        auto webAuthnProcess = adoptRef(*new WebAuthnProcessProxy);
    66 
    6766        WebAuthnProcessCreationParameters parameters;
    68 
     67        parameters.auxiliaryProcessParameters = webAuthnProcess->auxiliaryProcessParameters();
    6968        // Initialize the WebAuthn process.
    7069        webAuthnProcess->send(Messages::WebAuthnProcess::InitializeWebAuthnProcess(parameters), 0);

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

    r286386 r286484  
    3838#include "APIProcessPoolConfiguration.h"
    3939#include "AuxiliaryProcessMessages.h"
     40#include "AuxiliaryProcessProxy.h"
    4041#include "DownloadProxy.h"
    4142#include "DownloadProxyMessages.h"
    … …  
    777778
    778779    WebProcessCreationParameters parameters;
     780    parameters.auxiliaryProcessParameters = AuxiliaryProcessProxy::auxiliaryProcessParameters();
    779781
    780782    parameters.injectedBundlePath = m_resolvedPaths.injectedBundlePath;

  • trunk/Source/WebKit/WebAuthnProcess/WebAuthnProcess.cpp

    r283183 r286484  
    9393void WebAuthnProcess::initializeWebAuthnProcess(WebAuthnProcessCreationParameters&& parameters)
    9494{
     95    applyProcessCreationParameters(parameters.auxiliaryProcessParameters);
    9596    WTF::Thread::setCurrentThreadIsUserInitiated();
    9697    AtomString::init();

  • trunk/Source/WebKit/WebAuthnProcess/WebAuthnProcessCreationParameters.cpp

    r268605 r286484  
    4242void WebAuthnProcessCreationParameters::encode(IPC::Encoder& encoder) const
    4343{
     44    encoder << auxiliaryProcessParameters;
    4445}
    4546
    4647bool WebAuthnProcessCreationParameters::decode(IPC::Decoder& decoder, WebAuthnProcessCreationParameters& result)
    4748{
     49    if (!decoder.decode(result.auxiliaryProcessParameters))
     50        return false;
    4851    return true;
    4952}

  • trunk/Source/WebKit/WebAuthnProcess/WebAuthnProcessCreationParameters.h

    r268605 r286484  
    2828#if ENABLE(WEB_AUTHN)
    2929
     30#include "AuxiliaryProcessCreationParameters.h"
     31
    3032namespace IPC {
    3133class Decoder;
    … …  
    3739struct WebAuthnProcessCreationParameters {
    3840    WebAuthnProcessCreationParameters();
     41    AuxiliaryProcessCreationParameters auxiliaryProcessParameters;
    3942
    4043    void encode(IPC::Encoder&) const;

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r286455 r286484  
    13421342                7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BAB110F25DD02B2008FC479 /* ScopedActiveMessageReceiveQueue.h */; };
    13431343                7BCF70DE2615D06E00E4FB70 /* ScopedRenderingResourcesRequestCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7BCF70CB2614935E00E4FB70 /* ScopedRenderingResourcesRequestCocoa.mm */; };
     1344                7BDDA3422758C98F0038659E /* AuxiliaryProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BDDA340275652EA0038659E /* AuxiliaryProcessCreationParameters.cpp */; };
    13441345                7C065F2C1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C065F2A1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h */; };
    13451346                7C135AA9173B0BCA00586AE2 /* WKPluginInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C135AA7173B0BCA00586AE2 /* WKPluginInformation.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    50235024                7BCF70CD2614935F00E4FB70 /* ScopedRenderingResourcesRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScopedRenderingResourcesRequest.h; sourceTree = "<group>"; };
    50245025                7BCF70CE2614935F00E4FB70 /* ScopedWebGLRenderingResourcesRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScopedWebGLRenderingResourcesRequest.h; sourceTree = "<group>"; };
     5026                7BDDA33F275652EA0038659E /* AuxiliaryProcessCreationParameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AuxiliaryProcessCreationParameters.h; sourceTree = "<group>"; };
     5027                7BDDA340275652EA0038659E /* AuxiliaryProcessCreationParameters.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AuxiliaryProcessCreationParameters.cpp; sourceTree = "<group>"; };
    50255028                7BE726572574F67200E85D98 /* RemoteGraphicsContextGLProxyFunctionsGenerated.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteGraphicsContextGLProxyFunctionsGenerated.cpp; sourceTree = "<group>"; };
    50265029                7BE72668257680EF00E85D98 /* RemoteGraphicsContextGLCocoa.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteGraphicsContextGLCocoa.cpp; sourceTree = "<group>"; };
    … …  
    70307033                                1A2D956D12848564001EB962 /* AuxiliaryProcess.h */,
    70317034                                5164C0941B05B757004F102A /* AuxiliaryProcess.messages.in */,
     7035                                7BDDA340275652EA0038659E /* AuxiliaryProcessCreationParameters.cpp */,
     7036                                7BDDA33F275652EA0038659E /* AuxiliaryProcessCreationParameters.h */,
    70327037                                290F4271172A0C7400939FF0 /* AuxiliaryProcessSupplement.h */,
    70337038                                E164A2EF191AF14E0010737D /* BlobDataFileReferenceWithSandboxExtension.cpp */,
    … …  
    1506715072                                9955A6F61C7986E300EB6A93 /* AutomationProtocolObjects.cpp in Sources */,
    1506815073                                2D92A786212B6AB100F493FD /* AuxiliaryProcess.cpp in Sources */,
     15074                                7BDDA3422758C98F0038659E /* AuxiliaryProcessCreationParameters.cpp in Sources */,
    1506915075                                51FAEC3B1B0657680009C4E7 /* AuxiliaryProcessMessageReceiver.cpp in Sources */,
    1507015076                                2D92A785212B6AB100F493FD /* BlobDataFileReferenceWithSandboxExtension.cpp in Sources */,

  • trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

    r286423 r286484  
    225225void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
    226226{
     227    applyProcessCreationParameters(parameters.auxiliaryProcessParameters);
     228
    227229    setQOS(parameters.latencyQOS, parameters.throughputQOS);
    228230   
    … …  
    268270    }
    269271
    270 #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
    271     WTF::logChannels().initializeLogChannelsIfNecessary(parameters.wtfLoggingChannels);
    272     WebCore::logChannels().initializeLogChannelsIfNecessary(parameters.webCoreLoggingChannels);
    273     WebKit::logChannels().initializeLogChannelsIfNecessary(parameters.webKitLoggingChannels);
    274 #endif
    275 
    276272    m_uiProcessBundleIdentifier = parameters.uiProcessBundleIdentifier;
    277273

  • trunk/Source/WebKit/WebProcess/playstation/WebProcessPlayStation.cpp

    r284525 r286484  
    3333namespace WebKit {
    3434
    35 void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
     35void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&)
    3636{
    37 #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
    38     WTF::logChannels().initializeLogChannelsIfNecessary(parameters.wtfLoggingChannels);
    39     WebCore::logChannels().initializeLogChannelsIfNecessary(parameters.webCoreLoggingChannels);
    40     WebKit::logChannels().initializeLogChannelsIfNecessary(parameters.webKitLoggingChannels);
    41 #else
    42     UNUSED_PARAM(parameters);
    43 #endif
    4437}
    4538
Note: See TracChangeset for help on using the changeset viewer.