Changeset 273183 in webkit


Ignore:
Timestamp:
Feb 19, 2021 4:46:44 PM (3 years ago)
Author:
Chris Dumez
Message:

Make format of release logging more consistent to facilitate grepping
https://bugs.webkit.org/show_bug.cgi?id=222200

Reviewed by Simon Fraser.

Source/WebCore:

  • loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::setMainDocumentError):
(WebCore::DocumentLoader::mainReceivedError):
(WebCore::DocumentLoader::notifyFinished):
(WebCore::DocumentLoader::continueAfterContentPolicy):
(WebCore::DocumentLoader::startLoadingMainResource):
(WebCore::DocumentLoader::cancelMainResourceLoad):

  • loader/SubresourceLoader.cpp:

(WebCore::SubresourceLoader::didFail):
(WebCore::SubresourceLoader::willCancel):

  • workers/service/ServiceWorker.cpp:

(WebCore::ServiceWorker::ServiceWorker):
(WebCore::ServiceWorker::updateState):

  • workers/service/ServiceWorkerContainer.cpp:

(WebCore::ServiceWorkerContainer::addRegistration):
(WebCore::ServiceWorkerContainer::updateRegistration):
(WebCore::ServiceWorkerContainer::jobResolvedWithRegistration):

  • workers/service/ServiceWorkerRegistration.cpp:

(WebCore::ServiceWorkerRegistration::ServiceWorkerRegistration):

  • workers/service/server/SWServerJobQueue.cpp:

(WebCore::SWServerJobQueue::scriptFetchFinished):
(WebCore::SWServerJobQueue::didResolveRegistrationPromise):

Source/WebKit:

  • NetworkProcess/NetworkCORSPreflightChecker.cpp:

(WebKit::NetworkCORSPreflightChecker::didCompleteWithError):

  • NetworkProcess/NetworkLoadChecker.cpp:

(WebKit::NetworkLoadChecker::checkCORSRequestWithPreflight):

  • NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::didReceiveMessage):
(WebKit::NetworkProcess::didReceiveSyncMessage):
(WebKit::NetworkProcess::initializeNetworkProcess):
(WebKit::NetworkProcess::prepareToSuspend):

  • NetworkProcess/PingLoad.cpp:

(WebKit::PingLoad::didReceiveResponse):
(WebKit::PingLoad::didCompleteWithError):

  • NetworkProcess/PreconnectTask.cpp:

(WebKit::PreconnectTask::didFailLoading):

  • NetworkProcess/ServiceWorker/WebSWServerConnection.cpp:

(WebKit::WebSWServerConnection::startFetch):

  • NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:

(WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
(WebKit::NetworkDataTaskCocoa::willPerformHTTPRedirection):

  • Platform/IPC/Connection.cpp:

(IPC::Connection::waitForSyncReply):

  • UIProcess/ApplicationStateTracker.mm:

(WebKit::ApplicationStateTracker::ApplicationStateTracker):

  • UIProcess/AuxiliaryProcessProxy.cpp:

(WebKit::AuxiliaryProcessProxy::terminate):

  • UIProcess/ProcessThrottler.cpp:

(WebKit::ProcessThrottler::setAssertionType):
(WebKit::ProcessThrottler::updateAssertionIfNeeded):
(WebKit::ProcessThrottler::sendPrepareToSuspendIPC):

  • UIProcess/ProvisionalPageProxy.cpp:

(WebKit::ProvisionalPageProxy::ProvisionalPageProxy):
(WebKit::ProvisionalPageProxy::processDidTerminate):
(WebKit::ProvisionalPageProxy::cancel):
(WebKit::ProvisionalPageProxy::loadData):
(WebKit::ProvisionalPageProxy::loadRequest):
(WebKit::ProvisionalPageProxy::goToBackForwardItem):
(WebKit::ProvisionalPageProxy::didCreateMainFrame):
(WebKit::ProvisionalPageProxy::didStartProvisionalLoadForFrame):
(WebKit::ProvisionalPageProxy::didFailProvisionalLoadForFrame):
(WebKit::ProvisionalPageProxy::didCommitLoadForFrame):
(WebKit::ProvisionalPageProxy::didCreateContextForVisibilityPropagation):

  • UIProcess/WebBackForwardCache.cpp:

(WebKit::WebBackForwardCache::addEntry):
(WebKit::WebBackForwardCache::removeEntry):
(WebKit::WebBackForwardCache::takeSuspendedPage):

  • UIProcess/WebBackForwardCacheEntry.cpp:

(WebKit::WebBackForwardCacheEntry::expirationTimerFired):

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::receivedNavigationPolicyDecision):
(WebKit::WebPageProxy::commitProvisionalPage):
(WebKit::WebPageProxy::continueNavigationInNewProcess):
(WebKit::WebPageProxy::didStartProvisionalLoadForFrameShared):
(WebKit::WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrameShared):
(WebKit::WebPageProxy::willPerformClientRedirectForFrame):
(WebKit::WebPageProxy::didCancelClientRedirectForFrame):
(WebKit::WebPageProxy::didFailProvisionalLoadForFrameShared):
(WebKit::WebPageProxy::didCommitLoadForFrame):
(WebKit::WebPageProxy::didFinishDocumentLoadForFrame):
(WebKit::WebPageProxy::didFinishLoadForFrame):
(WebKit::WebPageProxy::didFailLoadForFrame):
(WebKit::WebPageProxy::didSameDocumentNavigationForFrame):
(WebKit::WebPageProxy::decidePolicyForNavigationAction):
(WebKit::WebPageProxy::didPerformClientRedirectShared):
(WebKit::WebPageProxy::dispatchProcessDidTerminate):

  • UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::gpuProcessCrashed):

  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::updateServiceWorkerProcessAssertion):

  • UIProcess/ios/ProcessAssertionIOS.mm:

(-[WKProcessAssertionBackgroundTaskManager _updateBackgroundTask]):
(-[WKProcessAssertionBackgroundTaskManager _handleBackgroundTaskExpiration]):
(-[WKProcessAssertionBackgroundTaskManager _handleBackgroundTaskExpirationOnMainThread]):
(WebKit::ProcessAssertion::ProcessAssertion):
(WebKit::ProcessAssertion::~ProcessAssertion):
(WebKit::ProcessAssertion::processAssertionWasInvalidated):

  • UIProcess/ios/WKApplicationStateTrackingView.mm:

(-[WKApplicationStateTrackingView willMoveToWindow:]):
(-[WKApplicationStateTrackingView didMoveToWindow]):

  • UIProcess/ios/WKContentView.mm:

(-[WKContentView _setupVisibilityPropagationView]):
(-[WKContentView _setupVisibilityPropagationViewForGPUProcess]):

  • WebAuthnProcess/WebAuthnProcess.cpp:

(WebKit::WebAuthnProcess::prepareToSuspend):

  • WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp:

(WebKit::WebResourceLoadObserver::logUserInteractionWithReducedTimeResolution):

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didReceivePolicyDecision):

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::prepareToSuspend):

  • WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::updateProcessName):
(WebKit::WebProcess::updateFreezerStatus):

Location:
trunk/Source
Files:
33 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r273167 r273183  
     12021-02-19  Chris Dumez  <cdumez@apple.com>
     2
     3        Make format of release logging more consistent to facilitate grepping
     4        https://bugs.webkit.org/show_bug.cgi?id=222200
     5
     6        Reviewed by Simon Fraser.
     7
     8        * loader/DocumentLoader.cpp:
     9        (WebCore::DocumentLoader::setMainDocumentError):
     10        (WebCore::DocumentLoader::mainReceivedError):
     11        (WebCore::DocumentLoader::notifyFinished):
     12        (WebCore::DocumentLoader::continueAfterContentPolicy):
     13        (WebCore::DocumentLoader::startLoadingMainResource):
     14        (WebCore::DocumentLoader::cancelMainResourceLoad):
     15        * loader/SubresourceLoader.cpp:
     16        (WebCore::SubresourceLoader::didFail):
     17        (WebCore::SubresourceLoader::willCancel):
     18        * workers/service/ServiceWorker.cpp:
     19        (WebCore::ServiceWorker::ServiceWorker):
     20        (WebCore::ServiceWorker::updateState):
     21        * workers/service/ServiceWorkerContainer.cpp:
     22        (WebCore::ServiceWorkerContainer::addRegistration):
     23        (WebCore::ServiceWorkerContainer::updateRegistration):
     24        (WebCore::ServiceWorkerContainer::jobResolvedWithRegistration):
     25        * workers/service/ServiceWorkerRegistration.cpp:
     26        (WebCore::ServiceWorkerRegistration::ServiceWorkerRegistration):
     27        * workers/service/server/SWServerJobQueue.cpp:
     28        (WebCore::SWServerJobQueue::scriptFetchFinished):
     29        (WebCore::SWServerJobQueue::didResolveRegistrationPromise):
     30
    1312021-02-16  Jiewen Tan  <jiewen_tan@apple.com>
    232
  • trunk/Source/WebCore/loader/DocumentLoader.cpp

    r272707 r273183  
    255255{
    256256    if (!error.isNull())
    257         RELEASE_LOG_IF_ALLOWED("setMainDocumentError: (type = %d, code = %d)", static_cast<int>(error.type()), error.errorCode());
     257        RELEASE_LOG_IF_ALLOWED("setMainDocumentError: (type=%d, code=%d)", static_cast<int>(error.type()), error.errorCode());
    258258
    259259    m_mainDocumentError = error;   
     
    269269
    270270    if (!error.isNull())
    271         RELEASE_LOG_IF_ALLOWED("mainReceivedError: (type = %d, code = %d)", static_cast<int>(error.type()), error.errorCode());
     271        RELEASE_LOG_IF_ALLOWED("mainReceivedError: (type=%d, code=%d)", static_cast<int>(error.type()), error.errorCode());
    272272
    273273    if (m_identifierForLoadWithoutResourceLoader) {
     
    432432
    433433    if (!m_mainResource->resourceError().isNull())
    434         RELEASE_LOG_IF_ALLOWED("notifyFinished: canceling load (type = %d, code = %d)", static_cast<int>(m_mainResource->resourceError().type()), m_mainResource->resourceError().errorCode());
     434        RELEASE_LOG_IF_ALLOWED("notifyFinished: canceling load (type=%d, code=%d)", static_cast<int>(m_mainResource->resourceError().type()), m_mainResource->resourceError().errorCode());
    435435
    436436    mainReceivedError(m_mainResource->resourceError());
     
    10061006
    10071007    if (!m_frame) {
    1008         RELEASE_LOG_IF_ALLOWED("continueAfterContentPolicy: Policy action %i received by DocumentLoader with null frame", (int)policy);
     1008        RELEASE_LOG_IF_ALLOWED("continueAfterContentPolicy: policyAction=%i received by DocumentLoader with null frame", (int)policy);
    10091009        return;
    10101010    }
     
    19341934            matchRegistration(url, [request = WTFMove(request), protectedThis = WTFMove(protectedThis), this] (auto&& registrationData) mutable {
    19351935                if (!m_mainDocumentError.isNull()) {
    1936                     RELEASE_LOG_IF_ALLOWED("startLoadingMainResource callback: Load canceled because of main document error (type = %d, code = %d)", static_cast<int>(m_mainDocumentError.type()), m_mainDocumentError.errorCode());
     1936                    RELEASE_LOG_IF_ALLOWED("startLoadingMainResource callback: Load canceled because of main document error (type=%d, code=%d)", static_cast<int>(m_mainDocumentError.type()), m_mainDocumentError.errorCode());
    19371937                    return;
    19381938                }
     
    20812081    ResourceError error = resourceError.isNull() ? frameLoader()->cancelledError(m_request) : resourceError;
    20822082
    2083     RELEASE_LOG_IF_ALLOWED("cancelMainResourceLoad: (type = %d, code = %d)", static_cast<int>(error.type()), error.errorCode());
     2083    RELEASE_LOG_IF_ALLOWED("cancelMainResourceLoad: (type=%d, code=%d)", static_cast<int>(error.type()), error.errorCode());
    20842084
    20852085    m_dataLoadToken.clear();
  • trunk/Source/WebCore/loader/SubresourceLoader.cpp

    r272313 r273183  
    755755void SubresourceLoader::didFail(const ResourceError& error)
    756756{
    757     RELEASE_LOG_IF_ALLOWED("didFail: (type = %d, code = %d)", static_cast<int>(error.type()), error.errorCode());
     757    RELEASE_LOG_IF_ALLOWED("didFail: (type=%d, code=%d)", static_cast<int>(error.type()), error.errorCode());
    758758
    759759#if USE(QUICK_LOOK)
     
    793793void SubresourceLoader::willCancel(const ResourceError& error)
    794794{
    795     RELEASE_LOG_IF_ALLOWED("willCancel: (type = %d, code = %d)", static_cast<int>(error.type()), error.errorCode());
     795    RELEASE_LOG_IF_ALLOWED("willCancel: (type=%d, code=%d)", static_cast<int>(error.type()), error.errorCode());
    796796
    797797#if PLATFORM(IOS_FAMILY)
  • trunk/Source/WebCore/workers/service/ServiceWorker.cpp

    r253812 r273183  
    7171    updatePendingActivityForEventDispatch();
    7272
    73     WORKER_RELEASE_LOG_IF_ALLOWED("ServiceWorker: ID: %llu, state: %hhu", identifier().toUInt64(), m_data.state);
     73    WORKER_RELEASE_LOG_IF_ALLOWED("serviceWorkerID=%llu, state=%hhu", identifier().toUInt64(), m_data.state);
    7474}
    7575
     
    8282void ServiceWorker::updateState(State state)
    8383{
    84     WORKER_RELEASE_LOG_IF_ALLOWED("updateState: Updating service worker %llu state from %hhu to %hhu. Registration ID: %llu", identifier().toUInt64(), m_data.state, state, registrationIdentifier().toUInt64());
     84    WORKER_RELEASE_LOG_IF_ALLOWED("updateState: Updating service worker %llu state from %hhu to %hhu. registrationID=%llu", identifier().toUInt64(), m_data.state, state, registrationIdentifier().toUInt64());
    8585    m_data.state = state;
    8686    if (state != State::Installing && !m_isStopped) {
  • trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp

    r269997 r273183  
    181181    }
    182182
    183     CONTAINER_RELEASE_LOG_IF_ALLOWED("addRegistration: Registering service worker. Job ID: %" PRIu64, jobData.identifier().jobIdentifier.toUInt64());
     183    CONTAINER_RELEASE_LOG_IF_ALLOWED("addRegistration: Registering service worker. jobID=%" PRIu64, jobData.identifier().jobIdentifier.toUInt64());
    184184
    185185    jobData.clientCreationURL = context->url();
     
    226226    jobData.scriptURL = scriptURL;
    227227
    228     CONTAINER_RELEASE_LOG_IF_ALLOWED("removeRegistration: Updating service worker. Job ID: %" PRIu64, jobData.identifier().jobIdentifier.toUInt64());
     228    CONTAINER_RELEASE_LOG_IF_ALLOWED("removeRegistration: Updating service worker. jobID=%" PRIu64, jobData.identifier().jobIdentifier.toUInt64());
    229229
    230230    scheduleJob(makeUnique<ServiceWorkerJob>(*this, WTFMove(promise), WTFMove(jobData)));
     
    393393        auto registration = ServiceWorkerRegistration::getOrCreate(*scriptExecutionContext(), *this, WTFMove(data));
    394394
    395         CONTAINER_RELEASE_LOG_IF_ALLOWED("jobResolvedWithRegistration: Resolving promise for job %" PRIu64 ". Registration ID: %" PRIu64, jobIdentifier.toUInt64(), registration->identifier().toUInt64());
     395        CONTAINER_RELEASE_LOG_IF_ALLOWED("jobResolvedWithRegistration: Resolving promise for job %" PRIu64 ". registrationID=%" PRIu64, jobIdentifier.toUInt64(), registration->identifier().toUInt64());
    396396
    397397        if (shouldNotifyWhenResolved == ShouldNotifyWhenResolved::Yes) {
  • trunk/Source/WebCore/workers/service/ServiceWorkerRegistration.cpp

    r260709 r273183  
    7272        m_activeWorker = ServiceWorker::getOrCreate(context, WTFMove(*m_registrationData.activeWorker));
    7373
    74     REGISTRATION_RELEASE_LOG_IF_ALLOWED("ServiceWorkerRegistration: ID %llu, installing: %llu, waiting: %llu, active: %llu", identifier().toUInt64(), m_installingWorker ? m_installingWorker->identifier().toUInt64() : 0, m_waitingWorker ? m_waitingWorker->identifier().toUInt64() : 0, m_activeWorker ? m_activeWorker->identifier().toUInt64() : 0);
     74    REGISTRATION_RELEASE_LOG_IF_ALLOWED("ServiceWorkerRegistration: ID %llu, installing=%llu, waiting=%llu, active=%llu", identifier().toUInt64(), m_installingWorker ? m_installingWorker->identifier().toUInt64() : 0, m_waitingWorker ? m_waitingWorker->identifier().toUInt64() : 0, m_activeWorker ? m_activeWorker->identifier().toUInt64() : 0);
    7575
    7676    m_container->addRegistration(*this);
  • trunk/Source/WebCore/workers/service/server/SWServerJobQueue.cpp

    r265282 r273183  
    102102    // text, then:
    103103    if (newestWorker && equalIgnoringFragmentIdentifier(newestWorker->scriptURL(), job.scriptURL) && result.script == newestWorker->script() && doCertificatesMatch(result.certificateInfo, newestWorker->certificateInfo())) {
    104         RELEASE_LOG(ServiceWorker, "%p - SWServerJobQueue::scriptFetchFinished, script and certificate are matching for registration ID: %llu", this, registration->identifier().toUInt64());
     104        RELEASE_LOG(ServiceWorker, "%p - SWServerJobQueue::scriptFetchFinished, script and certificate are matching for registrationID=%llu", this, registration->identifier().toUInt64());
    105105        // FIXME: for non classic scripts, check the script’s module record's [[ECMAScriptCode]].
    106106
     
    186186    }
    187187
    188     RELEASE_LOG(ServiceWorker, "%p - SWServerJobQueue::didResolveRegistrationPromise: Registration ID: %llu. Now proceeding with install", this, registration->identifier().toUInt64());
     188    RELEASE_LOG(ServiceWorker, "%p - SWServerJobQueue::didResolveRegistrationPromise: RegistrationID=%llu. Now proceeding with install", this, registration->identifier().toUInt64());
    189189
    190190    // Queue a task to fire an event named updatefound at all the ServiceWorkerRegistration objects
  • trunk/Source/WebKit/ChangeLog

    r273181 r273183  
     12021-02-19  Chris Dumez  <cdumez@apple.com>
     2
     3        Make format of release logging more consistent to facilitate grepping
     4        https://bugs.webkit.org/show_bug.cgi?id=222200
     5
     6        Reviewed by Simon Fraser.
     7
     8        * NetworkProcess/NetworkCORSPreflightChecker.cpp:
     9        (WebKit::NetworkCORSPreflightChecker::didCompleteWithError):
     10        * NetworkProcess/NetworkLoadChecker.cpp:
     11        (WebKit::NetworkLoadChecker::checkCORSRequestWithPreflight):
     12        * NetworkProcess/NetworkProcess.cpp:
     13        (WebKit::NetworkProcess::didReceiveMessage):
     14        (WebKit::NetworkProcess::didReceiveSyncMessage):
     15        (WebKit::NetworkProcess::initializeNetworkProcess):
     16        (WebKit::NetworkProcess::prepareToSuspend):
     17        * NetworkProcess/PingLoad.cpp:
     18        (WebKit::PingLoad::didReceiveResponse):
     19        (WebKit::PingLoad::didCompleteWithError):
     20        * NetworkProcess/PreconnectTask.cpp:
     21        (WebKit::PreconnectTask::didFailLoading):
     22        * NetworkProcess/ServiceWorker/WebSWServerConnection.cpp:
     23        (WebKit::WebSWServerConnection::startFetch):
     24        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
     25        (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
     26        (WebKit::NetworkDataTaskCocoa::willPerformHTTPRedirection):
     27        * Platform/IPC/Connection.cpp:
     28        (IPC::Connection::waitForSyncReply):
     29        * UIProcess/ApplicationStateTracker.mm:
     30        (WebKit::ApplicationStateTracker::ApplicationStateTracker):
     31        * UIProcess/AuxiliaryProcessProxy.cpp:
     32        (WebKit::AuxiliaryProcessProxy::terminate):
     33        * UIProcess/ProcessThrottler.cpp:
     34        (WebKit::ProcessThrottler::setAssertionType):
     35        (WebKit::ProcessThrottler::updateAssertionIfNeeded):
     36        (WebKit::ProcessThrottler::sendPrepareToSuspendIPC):
     37        * UIProcess/ProvisionalPageProxy.cpp:
     38        (WebKit::ProvisionalPageProxy::ProvisionalPageProxy):
     39        (WebKit::ProvisionalPageProxy::processDidTerminate):
     40        (WebKit::ProvisionalPageProxy::cancel):
     41        (WebKit::ProvisionalPageProxy::loadData):
     42        (WebKit::ProvisionalPageProxy::loadRequest):
     43        (WebKit::ProvisionalPageProxy::goToBackForwardItem):
     44        (WebKit::ProvisionalPageProxy::didCreateMainFrame):
     45        (WebKit::ProvisionalPageProxy::didStartProvisionalLoadForFrame):
     46        (WebKit::ProvisionalPageProxy::didFailProvisionalLoadForFrame):
     47        (WebKit::ProvisionalPageProxy::didCommitLoadForFrame):
     48        (WebKit::ProvisionalPageProxy::didCreateContextForVisibilityPropagation):
     49        * UIProcess/WebBackForwardCache.cpp:
     50        (WebKit::WebBackForwardCache::addEntry):
     51        (WebKit::WebBackForwardCache::removeEntry):
     52        (WebKit::WebBackForwardCache::takeSuspendedPage):
     53        * UIProcess/WebBackForwardCacheEntry.cpp:
     54        (WebKit::WebBackForwardCacheEntry::expirationTimerFired):
     55        * UIProcess/WebPageProxy.cpp:
     56        (WebKit::WebPageProxy::receivedNavigationPolicyDecision):
     57        (WebKit::WebPageProxy::commitProvisionalPage):
     58        (WebKit::WebPageProxy::continueNavigationInNewProcess):
     59        (WebKit::WebPageProxy::didStartProvisionalLoadForFrameShared):
     60        (WebKit::WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrameShared):
     61        (WebKit::WebPageProxy::willPerformClientRedirectForFrame):
     62        (WebKit::WebPageProxy::didCancelClientRedirectForFrame):
     63        (WebKit::WebPageProxy::didFailProvisionalLoadForFrameShared):
     64        (WebKit::WebPageProxy::didCommitLoadForFrame):
     65        (WebKit::WebPageProxy::didFinishDocumentLoadForFrame):
     66        (WebKit::WebPageProxy::didFinishLoadForFrame):
     67        (WebKit::WebPageProxy::didFailLoadForFrame):
     68        (WebKit::WebPageProxy::didSameDocumentNavigationForFrame):
     69        (WebKit::WebPageProxy::decidePolicyForNavigationAction):
     70        (WebKit::WebPageProxy::didPerformClientRedirectShared):
     71        (WebKit::WebPageProxy::dispatchProcessDidTerminate):
     72        * UIProcess/WebProcessPool.cpp:
     73        (WebKit::WebProcessPool::gpuProcessCrashed):
     74        * UIProcess/WebProcessProxy.cpp:
     75        (WebKit::WebProcessProxy::updateServiceWorkerProcessAssertion):
     76        * UIProcess/ios/ProcessAssertionIOS.mm:
     77        (-[WKProcessAssertionBackgroundTaskManager _updateBackgroundTask]):
     78        (-[WKProcessAssertionBackgroundTaskManager _handleBackgroundTaskExpiration]):
     79        (-[WKProcessAssertionBackgroundTaskManager _handleBackgroundTaskExpirationOnMainThread]):
     80        (WebKit::ProcessAssertion::ProcessAssertion):
     81        (WebKit::ProcessAssertion::~ProcessAssertion):
     82        (WebKit::ProcessAssertion::processAssertionWasInvalidated):
     83        * UIProcess/ios/WKApplicationStateTrackingView.mm:
     84        (-[WKApplicationStateTrackingView willMoveToWindow:]):
     85        (-[WKApplicationStateTrackingView didMoveToWindow]):
     86        * UIProcess/ios/WKContentView.mm:
     87        (-[WKContentView _setupVisibilityPropagationView]):
     88        (-[WKContentView _setupVisibilityPropagationViewForGPUProcess]):
     89        * WebAuthnProcess/WebAuthnProcess.cpp:
     90        (WebKit::WebAuthnProcess::prepareToSuspend):
     91        * WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp:
     92        (WebKit::WebResourceLoadObserver::logUserInteractionWithReducedTimeResolution):
     93        * WebProcess/WebPage/WebPage.cpp:
     94        (WebKit::WebPage::didReceivePolicyDecision):
     95        * WebProcess/WebProcess.cpp:
     96        (WebKit::WebProcess::initializeWebProcess):
     97        (WebKit::WebProcess::prepareToSuspend):
     98        * WebProcess/cocoa/WebProcessCocoa.mm:
     99        (WebKit::WebProcess::updateProcessName):
     100        (WebKit::WebProcess::updateFreezerStatus):
     101
    11022021-02-19  Alex Christensen  <achristensen@webkit.org>
    2103
  • trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp

    r258052 r273183  
    138138    }
    139139
    140     RELEASE_LOG_IF_ALLOWED("didComplete http_status_code: %d", m_response.httpStatusCode());
     140    RELEASE_LOG_IF_ALLOWED("didComplete http_status_code=%d", m_response.httpStatusCode());
    141141
    142142    auto result = validatePreflightResponse(m_parameters.originalRequest, m_response, m_parameters.storedCredentialsPolicy, m_parameters.sourceOrigin, m_networkResourceLoader.get());
  • trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp

    r272313 r273183  
    443443    };
    444444    m_corsPreflightChecker = makeUnique<NetworkCORSPreflightChecker>(m_networkProcess.get(), m_networkResourceLoader.get(), WTFMove(parameters), m_shouldCaptureExtraNetworkLoadMetrics, [this, request = WTFMove(request), handler = WTFMove(handler), isRedirected = isRedirected()](auto&& error) mutable {
    445         RELEASE_LOG_IF_ALLOWED("checkCORSRequestWithPreflight - makeCrossOriginAccessRequestWithPreflight preflight complete, success: %d forRedirect? %d", error.isNull(), isRedirected);
     445        RELEASE_LOG_IF_ALLOWED("checkCORSRequestWithPreflight - makeCrossOriginAccessRequestWithPreflight preflight complete, success=%d forRedirect=%d", error.isNull(), isRedirected);
    446446
    447447        if (!error.isNull()) {
  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

    r273133 r273183  
    217217    ASSERT(parentProcessConnection() == &connection);
    218218    if (parentProcessConnection() != &connection) {
    219         WTFLogAlways("Ignored message '%s' because it did not come from the UIProcess (destination: %" PRIu64 ")", description(decoder.messageName()), decoder.destinationID());
     219        WTFLogAlways("Ignored message '%s' because it did not come from the UIProcess (destination=%" PRIu64 ")", description(decoder.messageName()), decoder.destinationID());
    220220        ASSERT_NOT_REACHED();
    221221        return;
     
    244244    ASSERT(parentProcessConnection() == &connection);
    245245    if (parentProcessConnection() != &connection) {
    246         WTFLogAlways("Ignored message '%s' because it did not come from the UIProcess (destination: %" PRIu64 ")", description(decoder.messageName()), decoder.destinationID());
     246        WTFLogAlways("Ignored message '%s' because it did not come from the UIProcess (destination=%" PRIu64 ")", description(decoder.messageName()), decoder.destinationID());
    247247        ASSERT_NOT_REACHED();
    248248        return;
     
    349349        registerURLSchemeAsNoAccess(scheme);
    350350   
    351     RELEASE_LOG(Process, "%p - NetworkProcess::initializeNetworkProcess: Presenting process = %d", this, WebCore::presentingApplicationPID());
     351    RELEASE_LOG(Process, "%p - NetworkProcess::initializeNetworkProcess: Presenting processPID=%d", this, WebCore::presentingApplicationPID());
    352352}
    353353
     
    21932193void NetworkProcess::prepareToSuspend(bool isSuspensionImminent, CompletionHandler<void()>&& completionHandler)
    21942194{
    2195     RELEASE_LOG(ProcessSuspension, "%p - NetworkProcess::prepareToSuspend(), isSuspensionImminent: %d", this, isSuspensionImminent);
     2195    RELEASE_LOG(ProcessSuspension, "%p - NetworkProcess::prepareToSuspend(), isSuspensionImminent=%d", this, isSuspensionImminent);
    21962196
    21972197#if PLATFORM(IOS_FAMILY) && ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/NetworkProcess/PingLoad.cpp

    r258052 r273183  
    163163void PingLoad::didReceiveResponse(ResourceResponse&& response, NegotiatedLegacyTLS, ResponseCompletionHandler&& completionHandler)
    164164{
    165     RELEASE_LOG_IF_ALLOWED("didReceiveResponse - httpStatusCode: %d", response.httpStatusCode());
     165    RELEASE_LOG_IF_ALLOWED("didReceiveResponse - httpStatusCode=%d", response.httpStatusCode());
    166166    auto weakThis = makeWeakPtr(*this);
    167167    completionHandler(PolicyAction::Ignore);
     
    182182        RELEASE_LOG_IF_ALLOWED("didComplete");
    183183    else
    184         RELEASE_LOG_IF_ALLOWED("didCompleteWithError, error_code: %d", error.errorCode());
     184        RELEASE_LOG_IF_ALLOWED("didCompleteWithError, error_code=%d", error.errorCode());
    185185
    186186    didFinish(error);
  • trunk/Source/WebKit/NetworkProcess/PreconnectTask.cpp

    r264846 r273183  
    8787void PreconnectTask::didFailLoading(const ResourceError& error)
    8888{
    89     RELEASE_LOG(Network, "%p - PreconnectTask::didFailLoading, error_code: %d", this, error.errorCode());
     89    RELEASE_LOG(Network, "%p - PreconnectTask::didFailLoading, error_code=%d", this, error.errorCode());
    9090    didFinish(error);
    9191}
  • trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp

    r260507 r273183  
    214214
    215215        if (!success) {
    216             SWSERVERCONNECTION_RELEASE_LOG_ERROR_IF_ALLOWED("startFetch: fetchIdentifier: %llu DidNotHandle because worker did not become activated", task->fetchIdentifier().toUInt64());
     216            SWSERVERCONNECTION_RELEASE_LOG_ERROR_IF_ALLOWED("startFetch: fetchIdentifier=%llu DidNotHandle because worker did not become activated", task->fetchIdentifier().toUInt64());
    217217            task->cannotHandle();
    218218            return;
     
    239239
    240240            if (!contextConnection) {
    241                 SWSERVERCONNECTION_RELEASE_LOG_ERROR_IF_ALLOWED("startFetch: fetchIdentifier: %s DidNotHandle because failed to run service worker", task->fetchIdentifier().loggingString().utf8().data());
     241                SWSERVERCONNECTION_RELEASE_LOG_ERROR_IF_ALLOWED("startFetch: fetchIdentifier=%s DidNotHandle because failed to run service worker", task->fetchIdentifier().loggingString().utf8().data());
    242242                task->cannotHandle();
    243243                return;
  • trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm

    r272773 r273183  
    365365#if !RELEASE_LOG_DISABLED
    366366        if (m_session->shouldLogCookieInformation())
    367             RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - NetworkDataTaskCocoa::logCookieInformation: pageID = %llu, frameID = %llu, taskID = %lu: Blocking cookies for URL %s", this, pageID.toUInt64(), frameID.toUInt64(), (unsigned long)[m_task taskIdentifier], nsRequest.URL.absoluteString.UTF8String);
     367            RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - NetworkDataTaskCocoa::logCookieInformation: pageID=%llu, frameID=%llu, taskID=%lu: Blocking cookies for URL %s", this, pageID.toUInt64(), frameID.toUInt64(), (unsigned long)[m_task taskIdentifier], nsRequest.URL.absoluteString.UTF8String);
    368368#else
    369369        LOG(NetworkSession, "%llu Blocking cookies for URL %s", [m_task taskIdentifier], nsRequest.URL.absoluteString.UTF8String);
     
    513513#if !RELEASE_LOG_DISABLED
    514514    if (m_session->shouldLogCookieInformation())
    515         RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - NetworkDataTaskCocoa::willPerformHTTPRedirection::logCookieInformation: pageID = %llu, frameID = %llu, taskID = %lu: %s cookies for redirect URL %s", this, m_pageID.toUInt64(), m_frameID.toUInt64(), (unsigned long)[m_task taskIdentifier], (m_hasBeenSetToUseStatelessCookieStorage ? "Blocking" : "Not blocking"), request.url().string().utf8().data());
     515        RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - NetworkDataTaskCocoa::willPerformHTTPRedirection::logCookieInformation: pageID=%llu, frameID=%llu, taskID=%lu: %s cookies for redirect URL %s", this, m_pageID.toUInt64(), m_frameID.toUInt64(), (unsigned long)[m_task taskIdentifier], (m_hasBeenSetToUseStatelessCookieStorage ? "Blocking" : "Not blocking"), request.url().string().utf8().data());
    516516#else
    517517    LOG(NetworkSession, "%llu %s cookies for redirect URL %s", [m_task taskIdentifier], (m_hasBeenSetToUseStatelessCookieStorage ? "Blocking" : "Not blocking"), request.url().string().utf8().data());
  • trunk/Source/WebKit/Platform/IPC/Connection.cpp

    r272916 r273183  
    649649        // any more incoming messages.
    650650        if (!isValid()) {
    651             RELEASE_LOG_ERROR(IPC, "Connection::waitForSyncReply: Connection no longer valid, id = %" PRIu64, syncRequestID);
     651            RELEASE_LOG_ERROR(IPC, "Connection::waitForSyncReply: Connection no longer valid, id=%" PRIu64, syncRequestID);
    652652            didReceiveSyncReply(sendSyncOptions);
    653653            return nullptr;
     
    661661
    662662#if OS(DARWIN)
    663     RELEASE_LOG_ERROR(IPC, "Connection::waitForSyncReply: Timed-out while waiting for reply for %{public}s from process %d, id = %" PRIu64, description(messageName), remoteProcessID(), syncRequestID);
     663    RELEASE_LOG_ERROR(IPC, "Connection::waitForSyncReply: Timed-out while waiting for reply for %{public}s from process %d, id=%" PRIu64, description(messageName), remoteProcessID(), syncRequestID);
    664664#else
    665     RELEASE_LOG_ERROR(IPC, "Connection::waitForSyncReply: Timed-out while waiting for reply for %s, id = %" PRIu64, description(messageName), syncRequestID);
     665    RELEASE_LOG_ERROR(IPC, "Connection::waitForSyncReply: Timed-out while waiting for reply for %s, id=%" PRIu64, description(messageName), syncRequestID);
    666666#endif
    667667
  • trunk/Source/WebKit/UIProcess/ApplicationStateTracker.mm

    r268736 r273183  
    9696    case ApplicationType::Application: {
    9797        m_isInBackground = window.windowScene.activationState == UISceneActivationStateBackground || window.windowScene.activationState == UISceneActivationStateUnattached;
    98         RELEASE_LOG(ViewState, "%p - ApplicationStateTracker::ApplicationStateTracker(): m_isInBackground: %d", this, m_isInBackground);
     98        RELEASE_LOG(ViewState, "%p - ApplicationStateTracker::ApplicationStateTracker(): m_isInBackground=%d", this, m_isInBackground);
    9999
    100100        m_didEnterBackgroundObserver = [notificationCenter addObserverForName:UISceneDidEnterBackgroundNotification object:nil queue:nil usingBlock:[this](NSNotification *notification) {
     
    148148            m_isInBackground = false;
    149149
    150         RELEASE_LOG(ProcessSuspension, "%{public}s has PID %d, host application PID: %d, isInBackground: %d", _UIApplicationIsExtension() ? "Extension" : "ViewService", getpid(), applicationPID, m_isInBackground);
     150        RELEASE_LOG(ProcessSuspension, "%{public}s has PID %d, host application PID=%d, isInBackground=%d", _UIApplicationIsExtension() ? "Extension" : "ViewService", getpid(), applicationPID, m_isInBackground);
    151151
    152152        m_didEnterBackgroundObserver = [notificationCenter addObserverForName:viewServiceBackgroundNotificationName object:serviceViewController queue:nil usingBlock:[this, applicationPID](NSNotification *) {
    153             RELEASE_LOG(ProcessSuspension, "%{public}s has PID %d, host application PID: %d, didEnterBackground", _UIApplicationIsExtension() ? "Extension" : "ViewService", getpid(), applicationPID);
     153            RELEASE_LOG(ProcessSuspension, "%{public}s has PID %d, host application PID=%d, didEnterBackground", _UIApplicationIsExtension() ? "Extension" : "ViewService", getpid(), applicationPID);
    154154            applicationDidEnterBackground();
    155155        }];
    156156        m_willEnterForegroundObserver = [notificationCenter addObserverForName:viewServiceForegroundNotificationName object:serviceViewController queue:nil usingBlock:[this, applicationPID](NSNotification *) {
    157             RELEASE_LOG(ProcessSuspension, "%{public}s has PID %d, host application PID: %d, willEnterForeground", _UIApplicationIsExtension() ? "Extension" : "ViewService", getpid(), applicationPID);
     157            RELEASE_LOG(ProcessSuspension, "%{public}s has PID %d, host application PID=%d, willEnterForeground", _UIApplicationIsExtension() ? "Extension" : "ViewService", getpid(), applicationPID);
    158158            applicationWillEnterForeground();
    159159        }];
  • trunk/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp

    r272882 r273183  
    114114void AuxiliaryProcessProxy::terminate()
    115115{
    116     RELEASE_LOG(Process, "AuxiliaryProcessProxy::terminate: PID: %d", processIdentifier());
     116    RELEASE_LOG(Process, "AuxiliaryProcessProxy::terminate: PID=%d", processIdentifier());
    117117
    118118#if PLATFORM(COCOA)
  • trunk/Source/WebKit/UIProcess/ProcessThrottler.cpp

    r269934 r273183  
    127127        return;
    128128
    129     PROCESSTHROTTLER_RELEASE_LOG("setAssertionType: Updating process assertion type to %u (foregroundActivities: %u, backgroundActivities: %u)", newType, m_foregroundActivities.size(), m_backgroundActivities.size());
     129    PROCESSTHROTTLER_RELEASE_LOG("setAssertionType: Updating process assertion type to %u (foregroundActivities=%u, backgroundActivities=%u)", newType, m_foregroundActivities.size(), m_backgroundActivities.size());
    130130
    131131    // Keep the previous assertion around until after the new one has been created so that we always hold
     
    157157                PROCESSTHROTTLER_RELEASE_LOG("updateAssertionIfNeeded: sending ProcessDidResume IPC because the process was suspended");
    158158            else
    159                 PROCESSTHROTTLER_RELEASE_LOG("updateAssertionIfNeeded: sending ProcessDidResume IPC because the WebProcess is still processing request to suspend: %" PRIu64, *m_pendingRequestToSuspendID);
     159                PROCESSTHROTTLER_RELEASE_LOG("updateAssertionIfNeeded: sending ProcessDidResume IPC because the WebProcess is still processing request to suspend=%" PRIu64, *m_pendingRequestToSuspendID);
    160160            m_process.sendProcessDidResume();
    161161            clearPendingRequestToSuspend();
     
    211211void ProcessThrottler::sendPrepareToSuspendIPC(IsSuspensionImminent isSuspensionImminent)
    212212{
    213     PROCESSTHROTTLER_RELEASE_LOG("sendPrepareToSuspendIPC: isSuspensionImminent: %d", isSuspensionImminent == IsSuspensionImminent::Yes);
     213    PROCESSTHROTTLER_RELEASE_LOG("sendPrepareToSuspendIPC: isSuspensionImminent=%d", isSuspensionImminent == IsSuspensionImminent::Yes);
    214214    if (m_pendingRequestToSuspendID) {
    215215        // Do not send a new PrepareToSuspend IPC for imminent suspension if we've already sent a non-imminent PrepareToSuspend IPC.
     
    218218    } else {
    219219        m_pendingRequestToSuspendID = generatePrepareToSuspendRequestID();
    220         PROCESSTHROTTLER_RELEASE_LOG("sendPrepareToSuspendIPC: Sending PrepareToSuspend(%" PRIu64 ", isSuspensionImminent: %d) IPC", *m_pendingRequestToSuspendID, isSuspensionImminent == IsSuspensionImminent::Yes);
     220        PROCESSTHROTTLER_RELEASE_LOG("sendPrepareToSuspendIPC: Sending PrepareToSuspend(%" PRIu64 ", isSuspensionImminent=%d) IPC", *m_pendingRequestToSuspendID, isSuspensionImminent == IsSuspensionImminent::Yes);
    221221        m_process.sendPrepareToSuspend(isSuspensionImminent, [this, weakThis = makeWeakPtr(*this), requestToSuspendID = *m_pendingRequestToSuspendID]() mutable {
    222222            if (weakThis && m_pendingRequestToSuspendID && *m_pendingRequestToSuspendID == requestToSuspendID)
  • trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp

    r268017 r273183  
    5353using namespace WebCore;
    5454
    55 #define RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(m_page.isAlwaysOnLoggingAllowed(), channel, "%p - ProvisionalPageProxy::" fmt, this, ##__VA_ARGS__)
    56 #define RELEASE_LOG_ERROR_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_ERROR_IF(m_page.isAlwaysOnLoggingAllowed(), channel, "%p - ProvisionalPageProxy::" fmt, this, ##__VA_ARGS__)
     55#define RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(m_page.isAlwaysOnLoggingAllowed(), channel, "%p - [pageProxyID=%" PRIu64 ", webPageID=%" PRIu64 ", PID=%i, navigationID=%" PRIu64 "] ProvisionalPageProxy::" fmt, this, m_page.identifier().toUInt64(), m_webPageID.toUInt64(), m_process->processIdentifier(), m_navigationID, ##__VA_ARGS__)
     56#define RELEASE_LOG_ERROR_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_ERROR_IF(m_page.isAlwaysOnLoggingAllowed(), channel, "%p - [pageProxyID=%" PRIu64 ", webPageID=%" PRIu64 ", PID=%i, navigationID=%" PRIu64 "] ProvisionalPageProxy::" fmt, this, m_page.identifier().toUInt64(), m_webPageID.toUInt64(), m_process->processIdentifier(), m_navigationID, ##__VA_ARGS__)
    5757
    5858ProvisionalPageProxy::ProvisionalPageProxy(WebPageProxy& page, Ref<WebProcessProxy>&& process, std::unique_ptr<SuspendedPageProxy> suspendedPage, uint64_t navigationID, bool isServerRedirect, const WebCore::ResourceRequest& request, ProcessSwapRequestedByClient processSwapRequestedByClient, API::WebsitePolicies* websitePolicies)
     
    7171#endif
    7272{
    73     RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "ProvisionalPageProxy: pageProxyID=%" PRIu64 " webPageID=%" PRIu64 " navigationID=%" PRIu64 " suspendedPage: %p", m_page.identifier().toUInt64(), m_webPageID.toUInt64(), navigationID, suspendedPage.get());
     73    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "ProvisionalPageProxy: suspendedPage=%p", suspendedPage.get());
    7474
    7575    m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_webPageID, *this);
     
    113113void ProvisionalPageProxy::processDidTerminate()
    114114{
    115     RELEASE_LOG_ERROR_IF_ALLOWED(ProcessSwapping, "processDidTerminate: pageProxyID=%" PRIu64 " webPageID=%" PRIu64, m_page.identifier().toUInt64(), m_webPageID.toUInt64());
     115    RELEASE_LOG_ERROR_IF_ALLOWED(ProcessSwapping, "processDidTerminate:");
    116116    m_page.provisionalProcessDidTerminate();
    117117}
     
    130130    ASSERT(m_process->state() == WebProcessProxy::State::Running);
    131131
    132     RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "cancel: Simulating a didFailProvisionalLoadForFrame for pageProxyID=%" PRIu64 " webPageID=%" PRIu64, m_page.identifier().toUInt64(), m_webPageID.toUInt64());
     132    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "cancel: Simulating a didFailProvisionalLoadForFrame");
    133133    ASSERT(m_mainFrame);
    134134    auto error = WebKit::cancelledError(m_request);
     
    159159void ProvisionalPageProxy::loadData(API::Navigation& navigation, const IPC::DataReference& data, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData, Optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain, Optional<WebsitePoliciesData>&& websitePolicies)
    160160{
    161     RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "loadData: pageProxyID=%" PRIu64 " webPageID=%" PRIu64, m_page.identifier().toUInt64(), m_webPageID.toUInt64());
     161    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "loadData:");
    162162
    163163    m_page.loadDataWithNavigationShared(m_process.copyRef(), m_webPageID, navigation, data, MIMEType, encoding, baseURL, userData, WebCore::ShouldTreatAsContinuingLoad::Yes, isNavigatingToAppBoundDomain, WTFMove(websitePolicies), navigation.lastNavigationAction().shouldOpenExternalURLsPolicy);
     
    166166void ProvisionalPageProxy::loadRequest(API::Navigation& navigation, WebCore::ResourceRequest&& request, API::Object* userData, Optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain, Optional<WebsitePoliciesData>&& websitePolicies)
    167167{
    168     RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "loadRequest: pageProxyID=%" PRIu64 " webPageID=%" PRIu64, m_page.identifier().toUInt64(), m_webPageID.toUInt64());
     168    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "loadRequest:");
    169169
    170170    // If this is a client-side redirect continuing in a new process, then the new process will overwrite the fromItem's URL. In this case,
     
    179179void ProvisionalPageProxy::goToBackForwardItem(API::Navigation& navigation, WebBackForwardListItem& item, RefPtr<API::WebsitePolicies>&& websitePolicies)
    180180{
    181     RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "goToBackForwardItem: pageProxyID=%" PRIu64 " webPageID=%" PRIu64, m_page.identifier().toUInt64(), m_webPageID.toUInt64());
     181    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "goToBackForwardItem:");
    182182
    183183    auto itemStates = m_page.backForwardList().filteredItemStates([this, targetItem = &item](auto& item) {
     
    209209void ProvisionalPageProxy::didCreateMainFrame(FrameIdentifier frameID)
    210210{
    211     RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didCreateMainFrame: pageProxyID=%" PRIu64 " webPageID=%" PRIu64 ", frameID=%" PRIu64, m_page.identifier().toUInt64(), m_webPageID.toUInt64(), frameID.toUInt64());
     211    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didCreateMainFrame: frameID=%" PRIu64, frameID.toUInt64());
    212212    ASSERT(!m_mainFrame);
    213213
     
    247247        return;
    248248
    249     RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didStartProvisionalLoadForFrame: pageProxyID=%" PRIu64 " webPageID=%" PRIu64 ", frameID=%" PRIu64 ", navigationID=%" PRIu64, m_page.identifier().toUInt64(), m_webPageID.toUInt64(), frameID.toUInt64(), navigationID);
     249    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didStartProvisionalLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
    250250    ASSERT(m_provisionalLoadURL.isNull());
    251251    m_provisionalLoadURL = url;
     
    267267        return;
    268268
    269     RELEASE_LOG_ERROR_IF_ALLOWED(ProcessSwapping, "didFailProvisionalLoadForFrame: pageProxyID=%" PRIu64 " webPageID=%" PRIu64 ", frameID=%" PRIu64 ", navigationID=%" PRIu64, m_page.identifier().toUInt64(), m_webPageID.toUInt64(), frameID.toUInt64(), navigationID);
     269    RELEASE_LOG_ERROR_IF_ALLOWED(ProcessSwapping, "didFailProvisionalLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
    270270    ASSERT(!m_provisionalLoadURL.isNull());
    271271    m_provisionalLoadURL = { };
     
    283283        return;
    284284
    285     RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didCommitLoadForFrame: pageProxyID=%" PRIu64 " webPageID=%" PRIu64 ", frameID=%" PRIu64 ", navigationID = %" PRIu64, m_page.identifier().toUInt64(), m_webPageID.toUInt64(), frameID.toUInt64(), navigationID);
     285    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didCommitLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
    286286    m_provisionalLoadURL = { };
    287287    m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_webPageID);
     
    395395void ProvisionalPageProxy::didCreateContextForVisibilityPropagation(LayerHostingContextID contextID)
    396396{
    397     RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didCreateContextForVisibilityPropagation: contextID=%u pageProxyID=%" PRIu64 " webPageID=%" PRIu64, contextID, m_page.identifier().toUInt64(), m_webPageID.toUInt64());
     397    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didCreateContextForVisibilityPropagation: contextID=%u", contextID);
    398398    m_contextIDForVisibilityPropagation = contextID;
    399399}
  • trunk/Source/WebKit/UIProcess/WebBackForwardCache.cpp

    r251523 r273183  
    8484    ASSERT(size() <= capacity());
    8585
    86     RELEASE_LOG(BackForwardCache, "WebBackForwardCache::addEntry: item: %s, hasSuspendedPage: %d, size: %u / %u", item.itemID().string().utf8().data(), !!item.suspendedPage(), size(), capacity());
     86    RELEASE_LOG(BackForwardCache, "WebBackForwardCache::addEntry: item=%s, hasSuspendedPage=%d, size=%u/%u", item.itemID().string().utf8().data(), !!item.suspendedPage(), size(), capacity());
    8787}
    8888
     
    102102    m_itemsWithCachedPage.removeFirst(&item);
    103103    item.setBackForwardCacheEntry(nullptr);
    104     RELEASE_LOG(BackForwardCache, "WebBackForwardCache::removeEntry: item: %s, size: %u / %u", item.itemID().string().utf8().data(), size(), capacity());
     104    RELEASE_LOG(BackForwardCache, "WebBackForwardCache::removeEntry: item=%s, size=%u/%u", item.itemID().string().utf8().data(), size(), capacity());
    105105}
    106106
     
    114114std::unique_ptr<SuspendedPageProxy> WebBackForwardCache::takeSuspendedPage(WebBackForwardListItem& item)
    115115{
    116     RELEASE_LOG(BackForwardCache, "WebBackForwardCache::takeSuspendedPage: item: %s", item.itemID().string().utf8().data());
     116    RELEASE_LOG(BackForwardCache, "WebBackForwardCache::takeSuspendedPage: item=%s", item.itemID().string().utf8().data());
    117117
    118118    ASSERT(m_itemsWithCachedPage.contains(&item));
  • trunk/Source/WebKit/UIProcess/WebBackForwardCacheEntry.cpp

    r261288 r273183  
    7373void WebBackForwardCacheEntry::expirationTimerFired()
    7474{
    75     RELEASE_LOG(BackForwardCache, "%p - WebBackForwardCacheEntry::expirationTimerFired backForwardItemID: %s, hasSuspendedPage? %d", this, m_backForwardItemID.string().utf8().data(), !!m_suspendedPage);
     75    RELEASE_LOG(BackForwardCache, "%p - WebBackForwardCacheEntry::expirationTimerFired backForwardItemID=%s, hasSuspendedPage=%d", this, m_backForwardItemID.string().utf8().data(), !!m_suspendedPage);
    7676    ASSERT(m_backForwardItemID);
    7777    auto* item = WebBackForwardListItem::itemForID(m_backForwardItemID);
  • trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

    r273133 r273183  
    32493249void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, API::Navigation* navigation, Ref<API::NavigationAction>&& navigationAction, ProcessSwapRequestedByClient processSwapRequestedByClient, WebFrameProxy& frame, RefPtr<API::WebsitePolicies>&& policies, Ref<PolicyDecisionSender>&& sender)
    32503250{
    3251     RELEASE_LOG_IF_ALLOWED(Loading, "receivedNavigationPolicyDecision: frameID: %llu, navigationID: %llu, policyAction: %u", frame.frameID().toUInt64(), navigation ? navigation->navigationID() : 0, (unsigned)policyAction);
     3251    RELEASE_LOG_IF_ALLOWED(Loading, "receivedNavigationPolicyDecision: frameID=%llu, navigationID=%llu, policyAction=%u", frame.frameID().toUInt64(), navigation ? navigation->navigationID() : 0, (unsigned)policyAction);
    32523252
    32533253    Ref<WebsiteDataStore> websiteDataStore = m_websiteDataStore.copyRef();
     
    33113311        if (shouldProcessSwap) {
    33123312            policyAction = PolicyAction::StopAllLoads;
    3313             RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "decidePolicyForNavigationAction, swapping process %i with process %i for navigation, reason: %" PUBLIC_LOG_STRING, processIdentifier(), processForNavigation->processIdentifier(), reason.utf8().data());
     3313            RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "decidePolicyForNavigationAction, swapping process %i with process %i for navigation, reason=%" PUBLIC_LOG_STRING, processIdentifier(), processForNavigation->processIdentifier(), reason.utf8().data());
    33143314            LOG(ProcessSwapping, "(ProcessSwapping) Switching from process %i to new process (%i) for navigation %" PRIu64 " '%s'", processIdentifier(), processForNavigation->processIdentifier(), navigation->navigationID(), navigation->loggingString());
    33153315        } else
    3316             RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "decidePolicyForNavigationAction: keep using process %i for navigation, reason: %" PUBLIC_LOG_STRING, processIdentifier(), reason.utf8().data());
     3316            RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "decidePolicyForNavigationAction: keep using process %i for navigation, reason=%" PUBLIC_LOG_STRING, processIdentifier(), reason.utf8().data());
    33173317
    33183318        Optional<SandboxExtension::Handle> optionalHandle;
     
    33933393{
    33943394    ASSERT(m_provisionalPage);
    3395     RELEASE_LOG_IF_ALLOWED(Loading, "commitProvisionalPage: newPID = %i", m_provisionalPage->process().processIdentifier());
     3395    RELEASE_LOG_IF_ALLOWED(Loading, "commitProvisionalPage: newPID=%i", m_provisionalPage->process().processIdentifier());
    33963396
    33973397    Optional<FrameIdentifier> mainFrameIDInPreviousProcess = m_mainFrame ? makeOptional(m_mainFrame->frameID()) : WTF::nullopt;
     
    34313431void WebPageProxy::continueNavigationInNewProcess(API::Navigation& navigation, std::unique_ptr<SuspendedPageProxy>&& suspendedPage, Ref<WebProcessProxy>&& newProcess, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<API::WebsitePolicies>&& websitePolicies)
    34323432{
    3433     RELEASE_LOG_IF_ALLOWED(Loading, "continueNavigationInNewProcess: newProcessPID = %i, hasSuspendedPage = %i", newProcess->processIdentifier(), !!suspendedPage);
     3433    RELEASE_LOG_IF_ALLOWED(Loading, "continueNavigationInNewProcess: newProcessPID=%i, hasSuspendedPage=%i", newProcess->processIdentifier(), !!suspendedPage);
    34343434    LOG(Loading, "Continuing navigation %" PRIu64 " '%s' in a new web process", navigation.navigationID(), navigation.loggingString());
    34353435    RELEASE_ASSERT(!newProcess->isInProcessCache());
    34363436
    34373437    if (m_provisionalPage) {
    3438         RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "continueNavigationInNewProcess: There is already a pending provisional load, cancelling it (provisonalNavigationID: %llu, navigationID: %llu)", m_provisionalPage->navigationID(), navigation.navigationID());
     3438        RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "continueNavigationInNewProcess: There is already a pending provisional load, cancelling it (provisonalNavigationID=%llu, navigationID=%llu)", m_provisionalPage->navigationID(), navigation.navigationID());
    34393439        if (m_provisionalPage->navigationID() != navigation.navigationID())
    34403440            m_provisionalPage->cancel();
     
    44134413
    44144414    LOG(Loading, "WebPageProxy %" PRIu64 " in process pid %i didStartProvisionalLoadForFrame to frameID %" PRIu64 ", navigationID %" PRIu64 ", url %s", m_identifier.toUInt64(), process->processIdentifier(), frameID.toUInt64(), navigationID, url.string().utf8().data());
    4415     RELEASE_LOG_IF_ALLOWED(Loading, "didStartProvisionalLoadForFrame: frameID = %" PRIu64, frameID.toUInt64());
     4415    RELEASE_LOG_IF_ALLOWED(Loading, "didStartProvisionalLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
    44164416
    44174417    auto transaction = m_pageLoadState.transaction();
     
    44754475{
    44764476    LOG(Loading, "WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame to frameID %" PRIu64 ", navigationID %" PRIu64 ", url %s", frameID.toUInt64(), navigationID, request.url().string().utf8().data());
    4477     RELEASE_LOG_IF_ALLOWED(Loading, "didReceiveServerRedirectForProvisionalLoadForFrame: frameID = %" PRIu64, frameID.toUInt64());
     4477    RELEASE_LOG_IF_ALLOWED(Loading, "didReceiveServerRedirectForProvisionalLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
    44784478
    44794479    PageClientProtector protector(pageClient());
     
    45044504void WebPageProxy::willPerformClientRedirectForFrame(FrameIdentifier frameID, const String& url, double delay, WebCore::LockBackForwardList)
    45054505{
    4506     RELEASE_LOG_IF_ALLOWED(Loading, "willPerformClientRedirectForFrame: frameID = %" PRIu64, frameID.toUInt64());
     4506    RELEASE_LOG_IF_ALLOWED(Loading, "willPerformClientRedirectForFrame: frameID=%" PRIu64, frameID.toUInt64());
    45074507
    45084508    PageClientProtector protector(pageClient());
     
    45174517void WebPageProxy::didCancelClientRedirectForFrame(FrameIdentifier frameID)
    45184518{
    4519     RELEASE_LOG_IF_ALLOWED(Loading, "didCancelClientRedirectForFrame: frameID = %" PRIu64, frameID.toUInt64());
     4519    RELEASE_LOG_IF_ALLOWED(Loading, "didCancelClientRedirectForFrame: frameID=%" PRIu64, frameID.toUInt64());
    45204520
    45214521    PageClientProtector protector(pageClient());
     
    45654565{
    45664566    LOG(Loading, "(Loading) WebPageProxy %" PRIu64 " in web process pid %i didFailProvisionalLoadForFrame to provisionalURL %s", m_identifier.toUInt64(), process->processIdentifier(), provisionalURL.utf8().data());
    4567     RELEASE_LOG_ERROR_IF_ALLOWED(Process, "didFailProvisionalLoadForFrame: frameID = %" PRIu64 ", domain = %s, code = %d", frameID.toUInt64(), error.domain().utf8().data(), error.errorCode());
     4567    RELEASE_LOG_ERROR_IF_ALLOWED(Process, "didFailProvisionalLoadForFrame: frameID=%" PRIu64 ", domain=%s, code=%d", frameID.toUInt64(), error.domain().utf8().data(), error.errorCode());
    45684568
    45694569    PageClientProtector protector(pageClient());
     
    46364636    LOG(Loading, "(Loading) WebPageProxy %" PRIu64 " didCommitLoadForFrame in navigation %" PRIu64, m_identifier.toUInt64(), navigationID);
    46374637    LOG(BackForward, "(Back/Forward) After load commit, back/forward list is now:%s", m_backForwardList->loggingString());
    4638     RELEASE_LOG_IF_ALLOWED(Loading, "didCommitLoadForFrame: frameID = %" PRIu64, frameID.toUInt64());
     4638    RELEASE_LOG_IF_ALLOWED(Loading, "didCommitLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
    46394639
    46404640    PageClientProtector protector(pageClient());
     
    47584758void WebPageProxy::didFinishDocumentLoadForFrame(FrameIdentifier frameID, uint64_t navigationID, const UserData& userData)
    47594759{
    4760     RELEASE_LOG_IF_ALLOWED(Loading, "didFinishDocumentLoadForFrame: frameID = %" PRIu64, frameID.toUInt64());
     4760    RELEASE_LOG_IF_ALLOWED(Loading, "didFinishDocumentLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
    47614761
    47624762    PageClientProtector protector(pageClient());
     
    47864786{
    47874787    LOG(Loading, "WebPageProxy::didFinishLoadForFrame - WebPageProxy %p with navigationID %" PRIu64 " didFinishLoad", this, navigationID);
    4788     RELEASE_LOG_IF_ALLOWED(Loading, "didFinishLoadForFrame: frameID = %" PRIu64, frameID.toUInt64());
     4788    RELEASE_LOG_IF_ALLOWED(Loading, "didFinishLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
    47894789
    47904790    PageClientProtector protector(pageClient());
     
    48374837void WebPageProxy::didFailLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, const ResourceError& error, const UserData& userData)
    48384838{
    4839     RELEASE_LOG_ERROR_IF_ALLOWED(Loading, "didFailLoadForFrame: frameID = %" PRIu64 ", domain = %s, code = %d", frameID.toUInt64(), error.domain().utf8().data(), error.errorCode());
     4839    RELEASE_LOG_ERROR_IF_ALLOWED(Loading, "didFailLoadForFrame: frameID=%" PRIu64 ", domain=%s, code=%d", frameID.toUInt64(), error.domain().utf8().data(), error.errorCode());
    48404840
    48414841    PageClientProtector protector(pageClient());
     
    48824882void WebPageProxy::didSameDocumentNavigationForFrame(FrameIdentifier frameID, uint64_t navigationID, uint32_t opaqueSameDocumentNavigationType, URL&& url, const UserData& userData)
    48834883{
    4884     RELEASE_LOG_IF_ALLOWED(Loading, "didSameDocumentNavigationForFrame: frameID = %" PRIu64, frameID.toUInt64());
     4884    RELEASE_LOG_IF_ALLOWED(Loading, "didSameDocumentNavigationForFrame: frameID=%" PRIu64, frameID.toUInt64());
    48854885
    48864886    PageClientProtector protector(pageClient());
     
    50685068    IPC::FormDataReference&& requestBody, WebCore::ResourceResponse&& redirectResponse, const UserData& userData, Ref<PolicyDecisionSender>&& sender)
    50695069{
    5070     RELEASE_LOG_IF_ALLOWED(Loading, "decidePolicyForNavigationAction: frameID: %llu, navigationID: %llu", frame.frameID().toUInt64(), navigationID);
     5070    RELEASE_LOG_IF_ALLOWED(Loading, "decidePolicyForNavigationAction: frameID=%llu, navigationID=%llu", frame.frameID().toUInt64(), navigationID);
    50715071
    50725072    LOG(Loading, "WebPageProxy::decidePolicyForNavigationAction - Original URL %s, current target URL %s", originalRequest.url().string().utf8().data(), request.url().string().utf8().data());
     
    51655165
    51665166    auto listener = makeRef(frame.setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), frame = makeRef(frame), sender = WTFMove(sender), navigation, navigationAction, frameInfo, userDataObject = process->transformHandlesToObjects(userData.object()).get()] (PolicyAction policyAction, API::WebsitePolicies* policies, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning, Optional<NavigatingToAppBoundDomain> isAppBoundDomain) mutable {
    5167         RELEASE_LOG_IF_ALLOWED(Loading, "decidePolicyForNavigationAction: listener called: frameID: %llu, navigationID: %llu, policyAction: %u, safeBrowsingWarning: %d, isAppBoundDomain: %d", frame->frameID().toUInt64(), navigation ? navigation->navigationID() : 0, (unsigned)policyAction, !!safeBrowsingWarning, !!isAppBoundDomain);
     5167        RELEASE_LOG_IF_ALLOWED(Loading, "decidePolicyForNavigationAction: listener called: frameID=%llu, navigationID=%llu, policyAction=%u, safeBrowsingWarning=%d, isAppBoundDomain=%d", frame->frameID().toUInt64(), navigation ? navigation->navigationID() : 0, (unsigned)policyAction, !!safeBrowsingWarning, !!isAppBoundDomain);
    51685168
    51695169        auto completionHandler = [this, protectedThis, frame, sender = WTFMove(sender), navigation, navigationAction = WTFMove(navigationAction), processSwapRequestedByClient, policies = makeRefPtr(policies)] (PolicyAction policyAction) mutable {
     
    54775477void WebPageProxy::didPerformClientRedirectShared(Ref<WebProcessProxy>&& process, const String& sourceURLString, const String& destinationURLString, FrameIdentifier frameID)
    54785478{
    5479     RELEASE_LOG_IF_ALLOWED(Loading, "didPerformClientRedirectShared: frameID = %" PRIu64, frameID.toUInt64());
     5479    RELEASE_LOG_IF_ALLOWED(Loading, "didPerformClientRedirectShared: frameID=%" PRIu64, frameID.toUInt64());
    54805480
    54815481    PageClientProtector protector(pageClient());
     
    73857385void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason)
    73867386{
    7387     RELEASE_LOG_ERROR_IF_ALLOWED(Loading, "dispatchProcessDidTerminate: reason = %d", reason);
     7387    RELEASE_LOG_ERROR_IF_ALLOWED(Loading, "dispatchProcessDidTerminate: reason=%d", reason);
    73887388
    73897389    bool handledByClient = false;
  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r272550 r273183  
    495495void WebProcessPool::gpuProcessCrashed(ProcessID identifier)
    496496{
    497     WEBPROCESSPOOL_RELEASE_LOG_ERROR(Process, "gpuProcessCrashed: PID: %d", identifier);
     497    WEBPROCESSPOOL_RELEASE_LOG_ERROR(Process, "gpuProcessCrashed: PID=%d", identifier);
    498498    m_gpuProcess = nullptr;
    499499
  • trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

    r272990 r273183  
    18511851void WebProcessProxy::updateServiceWorkerProcessAssertion()
    18521852{
    1853     RELEASE_LOG(ProcessSuspension, "%p - WebProcessProxy::updateServiceWorkerProcessAssertion() PID: %d", this, processIdentifier());
     1853    RELEASE_LOG(ProcessSuspension, "%p - WebProcessProxy::updateServiceWorkerProcessAssertion() PID=%d", this, processIdentifier());
    18541854    ASSERT(m_serviceWorkerInformation);
    18551855    if (!m_serviceWorkerInformation)
  • trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm

    r271493 r273183  
    166166    if (!_assertionsNeedingBackgroundTask.computesEmpty() && ![self _hasBackgroundTask]) {
    167167        if (processHasActiveRunTimeLimitation()) {
    168             RELEASE_LOG_ERROR(ProcessSuspension, "%p - WKProcessAssertionBackgroundTaskManager: Ignored request to start a new background task because RunningBoard has already started the expiration timer", self);
     168            RELEASE_LOG(ProcessSuspension, "%p - WKProcessAssertionBackgroundTaskManager: Ignored request to start a new background task because RunningBoard has already started the expiration timer", self);
    169169            return;
    170170        }
     
    205205{
    206206    auto remainingTime = [RBSProcessHandle currentProcess].activeLimitations.runTime;
    207     RELEASE_LOG(ProcessSuspension, "WKProcessAssertionBackgroundTaskManager: Background task expired while holding WebKit ProcessAssertion (isMainThread: %d, remainingTime: %g).", RunLoop::isMain(), remainingTime);
     207    RELEASE_LOG(ProcessSuspension, "WKProcessAssertionBackgroundTaskManager: Background task expired while holding WebKit ProcessAssertion (isMainThread=%d, remainingTime=%g).", RunLoop::isMain(), remainingTime);
    208208
    209209    callOnMainRunLoopAndWait([self] {
     
    217217
    218218    auto remainingTime = [RBSProcessHandle currentProcess].activeLimitations.runTime;
    219     RELEASE_LOG(ProcessSuspension, "WKProcessAssertionBackgroundTaskManager: _handleBackgroundTaskExpirationOnMainThread (remainingTime: %g).", remainingTime);
     219    RELEASE_LOG(ProcessSuspension, "WKProcessAssertionBackgroundTaskManager: _handleBackgroundTaskExpirationOnMainThread (remainingTime=%g).", remainingTime);
    220220
    221221    // If there is no time limitation, then it means that the process is now allowed to run again and the expiration notification
     
    316316    [m_rbsAssertion addObserver:m_delegate.get()];
    317317    m_delegate.get().invalidationCallback = ^{
    318         RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion() RBS %{public}@ assertion for process with PID %d was invalidated", this, runningBoardAssertionName, pid);
     318        RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion() RBS %{public}@ assertion for process with PID=%d was invalidated", this, runningBoardAssertionName, pid);
    319319        processAssertionWasInvalidated();
    320320    };
     
    322322    NSError *acquisitionError = nil;
    323323    if (![m_rbsAssertion acquireWithError:&acquisitionError]) {
    324         RELEASE_LOG_ERROR(ProcessSuspension, "%p - ProcessAssertion: Failed to acquire RBS %{public}@ assertion '%{public}s' for process with PID %d, error: %{public}@", this, runningBoardAssertionName, reason.utf8().data(), pid, acquisitionError);
     324        RELEASE_LOG_ERROR(ProcessSuspension, "%p - ProcessAssertion: Failed to acquire RBS %{public}@ assertion '%{public}s' for process with PID=%d, error: %{public}@", this, runningBoardAssertionName, reason.utf8().data(), pid, acquisitionError);
    325325        RunLoop::main().dispatch([weakThis = makeWeakPtr(*this)] {
    326326            if (weakThis)
     
    328328        });
    329329    } else
    330         RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion: Successfully took RBS %{public}@ assertion '%{public}s' for process with PID %d", this, runningBoardAssertionName, reason.utf8().data(), pid);
     330        RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion: Successfully took RBS %{public}@ assertion '%{public}s' for process with PID=%d", this, runningBoardAssertionName, reason.utf8().data(), pid);
    331331}
    332332
    333333ProcessAssertion::~ProcessAssertion()
    334334{
    335     RELEASE_LOG(ProcessSuspension, "%p - ~ProcessAssertion() Releasing process assertion for process with PID %d", this, m_pid);
     335    RELEASE_LOG(ProcessSuspension, "%p - ~ProcessAssertion() Releasing process assertion for process with PID=%d", this, m_pid);
    336336
    337337    if (m_rbsAssertion) {
     
    346346{
    347347    ASSERT(RunLoop::isMain());
    348     RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion::processAssertionWasInvalidated() PID: %d", this, m_pid);
     348    RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion::processAssertionWasInvalidated() PID=%d", this, m_pid);
    349349
    350350    if (m_invalidationHandler)
  • trunk/Source/WebKit/UIProcess/ios/WKApplicationStateTrackingView.mm

    r265623 r273183  
    5656
    5757    auto page = [_webViewToTrack _page];
    58     RELEASE_LOG(ViewState, "%p - WKApplicationStateTrackingView: View with page [%p, pageProxyID: %" PRIu64 "] was removed from a window, _lastObservedStateWasBackground: %d", self, page.get(), page ? page->identifier().toUInt64() : 0, page ? page->lastObservedStateWasBackground() : false);
     58    RELEASE_LOG(ViewState, "%p - WKApplicationStateTrackingView: View with page [%p, pageProxyID=%" PRIu64 "] was removed from a window, _lastObservedStateWasBackground=%d", self, page.get(), page ? page->identifier().toUInt64() : 0, page ? page->lastObservedStateWasBackground() : false);
    5959    ASSERT(_applicationStateTracker);
    6060    _applicationStateTracker = nullptr;
     
    7070
    7171    _applicationStateTracker = makeUnique<WebKit::ApplicationStateTracker>(self, @selector(_applicationDidEnterBackground), @selector(_applicationDidFinishSnapshottingAfterEnteringBackground), @selector(_applicationWillEnterForeground), @selector(_willBeginSnapshotSequence), @selector(_didCompleteSnapshotSequence));
    72     RELEASE_LOG(ViewState, "%p - WKApplicationStateTrackingView: View with page [%p, pageProxyID: %" PRIu64 "] was added to a window, _lastObservedStateWasBackground: %d, isNowBackground: %d", self, page.get(), page ? page->identifier().toUInt64() : 0, lastObservedStateWasBackground, [self isBackground]);
     72    RELEASE_LOG(ViewState, "%p - WKApplicationStateTrackingView: View with page [%p, pageProxyID=%" PRIu64 "] was added to a window, _lastObservedStateWasBackground=%d, isNowBackground=%d", self, page.get(), page ? page->identifier().toUInt64() : 0, lastObservedStateWasBackground, [self isBackground]);
    7373
    7474    if (lastObservedStateWasBackground && ![self isBackground])
  • trunk/Source/WebKit/UIProcess/ios/WKContentView.mm

    r272592 r273183  
    234234    // Propagate the view's visibility state to the WebContent process so that it is marked as "Foreground Running" when necessary.
    235235    _visibilityPropagationView = adoptNS([[_UILayerHostView alloc] initWithFrame:CGRectZero pid:processIdentifier contextID:contextID]);
    236     RELEASE_LOG(Process, "Created visibility propagation view %p (contextID: %u) for WebContent process with PID %d", _visibilityPropagationView.get(), contextID, processIdentifier);
     236    RELEASE_LOG(Process, "Created visibility propagation view %p (contextID=%u) for WebContent process with PID=%d", _visibilityPropagationView.get(), contextID, processIdentifier);
    237237    [self addSubview:_visibilityPropagationView.get()];
    238238}
     
    253253    // Propagate the view's visibility state to the GPU process so that it is marked as "Foreground Running" when necessary.
    254254    _visibilityPropagationViewForGPUProcess = adoptNS([[_UILayerHostView alloc] initWithFrame:CGRectZero pid:processIdentifier contextID:contextID]);
    255     RELEASE_LOG(Process, "Created visibility propagation view %p (contextID: %u) for GPU process with PID %d", _visibilityPropagationViewForGPUProcess.get(), contextID, processIdentifier);
     255    RELEASE_LOG(Process, "Created visibility propagation view %p (contextID=%u) for GPU process with PID=%d", _visibilityPropagationViewForGPUProcess.get(), contextID, processIdentifier);
    256256    [self addSubview:_visibilityPropagationViewForGPUProcess.get()];
    257257}
  • trunk/Source/WebKit/WebAuthnProcess/WebAuthnProcess.cpp

    r270616 r273183  
    9999void WebAuthnProcess::prepareToSuspend(bool isSuspensionImminent, CompletionHandler<void()>&& completionHandler)
    100100{
    101     RELEASE_LOG(ProcessSuspension, "%p - WebAuthnProcess::prepareToSuspend(), isSuspensionImminent: %d", this, isSuspensionImminent);
     101    RELEASE_LOG(ProcessSuspension, "%p - WebAuthnProcess::prepareToSuspend(), isSuspensionImminent=%d", this, isSuspensionImminent);
    102102
    103103    lowMemoryHandler(Critical::Yes);
  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp

    r270912 r273183  
    385385        auto counter = ++m_loggingCounter;
    386386#define LOCAL_LOG(str, ...) \
    387         RELEASE_LOG(ResourceLoadStatistics, "ResourceLoadObserver::logUserInteraction: counter = %" PRIu64 ": " str, counter, ##__VA_ARGS__)
     387        RELEASE_LOG(ResourceLoadStatistics, "ResourceLoadObserver::logUserInteraction: counter=%" PRIu64 ": " str, counter, ##__VA_ARGS__)
    388388
    389389        auto escapeForJSON = [](String s) {
  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r273102 r273183  
    34653465
    34663466    WebFrame* frame = WebProcess::singleton().webFrame(frameID);
    3467     RELEASE_LOG_IF_ALLOWED(Loading, "didReceivePolicyDecision: policyAction: %u - frameID: %llu - webFrame: %p - mainFrame: %d", (unsigned)policyDecision.policyAction, frameID.toUInt64(), frame, frame ? frame->isMainFrame() : 0);
     3467    RELEASE_LOG_IF_ALLOWED(Loading, "didReceivePolicyDecision: policyAction=%u - frameID=%llu - webFrame=%p - mainFrame=%d", (unsigned)policyDecision.policyAction, frameID.toUInt64(), frame, frame ? frame->isMainFrame() : 0);
    34683468
    34693469    if (!frame)
  • trunk/Source/WebKit/WebProcess/WebProcess.cpp

    r273074 r273183  
    509509#endif
    510510
    511     RELEASE_LOG_IF_ALLOWED(Process, "initializeWebProcess: Presenting process = %d", WebCore::presentingApplicationPID());
     511    RELEASE_LOG_IF_ALLOWED(Process, "initializeWebProcess: Presenting processPID=%d", WebCore::presentingApplicationPID());
    512512}
    513513
     
    13801380void WebProcess::prepareToSuspend(bool isSuspensionImminent, CompletionHandler<void()>&& completionHandler)
    13811381{
    1382     RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "prepareToSuspend: isSuspensionImminent: %d", isSuspensionImminent);
     1382    RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "prepareToSuspend: isSuspensionImminent=%d", isSuspensionImminent);
    13831383    SetForScope<bool> suspensionScope(m_isSuspending, true);
    13841384    m_processIsSuspended = true;
  • trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

    r273082 r273183  
    495495    ASSERT(!error);
    496496    if (error) {
    497         RELEASE_LOG_ERROR_IF_ALLOWED(Process, "updateProcessName: Failed to set the display name of the WebContent process, error code: %ld", static_cast<long>(error));
     497        RELEASE_LOG_ERROR_IF_ALLOWED(Process, "updateProcessName: Failed to set the display name of the WebContent process, error code=%ld", static_cast<long>(error));
    498498        return;
    499499    }
     
    975975    auto result = memorystatus_control(MEMORYSTATUS_CMD_SET_PROCESS_IS_FREEZABLE, getpid(), isFreezable ? 1 : 0, nullptr, 0);
    976976    if (result)
    977         RELEASE_LOG_ERROR_IF_ALLOWED(ProcessSuspension, "updateFreezerStatus: isFreezable: %d, error: %d", isFreezable, result);
     977        RELEASE_LOG_ERROR_IF_ALLOWED(ProcessSuspension, "updateFreezerStatus: isFreezable=%d, error=%d", isFreezable, result);
    978978    else
    979         RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "updateFreezerStatus: isFreezable: %d, success", isFreezable);
     979        RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "updateFreezerStatus: isFreezable=%d, success", isFreezable);
    980980}
    981981#endif
Note: See TracChangeset for help on using the changeset viewer.