<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[278315] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/278315">278315</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-06-01 11:14:29 -0700 (Tue, 01 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Enable WebPageProxy's release logging in ephemeral sessions
https://bugs.webkit.org/show_bug.cgi?id=226342

Reviewed by Geoff Garen.

Enable WebPageProxy's release logging in ephemeral sessions. Our release logging doesn't
contain anything sensitive and not having this logging makes it hard to debug issues in
apps using ephemeral sessions.

* UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm:
(WebKit::SOAuthorizationSession::shouldStart):
(WebKit::SOAuthorizationSession::start):
(WebKit::SOAuthorizationSession::continueStartAfterGetAuthorizationHints):
(WebKit::SOAuthorizationSession::continueStartAfterDecidePolicy):
(WebKit::SOAuthorizationSession::fallBackToWebPath):
(WebKit::SOAuthorizationSession::abort):
(WebKit::SOAuthorizationSession::complete):
(WebKit::SOAuthorizationSession::presentViewController):
(WebKit::SOAuthorizationSession::dismissViewController):
* 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::didCreateContextInWebProcessForVisibilityPropagation):
(WebKit::ProvisionalPageProxy::didCreateContextInGPUProcessForVisibilityPropagation):
* UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::isAlwaysOnLoggingAllowed const):
* UIProcess/WebPageProxy.cpp:
(WebKit::m_limitsNavigationsToAppBoundDomains):
(WebKit::WebPageProxy::~WebPageProxy):
(WebKit::WebPageProxy::launchProcess):
(WebKit::WebPageProxy::suspendCurrentPageIfPossible):
(WebKit::WebPageProxy::swapToProvisionalPage):
(WebKit::WebPageProxy::launchProcessForReload):
(WebKit::WebPageProxy::close):
(WebKit::WebPageProxy::tryClose):
(WebKit::WebPageProxy::tryCloseTimedOut):
(WebKit::WebPageProxy::loadRequest):
(WebKit::WebPageProxy::loadRequestWithNavigationShared):
(WebKit::WebPageProxy::loadFile):
(WebKit::WebPageProxy::loadData):
(WebKit::WebPageProxy::loadDataWithNavigationShared):
(WebKit::WebPageProxy::loadSimulatedRequest):
(WebKit::WebPageProxy::loadAlternateHTML):
(WebKit::WebPageProxy::loadWebArchiveData):
(WebKit::WebPageProxy::navigateToPDFLinkWithSimulatedClick):
(WebKit::WebPageProxy::stopLoading):
(WebKit::WebPageProxy::reload):
(WebKit::WebPageProxy::goToBackForwardItem):
(WebKit::WebPageProxy::tryRestoreScrollPosition):
(WebKit::WebPageProxy::updateActivityState):
(WebKit::WebPageProxy::updateThrottleState):
(WebKit::WebPageProxy::clearAudibleActivity):
(WebKit::WebPageProxy::stopMakingViewBlankDueToLackOfRenderingUpdate):
(WebKit::WebPageProxy::makeViewBlankIfUnpaintedSinceLastLoadCommit):
(WebKit::WebPageProxy::receivedNavigationPolicyDecision):
(WebKit::WebPageProxy::commitProvisionalPage):
(WebKit::WebPageProxy::continueNavigationInNewProcess):
(WebKit::WebPageProxy::suspend):
(WebKit::WebPageProxy::resume):
(WebKit::WebPageProxy::restoreFromSessionState):
(WebKit::WebPageProxy::didStartProvisionalLoadForFrameShared):
(WebKit::WebPageProxy::didExplicitOpenForFrame):
(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::didNavigateWithNavigationDataShared):
(WebKit::WebPageProxy::didPerformClientRedirectShared):
(WebKit::WebPageProxy::didPerformServerRedirectShared):
(WebKit::WebPageProxy::closePage):
(WebKit::WebPageProxy::processDidBecomeUnresponsive):
(WebKit::WebPageProxy::processDidBecomeResponsive):
(WebKit::WebPageProxy::resetStateAfterProcessTermination):
(WebKit::WebPageProxy::dispatchProcessDidTerminate):
(WebKit::WebPageProxy::tryReloadAfterProcessTermination):
(WebKit::WebPageProxy::requestStorageSpace):
(WebKit::WebPageProxy::updateReportedMediaCaptureState):
(WebKit::WebPageProxy::didExceedInactiveMemoryLimitWhileActive):
(WebKit::WebPageProxy::didExceedBackgroundCPULimitWhileInForeground):
(WebKit::WebPageProxy::logger):
* UIProcess/WebPageProxy.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIiosWKWebViewIOSmm">trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaLegacyDownloadClientmm">trunk/Source/WebKit/UIProcess/Cocoa/LegacyDownloadClient.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaNavigationStatemm">trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaSOAuthorizationSOAuthorizationSessionmm">trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessProvisionalPageProxycpp">trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessRemoteLayerTreeRemoteLayerTreeDrawingAreaProxymm">trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxycpp">trunk/Source/WebKit/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxyh">trunk/Source/WebKit/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (278314 => 278315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-06-01 17:36:49 UTC (rev 278314)
+++ trunk/Source/WebKit/ChangeLog       2021-06-01 18:14:29 UTC (rev 278315)
</span><span class="lines">@@ -1,3 +1,101 @@
</span><ins>+2021-06-01  Chris Dumez  <cdumez@apple.com>
+
+        Enable WebPageProxy's release logging in ephemeral sessions
+        https://bugs.webkit.org/show_bug.cgi?id=226342
+
+        Reviewed by Geoff Garen.
+
+        Enable WebPageProxy's release logging in ephemeral sessions. Our release logging doesn't
+        contain anything sensitive and not having this logging makes it hard to debug issues in
+        apps using ephemeral sessions.
+
+        * UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm:
+        (WebKit::SOAuthorizationSession::shouldStart):
+        (WebKit::SOAuthorizationSession::start):
+        (WebKit::SOAuthorizationSession::continueStartAfterGetAuthorizationHints):
+        (WebKit::SOAuthorizationSession::continueStartAfterDecidePolicy):
+        (WebKit::SOAuthorizationSession::fallBackToWebPath):
+        (WebKit::SOAuthorizationSession::abort):
+        (WebKit::SOAuthorizationSession::complete):
+        (WebKit::SOAuthorizationSession::presentViewController):
+        (WebKit::SOAuthorizationSession::dismissViewController):
+        * 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::didCreateContextInWebProcessForVisibilityPropagation):
+        (WebKit::ProvisionalPageProxy::didCreateContextInGPUProcessForVisibilityPropagation):
+        * UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm:
+        (WebKit::RemoteLayerTreeDrawingAreaProxy::isAlwaysOnLoggingAllowed const):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::m_limitsNavigationsToAppBoundDomains):
+        (WebKit::WebPageProxy::~WebPageProxy):
+        (WebKit::WebPageProxy::launchProcess):
+        (WebKit::WebPageProxy::suspendCurrentPageIfPossible):
+        (WebKit::WebPageProxy::swapToProvisionalPage):
+        (WebKit::WebPageProxy::launchProcessForReload):
+        (WebKit::WebPageProxy::close):
+        (WebKit::WebPageProxy::tryClose):
+        (WebKit::WebPageProxy::tryCloseTimedOut):
+        (WebKit::WebPageProxy::loadRequest):
+        (WebKit::WebPageProxy::loadRequestWithNavigationShared):
+        (WebKit::WebPageProxy::loadFile):
+        (WebKit::WebPageProxy::loadData):
+        (WebKit::WebPageProxy::loadDataWithNavigationShared):
+        (WebKit::WebPageProxy::loadSimulatedRequest):
+        (WebKit::WebPageProxy::loadAlternateHTML):
+        (WebKit::WebPageProxy::loadWebArchiveData):
+        (WebKit::WebPageProxy::navigateToPDFLinkWithSimulatedClick):
+        (WebKit::WebPageProxy::stopLoading):
+        (WebKit::WebPageProxy::reload):
+        (WebKit::WebPageProxy::goToBackForwardItem):
+        (WebKit::WebPageProxy::tryRestoreScrollPosition):
+        (WebKit::WebPageProxy::updateActivityState):
+        (WebKit::WebPageProxy::updateThrottleState):
+        (WebKit::WebPageProxy::clearAudibleActivity):
+        (WebKit::WebPageProxy::stopMakingViewBlankDueToLackOfRenderingUpdate):
+        (WebKit::WebPageProxy::makeViewBlankIfUnpaintedSinceLastLoadCommit):
+        (WebKit::WebPageProxy::receivedNavigationPolicyDecision):
+        (WebKit::WebPageProxy::commitProvisionalPage):
+        (WebKit::WebPageProxy::continueNavigationInNewProcess):
+        (WebKit::WebPageProxy::suspend):
+        (WebKit::WebPageProxy::resume):
+        (WebKit::WebPageProxy::restoreFromSessionState):
+        (WebKit::WebPageProxy::didStartProvisionalLoadForFrameShared):
+        (WebKit::WebPageProxy::didExplicitOpenForFrame):
+        (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::didNavigateWithNavigationDataShared):
+        (WebKit::WebPageProxy::didPerformClientRedirectShared):
+        (WebKit::WebPageProxy::didPerformServerRedirectShared):
+        (WebKit::WebPageProxy::closePage):
+        (WebKit::WebPageProxy::processDidBecomeUnresponsive):
+        (WebKit::WebPageProxy::processDidBecomeResponsive):
+        (WebKit::WebPageProxy::resetStateAfterProcessTermination):
+        (WebKit::WebPageProxy::dispatchProcessDidTerminate):
+        (WebKit::WebPageProxy::tryReloadAfterProcessTermination):
+        (WebKit::WebPageProxy::requestStorageSpace):
+        (WebKit::WebPageProxy::updateReportedMediaCaptureState):
+        (WebKit::WebPageProxy::didExceedInactiveMemoryLimitWhileActive):
+        (WebKit::WebPageProxy::didExceedBackgroundCPULimitWhileInForeground):
+        (WebKit::WebPageProxy::logger):
+        * UIProcess/WebPageProxy.h:
+
</ins><span class="cx"> 2021-06-01  Per Arne  <pvollan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [iOS] Preprocess the WebContent sandbox
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIiosWKWebViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (278314 => 278315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm    2021-06-01 17:36:49 UTC (rev 278314)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm       2021-06-01 18:14:29 UTC (rev 278315)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">         [_contentView _action ## ForWebView:sender]; \
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(_page && _page->isAlwaysOnLoggingAllowed(), ViewState, __VA_ARGS__)
</del><ins>+#define WKWEBVIEW_RELEASE_LOG(...) RELEASE_LOG(ViewState, __VA_ARGS__)
</ins><span class="cx"> 
</span><span class="cx"> static const Seconds delayBeforeNoVisibleContentsRectsLogging = 1_s;
</span><span class="cx"> static const Seconds delayBeforeNoCommitsLogging = 5_s;
</span><span class="lines">@@ -686,13 +686,13 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_processWillSwap
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("%p -[WKWebView _processWillSwap]", self);
</del><ins>+    WKWEBVIEW_RELEASE_LOG("%p -[WKWebView _processWillSwap]", self);
</ins><span class="cx">     [self _processWillSwapOrDidExit];
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_processDidExit
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("%p -[WKWebView _processDidExit]", self);
</del><ins>+    WKWEBVIEW_RELEASE_LOG("%p -[WKWebView _processDidExit]", self);
</ins><span class="cx"> 
</span><span class="cx">     [self _processWillSwapOrDidExit];
</span><span class="cx"> 
</span><span class="lines">@@ -704,7 +704,7 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_didRelaunchProcess
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("%p -[WKWebView _didRelaunchProcess]", self);
</del><ins>+    WKWEBVIEW_RELEASE_LOG("%p -[WKWebView _didRelaunchProcess]", self);
</ins><span class="cx">     _hasScheduledVisibleRectUpdate = NO;
</span><span class="cx">     _viewStabilityWhenVisibleContentRectUpdateScheduled = { };
</span><span class="cx">     if (_gestureController)
</span><span class="lines">@@ -787,7 +787,7 @@
</span><span class="cx"> - (void)_trackTransactionCommit:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction
</span><span class="cx"> {
</span><span class="cx">     if (_didDeferUpdateVisibleContentRectsForUnstableScrollView) {
</span><del>-        RELEASE_LOG_IF_ALLOWED("%p (pageProxyID=%llu) -[WKWebView _didCommitLayerTree:] - received a commit (%llu) while deferring visible content rect updates (_dynamicViewportUpdateMode %d, _needsResetViewStateAfterCommitLoadForMainFrame %d (wants commit %llu), sizeChangedSinceLastVisibleContentRectUpdate %d, [_scrollView isZoomBouncing] %d, _currentlyAdjustingScrollViewInsetsForKeyboard %d)",
</del><ins>+        WKWEBVIEW_RELEASE_LOG("%p (pageProxyID=%llu) -[WKWebView _didCommitLayerTree:] - received a commit (%llu) while deferring visible content rect updates (_dynamicViewportUpdateMode %d, _needsResetViewStateAfterCommitLoadForMainFrame %d (wants commit %llu), sizeChangedSinceLastVisibleContentRectUpdate %d, [_scrollView isZoomBouncing] %d, _currentlyAdjustingScrollViewInsetsForKeyboard %d)",
</ins><span class="cx">         self, _page->identifier().toUInt64(), layerTreeTransaction.transactionID().toUInt64(), _dynamicViewportUpdateMode, _needsResetViewStateAfterCommitLoadForMainFrame, _firstPaintAfterCommitLoadTransactionID.toUInt64(), [_contentView sizeChangedSinceLastVisibleContentRectUpdate], [_scrollView isZoomBouncing], _currentlyAdjustingScrollViewInsetsForKeyboard);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -794,7 +794,7 @@
</span><span class="cx">     if (_timeOfFirstVisibleContentRectUpdateWithPendingCommit) {
</span><span class="cx">         auto timeSinceFirstRequestWithPendingCommit = MonotonicTime::now() - *_timeOfFirstVisibleContentRectUpdateWithPendingCommit;
</span><span class="cx">         if (timeSinceFirstRequestWithPendingCommit > delayBeforeNoCommitsLogging)
</span><del>-            RELEASE_LOG_IF_ALLOWED("%p (pageProxyID=%llu) -[WKWebView _didCommitLayerTree:] - finally received commit %.2fs after visible content rect update request; transactionID %llu", self, _page->identifier().toUInt64(), timeSinceFirstRequestWithPendingCommit.value(), layerTreeTransaction.transactionID().toUInt64());
</del><ins>+            WKWEBVIEW_RELEASE_LOG("%p (pageProxyID=%llu) -[WKWebView _didCommitLayerTree:] - finally received commit %.2fs after visible content rect update request; transactionID %llu", self, _page->identifier().toUInt64(), timeSinceFirstRequestWithPendingCommit.value(), layerTreeTransaction.transactionID().toUInt64());
</ins><span class="cx">         _timeOfFirstVisibleContentRectUpdateWithPendingCommit = std::nullopt;
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="lines">@@ -894,7 +894,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (_resizeAnimationView)
</span><del>-        RELEASE_LOG_IF_ALLOWED("%p -[WKWebView _didCommitLayerTree:] - dynamicViewportUpdateMode is NotResizing, but still have a live resizeAnimationView (unpaired begin/endAnimatedResize?)", self);
</del><ins>+        WKWEBVIEW_RELEASE_LOG("%p -[WKWebView _didCommitLayerTree:] - dynamicViewportUpdateMode is NotResizing, but still have a live resizeAnimationView (unpaired begin/endAnimatedResize?)", self);
</ins><span class="cx"> 
</span><span class="cx">     [self _updateScrollViewForTransaction:layerTreeTransaction];
</span><span class="cx"> 
</span><span class="lines">@@ -1964,7 +1964,7 @@
</span><span class="cx">     [CATransaction addCommitHandler:[retainedSelf] {
</span><span class="cx">         WKWebView *webView = retainedSelf.get();
</span><span class="cx">         if (![webView _isValid]) {
</span><del>-            RELEASE_LOG_IF(webView._page && webView._page->isAlwaysOnLoggingAllowed(), ViewState, "In CATransaction preCommitHandler, WKWebView %p is invalid", webView);
</del><ins>+            WKWEBVIEW_RELEASE_LOG("In CATransaction preCommitHandler, WKWebView %p is invalid", webView);
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -1971,7 +1971,7 @@
</span><span class="cx">         @try {
</span><span class="cx">             [webView _updateVisibleContentRects];
</span><span class="cx">         } @catch (NSException *exception) {
</span><del>-            RELEASE_LOG_IF(webView._page && webView._page->isAlwaysOnLoggingAllowed(), ViewState, "In CATransaction preCommitHandler, -[WKWebView %p _updateVisibleContentRects] threw an exception", webView);
</del><ins>+            WKWEBVIEW_RELEASE_LOG("In CATransaction preCommitHandler, -[WKWebView %p _updateVisibleContentRects] threw an exception", webView);
</ins><span class="cx">         }
</span><span class="cx">         webView->_hasScheduledVisibleRectUpdate = NO;
</span><span class="cx">     } forPhase:kCATransactionPhasePreCommit];
</span><span class="lines">@@ -1984,7 +1984,7 @@
</span><span class="cx">     if (_hasScheduledVisibleRectUpdate) {
</span><span class="cx">         auto timeNow = MonotonicTime::now();
</span><span class="cx">         if ((timeNow - _timeOfRequestForVisibleContentRectUpdate) > delayBeforeNoVisibleContentsRectsLogging) {
</span><del>-            RELEASE_LOG_IF_ALLOWED("-[WKWebView %p _scheduleVisibleContentRectUpdateAfterScrollInView]: _hasScheduledVisibleRectUpdate is true but haven't updated visible content rects for %.2fs (last update was %.2fs ago) - valid %d",
</del><ins>+            WKWEBVIEW_RELEASE_LOG("-[WKWebView %p _scheduleVisibleContentRectUpdateAfterScrollInView]: _hasScheduledVisibleRectUpdate is true but haven't updated visible content rects for %.2fs (last update was %.2fs ago) - valid %d",
</ins><span class="cx">                 self, (timeNow - _timeOfRequestForVisibleContentRectUpdate).value(), (timeNow - _timeOfLastVisibleContentRectUpdate).value(), [self _isValid]);
</span><span class="cx">         }
</span><span class="cx">         return;
</span><span class="lines">@@ -2079,7 +2079,7 @@
</span><span class="cx">         [_passwordView setFrame:self.bounds];
</span><span class="cx">         [_customContentView web_computedContentInsetDidChange];
</span><span class="cx">         _didDeferUpdateVisibleContentRectsForAnyReason = YES;
</span><del>-        RELEASE_LOG_IF_ALLOWED("%p (pageProxyID=%llu) -[WKWebView _updateVisibleContentRects:] - usesStandardContentView is NO, bailing", self, _page->identifier().toUInt64());
</del><ins>+        WKWEBVIEW_RELEASE_LOG("%p (pageProxyID=%llu) -[WKWebView _updateVisibleContentRects:] - usesStandardContentView is NO, bailing", self, _page->identifier().toUInt64());
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -2087,13 +2087,13 @@
</span><span class="cx">     if (_timeOfFirstVisibleContentRectUpdateWithPendingCommit) {
</span><span class="cx">         auto timeSinceFirstRequestWithPendingCommit = timeNow - *_timeOfFirstVisibleContentRectUpdateWithPendingCommit;
</span><span class="cx">         if (timeSinceFirstRequestWithPendingCommit > delayBeforeNoCommitsLogging)
</span><del>-            RELEASE_LOG_IF_ALLOWED("%p (pageProxyID=%llu) -[WKWebView _updateVisibleContentRects:] - have not received a commit %.2fs after visible content rect update; lastTransactionID %llu", self, _page->identifier().toUInt64(), timeSinceFirstRequestWithPendingCommit.value(), _lastTransactionID.toUInt64());
</del><ins>+            WKWEBVIEW_RELEASE_LOG("%p (pageProxyID=%llu) -[WKWebView _updateVisibleContentRects:] - have not received a commit %.2fs after visible content rect update; lastTransactionID %llu", self, _page->identifier().toUInt64(), timeSinceFirstRequestWithPendingCommit.value(), _lastTransactionID.toUInt64());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (_invokingUIScrollViewDelegateCallback) {
</span><span class="cx">         _didDeferUpdateVisibleContentRectsForUIScrollViewDelegateCallback = YES;
</span><span class="cx">         _didDeferUpdateVisibleContentRectsForAnyReason = YES;
</span><del>-        RELEASE_LOG_IF_ALLOWED("%p (pageProxyID=%llu) -[WKWebView _updateVisibleContentRects:] - _invokingUIScrollViewDelegateCallback is YES, bailing", self, _page->identifier().toUInt64());
</del><ins>+        WKWEBVIEW_RELEASE_LOG("%p (pageProxyID=%llu) -[WKWebView _updateVisibleContentRects:] - _invokingUIScrollViewDelegateCallback is YES, bailing", self, _page->identifier().toUInt64());
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -2106,13 +2106,13 @@
</span><span class="cx">         || _currentlyAdjustingScrollViewInsetsForKeyboard) {
</span><span class="cx">         _didDeferUpdateVisibleContentRectsForAnyReason = YES;
</span><span class="cx">         _didDeferUpdateVisibleContentRectsForUnstableScrollView = YES;
</span><del>-        RELEASE_LOG_IF_ALLOWED("%p (pageProxyID=%llu) -[WKWebView _updateVisibleContentRects:] - scroll view state is non-stable, bailing (_dynamicViewportUpdateMode %d, _needsResetViewStateAfterCommitLoadForMainFrame %d, sizeChangedSinceLastVisibleContentRectUpdate %d, [_scrollView isZoomBouncing] %d, _currentlyAdjustingScrollViewInsetsForKeyboard %d)",
</del><ins>+        WKWEBVIEW_RELEASE_LOG("%p (pageProxyID=%llu) -[WKWebView _updateVisibleContentRects:] - scroll view state is non-stable, bailing (_dynamicViewportUpdateMode %d, _needsResetViewStateAfterCommitLoadForMainFrame %d, sizeChangedSinceLastVisibleContentRectUpdate %d, [_scrollView isZoomBouncing] %d, _currentlyAdjustingScrollViewInsetsForKeyboard %d)",
</ins><span class="cx">             self, _page->identifier().toUInt64(), _dynamicViewportUpdateMode, _needsResetViewStateAfterCommitLoadForMainFrame, [_contentView sizeChangedSinceLastVisibleContentRectUpdate], [_scrollView isZoomBouncing], _currentlyAdjustingScrollViewInsetsForKeyboard);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (_didDeferUpdateVisibleContentRectsForAnyReason)
</span><del>-        RELEASE_LOG_IF_ALLOWED("%p (pageProxyID=%llu) -[WKWebView _updateVisibleContentRects:] - performing first visible content rect update after deferring updates", self, _page->identifier().toUInt64());
</del><ins>+        WKWEBVIEW_RELEASE_LOG("%p (pageProxyID=%llu) -[WKWebView _updateVisibleContentRects:] - performing first visible content rect update after deferring updates", self, _page->identifier().toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     _didDeferUpdateVisibleContentRectsForUIScrollViewDelegateCallback = NO;
</span><span class="cx">     _didDeferUpdateVisibleContentRectsForUnstableScrollView = NO;
</span><span class="lines">@@ -2166,7 +2166,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if ((timeNow - _timeOfRequestForVisibleContentRectUpdate) > delayBeforeNoVisibleContentsRectsLogging)
</span><del>-        RELEASE_LOG_IF_ALLOWED("%p -[WKWebView _updateVisibleContentRects:] finally ran %.2fs after being scheduled", self, (timeNow - _timeOfRequestForVisibleContentRectUpdate).value());
</del><ins>+        WKWEBVIEW_RELEASE_LOG("%p -[WKWebView _updateVisibleContentRects:] finally ran %.2fs after being scheduled", self, (timeNow - _timeOfRequestForVisibleContentRectUpdate).value());
</ins><span class="cx"> 
</span><span class="cx">     _alwaysSendNextVisibleContentRectUpdate = NO;
</span><span class="cx">     _timeOfLastVisibleContentRectUpdate = timeNow;
</span><span class="lines">@@ -2192,7 +2192,7 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_cancelAnimatedResize
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("%p (pageProxyID=%llu) -[WKWebView _cancelAnimatedResize] _dynamicViewportUpdateMode %d", self, _page->identifier().toUInt64(), _dynamicViewportUpdateMode);
</del><ins>+    WKWEBVIEW_RELEASE_LOG("%p (pageProxyID=%llu) -[WKWebView _cancelAnimatedResize] _dynamicViewportUpdateMode %d", self, _page->identifier().toUInt64(), _dynamicViewportUpdateMode);
</ins><span class="cx"> 
</span><span class="cx">     if (_dynamicViewportUpdateMode == WebKit::DynamicViewportUpdateMode::NotResizing)
</span><span class="cx">         return;
</span><span class="lines">@@ -2224,12 +2224,12 @@
</span><span class="cx"> 
</span><span class="cx">     if (!_resizeAnimationView) {
</span><span class="cx">         // Paranoia. If _resizeAnimationView is null we'll end up setting a zero scale on the content view.
</span><del>-        RELEASE_LOG_IF_ALLOWED("%p -[WKWebView _didCompleteAnimatedResize:] - _resizeAnimationView is nil", self);
</del><ins>+        WKWEBVIEW_RELEASE_LOG("%p -[WKWebView _didCompleteAnimatedResize:] - _resizeAnimationView is nil", self);
</ins><span class="cx">         [self _cancelAnimatedResize];
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED("%p (pageProxyID=%llu) -[WKWebView _didCompleteAnimatedResize]", self, _page->identifier().toUInt64());
</del><ins>+    WKWEBVIEW_RELEASE_LOG("%p (pageProxyID=%llu) -[WKWebView _didCompleteAnimatedResize]", self, _page->identifier().toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     NSUInteger indexOfResizeAnimationView = [[_scrollView subviews] indexOfObject:_resizeAnimationView.get()];
</span><span class="cx">     [_scrollView insertSubview:_contentView.get() atIndex:indexOfResizeAnimationView];
</span><span class="lines">@@ -2900,7 +2900,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED("%p (pageProxyID=%llu) -[WKWebView _beginAnimatedResizeWithUpdates:]", self, _page->identifier().toUInt64());
</del><ins>+    WKWEBVIEW_RELEASE_LOG("%p (pageProxyID=%llu) -[WKWebView _beginAnimatedResizeWithUpdates:]", self, _page->identifier().toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     _dynamicViewportUpdateMode = WebKit::DynamicViewportUpdateMode::ResizingWithAnimation;
</span><span class="cx"> 
</span><span class="lines">@@ -3037,7 +3037,7 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_endAnimatedResize
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("%p (pageProxyID=%llu) -[WKWebView _endAnimatedResize] _dynamicViewportUpdateMode %d", self, _page->identifier().toUInt64(), _dynamicViewportUpdateMode);
</del><ins>+    WKWEBVIEW_RELEASE_LOG("%p (pageProxyID=%llu) -[WKWebView _endAnimatedResize] _dynamicViewportUpdateMode %d", self, _page->identifier().toUInt64(), _dynamicViewportUpdateMode);
</ins><span class="cx"> 
</span><span class="cx">     // If we already have an up-to-date layer tree, immediately complete
</span><span class="cx">     // the resize. Otherwise, we will defer completion until we do.
</span><span class="lines">@@ -3048,7 +3048,7 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_resizeWhileHidingContentWithUpdates:(void (^)(void))updateBlock
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("%p (pageProxyID=%llu) -[WKWebView _resizeWhileHidingContentWithUpdates:]", self, _page->identifier().toUInt64());
</del><ins>+    WKWEBVIEW_RELEASE_LOG("%p (pageProxyID=%llu) -[WKWebView _resizeWhileHidingContentWithUpdates:]", self, _page->identifier().toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     [self _beginAnimatedResizeWithUpdates:updateBlock];
</span><span class="cx">     if (_dynamicViewportUpdateMode == WebKit::DynamicViewportUpdateMode::ResizingWithAnimation) {
</span><span class="lines">@@ -3352,4 +3352,6 @@
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+#undef WKWEBVIEW_RELEASE_LOG
+
</ins><span class="cx"> #endif // PLATFORM(IOS_FAMILY)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaLegacyDownloadClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/LegacyDownloadClient.mm (278314 => 278315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/LegacyDownloadClient.mm      2021-06-01 17:36:49 UTC (rev 278314)
+++ trunk/Source/WebKit/UIProcess/Cocoa/LegacyDownloadClient.mm 2021-06-01 18:14:29 UTC (rev 278315)
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx">     if (auto* webPage = downloadProxy.originatingPage()) {
</span><del>-        RELEASE_LOG_IF(webPage->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - UIProcess is taking a background assertion because it is downloading a system preview", this);
</del><ins>+        RELEASE_LOG(ProcessSuspension, "%p - UIProcess is taking a background assertion because it is downloading a system preview", this);
</ins><span class="cx">         ASSERT(!m_activity);
</span><span class="cx">         m_activity = webPage->process().throttler().backgroundActivity("System preview download"_s).moveToUniquePtr();
</span><span class="cx">     }
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx">     if (m_activity) {
</span><del>-        RELEASE_LOG_IF(downloadProxy.originatingPage()->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p UIProcess is releasing a background assertion because a system preview download completed", this);
</del><ins>+        RELEASE_LOG(ProcessSuspension, "%p UIProcess is releasing a background assertion because a system preview download completed", this);
</ins><span class="cx">         m_activity = nullptr;
</span><span class="cx">     }
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm (278314 => 278315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm   2021-06-01 17:36:49 UTC (rev 278314)
+++ trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm      2021-06-01 18:14:29 UTC (rev 278315)
</span><span class="lines">@@ -1368,10 +1368,10 @@
</span><span class="cx"> 
</span><span class="cx">     switch (reason) {
</span><span class="cx">     case NetworkActivityReleaseReason::LoadCompleted:
</span><del>-        RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p NavigationState is releasing background process assertion because a page load completed", this);
</del><ins>+        RELEASE_LOG(ProcessSuspension, "%p NavigationState is releasing background process assertion because a page load completed", this);
</ins><span class="cx">         break;
</span><span class="cx">     case NetworkActivityReleaseReason::ScreenLocked:
</span><del>-        RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p NavigationState is releasing background process assertion because the screen was locked", this);
</del><ins>+        RELEASE_LOG(ProcessSuspension, "%p NavigationState is releasing background process assertion because the screen was locked", this);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">     m_networkActivity = nullptr;
</span><span class="lines">@@ -1388,17 +1388,17 @@
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         if (m_releaseNetworkActivityTimer.isActive()) {
</span><del>-            RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NavigationState keeps its process network assertion because a new page load started", this);
</del><ins>+            RELEASE_LOG(ProcessSuspension, "%p - NavigationState keeps its process network assertion because a new page load started", this);
</ins><span class="cx">             m_releaseNetworkActivityTimer.stop();
</span><span class="cx">         }
</span><span class="cx">         if (!m_networkActivity) {
</span><del>-            RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NavigationState is taking a process network assertion because a page load started", this);
</del><ins>+            RELEASE_LOG(ProcessSuspension, "%p - NavigationState is taking a process network assertion because a page load started", this);
</ins><span class="cx">             m_networkActivity = m_webView->_page->process().throttler().backgroundActivity("Page Load"_s).moveToUniquePtr();
</span><span class="cx">         }
</span><span class="cx">     } else if (m_networkActivity) {
</span><span class="cx">         // The application is visible so we delay releasing the background activity for 3 seconds to give it a chance to start another navigation
</span><span class="cx">         // before suspending the WebContent process <rdar://problem/27910964>.
</span><del>-        RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NavigationState will release its process network assertion soon because the page load completed", this);
</del><ins>+        RELEASE_LOG(ProcessSuspension, "%p - NavigationState will release its process network assertion soon because the page load completed", this);
</ins><span class="cx">         m_releaseNetworkActivityTimer.startOneShot(3_s);
</span><span class="cx">     }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaSOAuthorizationSOAuthorizationSessionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm (278314 => 278315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm    2021-06-01 17:36:49 UTC (rev 278314)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm       2021-06-01 18:14:29 UTC (rev 278315)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> #import <wtf/BlockPtr.h>
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx"> 
</span><del>-#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(m_page && m_page->isAlwaysOnLoggingAllowed(), AppSSO, "%p - [InitiatingAction=%s] SOAuthorizationSession::" fmt, this, toString(m_action), ##__VA_ARGS__)
</del><ins>+#define AUTHORIZATIONSESSION_RELEASE_LOG(fmt, ...) RELEASE_LOG(AppSSO, "%p - [InitiatingAction=%s] SOAuthorizationSession::" fmt, this, toString(m_action), ##__VA_ARGS__)
</ins><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> 
</span><span class="cx"> void SOAuthorizationSession::shouldStart()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("shouldStart:");
</del><ins>+    AUTHORIZATIONSESSION_RELEASE_LOG("shouldStart:");
</ins><span class="cx"> 
</span><span class="cx">     ASSERT(m_state == State::Idle);
</span><span class="cx">     if (!m_page)
</span><span class="lines">@@ -127,12 +127,12 @@
</span><span class="cx"> 
</span><span class="cx"> void SOAuthorizationSession::start()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("start:");
</del><ins>+    AUTHORIZATIONSESSION_RELEASE_LOG("start:");
</ins><span class="cx"> 
</span><span class="cx">     ASSERT((m_state == State::Idle || m_state == State::Waiting) && m_navigationAction);
</span><span class="cx">     m_state = State::Active;
</span><span class="cx">     [m_soAuthorization getAuthorizationHintsWithURL:m_navigationAction->request().url() responseCode:0 completion:makeBlockPtr([this, weakThis = makeWeakPtr(*this)] (SOAuthorizationHints *authorizationHints, NSError *error) {
</span><del>-        RELEASE_LOG_IF_ALLOWED("start: Receive SOAuthorizationHints (error=%ld)", error ? error.code : 0);
</del><ins>+        AUTHORIZATIONSESSION_RELEASE_LOG("start: Receive SOAuthorizationHints (error=%ld)", error ? error.code : 0);
</ins><span class="cx"> 
</span><span class="cx">         if (!weakThis || error || !authorizationHints)
</span><span class="cx">             return;
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> 
</span><span class="cx"> void SOAuthorizationSession::continueStartAfterGetAuthorizationHints(const String& hints)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("continueStartAfterGetAuthorizationHints: (hints=%s)", hints.utf8().data());
</del><ins>+    AUTHORIZATIONSESSION_RELEASE_LOG("continueStartAfterGetAuthorizationHints: (hints=%s)", hints.utf8().data());
</ins><span class="cx"> 
</span><span class="cx">     ASSERT(m_state == State::Active);
</span><span class="cx">     if (!m_page)
</span><span class="lines">@@ -158,13 +158,13 @@
</span><span class="cx"> void SOAuthorizationSession::continueStartAfterDecidePolicy(const SOAuthorizationLoadPolicy& policy)
</span><span class="cx"> {
</span><span class="cx">     if (policy == SOAuthorizationLoadPolicy::Ignore) {
</span><del>-        RELEASE_LOG_IF_ALLOWED("continueStartAfterDecidePolicy: Receive SOAuthorizationLoadPolicy::Ignore");
</del><ins>+        AUTHORIZATIONSESSION_RELEASE_LOG("continueStartAfterDecidePolicy: Receive SOAuthorizationLoadPolicy::Ignore");
</ins><span class="cx"> 
</span><span class="cx">         fallBackToWebPath();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED("continueStartAfterDecidePolicy: Receive SOAuthorizationLoadPolicy::Allow");
</del><ins>+    AUTHORIZATIONSESSION_RELEASE_LOG("continueStartAfterDecidePolicy: Receive SOAuthorizationLoadPolicy::Allow");
</ins><span class="cx"> 
</span><span class="cx">     if (!m_soAuthorization || !m_page || !m_navigationAction)
</span><span class="cx">         return;
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> 
</span><span class="cx"> void SOAuthorizationSession::fallBackToWebPath()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("fallBackToWebPath:");
</del><ins>+    AUTHORIZATIONSESSION_RELEASE_LOG("fallBackToWebPath:");
</ins><span class="cx"> 
</span><span class="cx">     if (m_state != State::Active)
</span><span class="cx">         return;
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> 
</span><span class="cx"> void SOAuthorizationSession::abort()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("abort:");
</del><ins>+    AUTHORIZATIONSESSION_RELEASE_LOG("abort:");
</ins><span class="cx"> 
</span><span class="cx">     if (m_state == State::Idle || m_state == State::Completed)
</span><span class="cx">         return;
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx">     // Set cookies.
</span><span class="cx">     auto cookies = toCookieVector([NSHTTPCookie cookiesWithResponseHeaderFields:httpResponse.allHeaderFields forURL:response.url()]);
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED("complete: (httpStatusCode=%d, hasCookies=%d, hasData=%d)", response.httpStatusCode(), !cookies.isEmpty(), !!data.length);
</del><ins>+    AUTHORIZATIONSESSION_RELEASE_LOG("complete: (httpStatusCode=%d, hasCookies=%d, hasData=%d)", response.httpStatusCode(), !cookies.isEmpty(), !!data.length);
</ins><span class="cx"> 
</span><span class="cx">     if (cookies.isEmpty()) {
</span><span class="cx">         completeInternal(response, data);
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx">         if (!weakThis)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        RELEASE_LOG_IF_ALLOWED("complete: Cookies are set.");
</del><ins>+        AUTHORIZATIONSESSION_RELEASE_LOG("complete: Cookies are set.");
</ins><span class="cx"> 
</span><span class="cx">         completeInternal(response, data.get());
</span><span class="cx">     });
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> 
</span><span class="cx"> void SOAuthorizationSession::presentViewController(SOAuthorizationViewController viewController, UICallback uiCallback)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("presentViewController:");
</del><ins>+    AUTHORIZATIONSESSION_RELEASE_LOG("presentViewController:");
</ins><span class="cx"> 
</span><span class="cx">     ASSERT(m_state == State::Active);
</span><span class="cx">     // Only expect at most one UI session for the whole authorization session.
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED("presentViewController: Calling beginSheet on %p for sheet %p.", presentingWindow, m_sheetWindow.get());
</del><ins>+    AUTHORIZATIONSESSION_RELEASE_LOG("presentViewController: Calling beginSheet on %p for sheet %p.", presentingWindow, m_sheetWindow.get());
</ins><span class="cx">     [presentingWindow beginSheet:m_sheetWindow.get() completionHandler:nil];
</span><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx">     UIViewController *presentingViewController = m_page->uiClient().presentingViewController();
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> 
</span><span class="cx"> void SOAuthorizationSession::dismissViewController()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED("dismissViewController:");
</del><ins>+    AUTHORIZATIONSESSION_RELEASE_LOG("dismissViewController:");
</ins><span class="cx"> 
</span><span class="cx">     ASSERT(m_viewController);
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="lines">@@ -303,13 +303,13 @@
</span><span class="cx">     if (m_page && m_page->platformWindow()) {
</span><span class="cx">         auto *presentingWindow = m_page->platformWindow();
</span><span class="cx">         if (presentingWindow.miniaturized) {
</span><del>-            RELEASE_LOG_IF_ALLOWED("dismissViewController: Page's window is miniaturized. Waiting to dismiss until active.");
</del><ins>+            AUTHORIZATIONSESSION_RELEASE_LOG("dismissViewController: Page's window is miniaturized. Waiting to dismiss until active.");
</ins><span class="cx">             if (m_presentingWindowDidDeminiaturizeObserver) {
</span><del>-                RELEASE_LOG_IF_ALLOWED("dismissViewController: [Miniaturized] Already has a deminiaturized observer (%p). Hidden observer is %p", m_presentingWindowDidDeminiaturizeObserver.get(), m_applicationDidUnhideObserver.get());
</del><ins>+                AUTHORIZATIONSESSION_RELEASE_LOG("dismissViewController: [Miniaturized] Already has a deminiaturized observer (%p). Hidden observer is %p", m_presentingWindowDidDeminiaturizeObserver.get(), m_applicationDidUnhideObserver.get());
</ins><span class="cx">                 return;
</span><span class="cx">             }
</span><span class="cx">             m_presentingWindowDidDeminiaturizeObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSWindowDidDeminiaturizeNotification object:presentingWindow queue:nil usingBlock:[protectedThis = makeRefPtr(this), this] (NSNotification *) {
</span><del>-                RELEASE_LOG_IF_ALLOWED("dismissViewController: Window has deminiaturized. Completing the dismissal.");
</del><ins>+                AUTHORIZATIONSESSION_RELEASE_LOG("dismissViewController: Window has deminiaturized. Completing the dismissal.");
</ins><span class="cx">                 dismissViewController();
</span><span class="cx">                 [[NSNotificationCenter defaultCenter] removeObserver:m_presentingWindowDidDeminiaturizeObserver.get()];
</span><span class="cx">                 m_presentingWindowDidDeminiaturizeObserver = nullptr;
</span><span class="lines">@@ -319,13 +319,13 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (NSApp.hidden) {
</span><del>-        RELEASE_LOG_IF_ALLOWED("dismissViewController: Application is hidden. Waiting to dismiss until active.");
</del><ins>+        AUTHORIZATIONSESSION_RELEASE_LOG("dismissViewController: Application is hidden. Waiting to dismiss until active.");
</ins><span class="cx">         if (m_applicationDidUnhideObserver) {
</span><del>-            RELEASE_LOG_IF_ALLOWED("dismissViewController: [Hidden] Already has an Unhide observer (%p). Deminiaturized observer is %p", m_presentingWindowDidDeminiaturizeObserver.get(), m_applicationDidUnhideObserver.get());
</del><ins>+            AUTHORIZATIONSESSION_RELEASE_LOG("dismissViewController: [Hidden] Already has an Unhide observer (%p). Deminiaturized observer is %p", m_presentingWindowDidDeminiaturizeObserver.get(), m_applicationDidUnhideObserver.get());
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx">         m_applicationDidUnhideObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidUnhideNotification object:NSApp queue:nil usingBlock:[protectedThis = makeRefPtr(this), this] (NSNotification *) {
</span><del>-            RELEASE_LOG_IF_ALLOWED("dismissViewController: Application is no longer hidden. Completing the dismissal.");
</del><ins>+            AUTHORIZATIONSESSION_RELEASE_LOG("dismissViewController: Application is no longer hidden. Completing the dismissal.");
</ins><span class="cx">             dismissViewController();
</span><span class="cx">             [[NSNotificationCenter defaultCenter] removeObserver:m_applicationDidUnhideObserver.get()];
</span><span class="cx">             m_applicationDidUnhideObserver = nullptr;
</span><span class="lines">@@ -337,10 +337,10 @@
</span><span class="cx">     m_sheetWindowWillCloseObserver = nullptr;
</span><span class="cx"> 
</span><span class="cx">     auto *presentingWindow = m_sheetWindow.get().sheetParent;
</span><del>-    RELEASE_LOG_IF_ALLOWED("dismissViewController: Calling endSheet on %p for sheet %p.", presentingWindow, m_sheetWindow.get());
</del><ins>+    AUTHORIZATIONSESSION_RELEASE_LOG("dismissViewController: Calling endSheet on %p for sheet %p.", presentingWindow, m_sheetWindow.get());
</ins><span class="cx">     [presentingWindow endSheet:m_sheetWindow.get()];
</span><span class="cx">     m_sheetWindow = nullptr;
</span><del>-    RELEASE_LOG_IF_ALLOWED("dismissViewController: Finished call with deminiaturized observer (%p) and Hidden observer (%p)", m_presentingWindowDidDeminiaturizeObserver.get(), m_applicationDidUnhideObserver.get());
</del><ins>+    AUTHORIZATIONSESSION_RELEASE_LOG("dismissViewController: Finished call with deminiaturized observer (%p) and Hidden observer (%p)", m_presentingWindowDidDeminiaturizeObserver.get(), m_applicationDidUnhideObserver.get());
</ins><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx">     [[m_viewController presentingViewController] dismissViewControllerAnimated:YES completion:nil];
</span><span class="cx"> #endif
</span><span class="lines">@@ -350,6 +350,6 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><del>-#undef RELEASE_LOG_IF_ALLOWED
</del><ins>+#undef AUTHORIZATIONSESSION_RELEASE_LOG
</ins><span class="cx"> 
</span><span class="cx"> #endif // HAVE(APP_SSO)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessProvisionalPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp (278314 => 278315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp   2021-06-01 17:36:49 UTC (rev 278314)
+++ trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp      2021-06-01 18:14:29 UTC (rev 278315)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> 
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><del>-#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__)
-#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__)
</del><ins>+#define PROVISIONALPAGEPROXY_RELEASE_LOG(channel, fmt, ...) RELEASE_LOG(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__)
+#define PROVISIONALPAGEPROXY_RELEASE_LOG_ERROR(channel, fmt, ...) RELEASE_LOG_ERROR(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__)
</ins><span class="cx"> 
</span><span class="cx"> ProvisionalPageProxy::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)
</span><span class="cx">     : m_page(page)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "ProvisionalPageProxy: suspendedPage=%p", suspendedPage.get());
</del><ins>+    PROVISIONALPAGEPROXY_RELEASE_LOG(ProcessSwapping, "ProvisionalPageProxy: suspendedPage=%p", suspendedPage.get());
</ins><span class="cx"> 
</span><span class="cx">     m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_webPageID, *this);
</span><span class="cx">     m_process->addProvisionalPageProxy(*this);
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> 
</span><span class="cx"> void ProvisionalPageProxy::processDidTerminate()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_ERROR_IF_ALLOWED(ProcessSwapping, "processDidTerminate:");
</del><ins>+    PROVISIONALPAGEPROXY_RELEASE_LOG_ERROR(ProcessSwapping, "processDidTerminate:");
</ins><span class="cx">     m_page.provisionalProcessDidTerminate();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">         
</span><span class="cx">     ASSERT(m_process->state() == WebProcessProxy::State::Running);
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "cancel: Simulating a didFailProvisionalLoadForFrame");
</del><ins>+    PROVISIONALPAGEPROXY_RELEASE_LOG(ProcessSwapping, "cancel: Simulating a didFailProvisionalLoadForFrame");
</ins><span class="cx">     ASSERT(m_mainFrame);
</span><span class="cx">     auto error = WebKit::cancelledError(m_request);
</span><span class="cx">     error.setType(WebCore::ResourceError::Type::Cancellation);
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> 
</span><span class="cx"> void ProvisionalPageProxy::loadData(API::Navigation& navigation, const IPC::DataReference& data, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData, std::optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain, std::optional<WebsitePoliciesData>&& websitePolicies)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "loadData:");
</del><ins>+    PROVISIONALPAGEPROXY_RELEASE_LOG(ProcessSwapping, "loadData:");
</ins><span class="cx"> 
</span><span class="cx">     m_page.loadDataWithNavigationShared(m_process.copyRef(), m_webPageID, navigation, data, MIMEType, encoding, baseURL, userData, WebCore::ShouldTreatAsContinuingLoad::Yes, isNavigatingToAppBoundDomain, WTFMove(websitePolicies), navigation.lastNavigationAction().shouldOpenExternalURLsPolicy);
</span><span class="cx"> }
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> 
</span><span class="cx"> void ProvisionalPageProxy::loadRequest(API::Navigation& navigation, WebCore::ResourceRequest&& request, API::Object* userData, std::optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain, std::optional<WebsitePoliciesData>&& websitePolicies)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "loadRequest:");
</del><ins>+    PROVISIONALPAGEPROXY_RELEASE_LOG(ProcessSwapping, "loadRequest:");
</ins><span class="cx"> 
</span><span class="cx">     // 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,
</span><span class="cx">     // we need to make sure we update fromItem's processIdentifier as we want future navigations to this BackForward item to happen in the
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> 
</span><span class="cx"> void ProvisionalPageProxy::goToBackForwardItem(API::Navigation& navigation, WebBackForwardListItem& item, RefPtr<API::WebsitePolicies>&& websitePolicies)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "goToBackForwardItem:");
</del><ins>+    PROVISIONALPAGEPROXY_RELEASE_LOG(ProcessSwapping, "goToBackForwardItem:");
</ins><span class="cx"> 
</span><span class="cx">     auto itemStates = m_page.backForwardList().filteredItemStates([this, targetItem = &item](auto& item) {
</span><span class="cx">         if (auto* backForwardCacheEntry = item.backForwardCacheEntry()) {
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> 
</span><span class="cx"> void ProvisionalPageProxy::didCreateMainFrame(FrameIdentifier frameID)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didCreateMainFrame: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    PROVISIONALPAGEPROXY_RELEASE_LOG(ProcessSwapping, "didCreateMainFrame: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx">     ASSERT(!m_mainFrame);
</span><span class="cx"> 
</span><span class="cx">     m_mainFrame = WebFrameProxy::create(m_page, frameID);
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx">     if (!validateInput(frameID, navigationID))
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didStartProvisionalLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    PROVISIONALPAGEPROXY_RELEASE_LOG(ProcessSwapping, "didStartProvisionalLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx">     ASSERT(m_provisionalLoadURL.isNull());
</span><span class="cx">     m_provisionalLoadURL = url;
</span><span class="cx"> 
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx">     if (!validateInput(frameID, navigationID))
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_ERROR_IF_ALLOWED(ProcessSwapping, "didFailProvisionalLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    PROVISIONALPAGEPROXY_RELEASE_LOG_ERROR(ProcessSwapping, "didFailProvisionalLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx">     ASSERT(!m_provisionalLoadURL.isNull());
</span><span class="cx">     m_provisionalLoadURL = { };
</span><span class="cx"> 
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx">     if (!validateInput(frameID, navigationID))
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didCommitLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    PROVISIONALPAGEPROXY_RELEASE_LOG(ProcessSwapping, "didCommitLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx">     m_provisionalLoadURL = { };
</span><span class="cx">     m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_webPageID);
</span><span class="cx"> 
</span><span class="lines">@@ -421,7 +421,7 @@
</span><span class="cx"> #if HAVE(VISIBILITY_PROPAGATION_VIEW)
</span><span class="cx"> void ProvisionalPageProxy::didCreateContextInWebProcessForVisibilityPropagation(LayerHostingContextID contextID)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didCreateContextInWebProcessForVisibilityPropagation: contextID=%u", contextID);
</del><ins>+    PROVISIONALPAGEPROXY_RELEASE_LOG(ProcessSwapping, "didCreateContextInWebProcessForVisibilityPropagation: contextID=%u", contextID);
</ins><span class="cx">     m_contextIDForVisibilityPropagationInWebProcess = contextID;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> #if ENABLE(GPU_PROCESS)
</span><span class="cx"> void ProvisionalPageProxy::didCreateContextInGPUProcessForVisibilityPropagation(LayerHostingContextID contextID)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "didCreateContextInGPUProcessForVisibilityPropagation: contextID=%u", contextID);
</del><ins>+    PROVISIONALPAGEPROXY_RELEASE_LOG(ProcessSwapping, "didCreateContextInGPUProcessForVisibilityPropagation: contextID=%u", contextID);
</ins><span class="cx">     m_contextIDForVisibilityPropagationInGPUProcess = contextID;
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(GPU_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessRemoteLayerTreeRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm (278314 => 278315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm 2021-06-01 17:36:49 UTC (rev 278314)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm    2021-06-01 18:14:29 UTC (rev 278315)
</span><span class="lines">@@ -504,7 +504,7 @@
</span><span class="cx"> 
</span><span class="cx"> bool RemoteLayerTreeDrawingAreaProxy::isAlwaysOnLoggingAllowed() const
</span><span class="cx"> {
</span><del>-    return m_webPageProxy.isAlwaysOnLoggingAllowed();
</del><ins>+    return m_webPageProxy.sessionID().isAlwaysOnLoggingAllowed();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> CALayer *RemoteLayerTreeDrawingAreaProxy::layerWithIDForTesting(uint64_t layerID) const
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (278314 => 278315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp   2021-06-01 17:36:49 UTC (rev 278314)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp      2021-06-01 18:14:29 UTC (rev 278315)
</span><span class="lines">@@ -315,8 +315,8 @@
</span><span class="cx"> #define MESSAGE_CHECK_URL(process, url) MESSAGE_CHECK_BASE(checkURLReceivedFromCurrentOrPreviousWebProcess(process, url), process->connection())
</span><span class="cx"> #define MESSAGE_CHECK_COMPLETION(process, assertion, completion) MESSAGE_CHECK_COMPLETION_BASE(assertion, process->connection(), completion)
</span><span class="cx"> 
</span><del>-#define RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), channel, "%p - [pageProxyID=%" PRIu64 ", webPageID=%" PRIu64 ", PID=%i] WebPageProxy::" fmt, this, m_identifier.toUInt64(), m_webPageID.toUInt64(), m_process->processIdentifier(), ##__VA_ARGS__)
-#define RELEASE_LOG_ERROR_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), channel, "%p - [pageProxyID=%" PRIu64 ", webPageID=%" PRIu64 ", PID=%i] WebPageProxy::" fmt, this, m_identifier.toUInt64(), m_webPageID.toUInt64(), m_process->processIdentifier(), ##__VA_ARGS__)
</del><ins>+#define WEBPAGEPROXY_RELEASE_LOG(channel, fmt, ...) RELEASE_LOG(channel, "%p - [pageProxyID=%" PRIu64 ", webPageID=%" PRIu64 ", PID=%i] WebPageProxy::" fmt, this, m_identifier.toUInt64(), m_webPageID.toUInt64(), m_process->processIdentifier(), ##__VA_ARGS__)
+#define WEBPAGEPROXY_RELEASE_LOG_ERROR(channel, fmt, ...) RELEASE_LOG_ERROR(channel, "%p - [pageProxyID=%" PRIu64 ", webPageID=%" PRIu64 ", PID=%i] WebPageProxy::" fmt, this, m_identifier.toUInt64(), m_webPageID.toUInt64(), m_process->processIdentifier(), ##__VA_ARGS__)
</ins><span class="cx"> 
</span><span class="cx"> // Represents the number of wheel events we can hold in the queue before we start pushing them preemptively.
</span><span class="cx"> static const unsigned wheelEventQueueSizeThreshold = 10;
</span><span class="lines">@@ -510,7 +510,7 @@
</span><span class="cx">     , m_limitsNavigationsToAppBoundDomains(m_configuration->limitsNavigationsToAppBoundDomains())
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "constructor:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "constructor:");
</ins><span class="cx"> 
</span><span class="cx">     if (!m_configuration->drawsBackground())
</span><span class="cx">         m_backgroundColor = Color(Color::transparentBlack);
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx"> 
</span><span class="cx"> WebPageProxy::~WebPageProxy()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "destructor:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "destructor:");
</ins><span class="cx"> 
</span><span class="cx">     ASSERT(m_process->webPage(m_identifier) != this);
</span><span class="cx"> #if ASSERT_ENABLED
</span><span class="lines">@@ -823,7 +823,7 @@
</span><span class="cx">     ASSERT(!m_isClosed);
</span><span class="cx">     ASSERT(!hasRunningProcess());
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "launchProcess:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "launchProcess:");
</ins><span class="cx"> 
</span><span class="cx">     // In case we are currently connected to the dummy process, we need to make sure the inspector proxy
</span><span class="cx">     // disconnects from the dummy process first.
</span><span class="lines">@@ -865,12 +865,12 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     if (!hasCommittedAnyProvisionalLoads()) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "suspendCurrentPageIfPossible: Not suspending current page for process pid %i because has not committed any load yet", m_process->processIdentifier());
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(ProcessSwapping, "suspendCurrentPageIfPossible: Not suspending current page for process pid %i because has not committed any load yet", m_process->processIdentifier());
</ins><span class="cx">         return false;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (isPageOpenedByDOMShowingInitialEmptyDocument()) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "suspendCurrentPageIfPossible: Not suspending current page for process pid %i because it is showing the initial empty document", m_process->processIdentifier());
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(ProcessSwapping, "suspendCurrentPageIfPossible: Not suspending current page for process pid %i because it is showing the initial empty document", m_process->processIdentifier());
</ins><span class="cx">         return false;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -879,12 +879,12 @@
</span><span class="cx">     // If the source and the destination back / forward list items are the same, then this is a client-side redirect. In this case,
</span><span class="cx">     // there is no need to suspend the previous page as there will be no way to get back to it.
</span><span class="cx">     if (fromItem && fromItem == m_backForwardList->currentItem()) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "suspendCurrentPageIfPossible: Not suspending current page for process pid %i because this is a client-side redirect", m_process->processIdentifier());
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(ProcessSwapping, "suspendCurrentPageIfPossible: Not suspending current page for process pid %i because this is a client-side redirect", m_process->processIdentifier());
</ins><span class="cx">         return false;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (fromItem && fromItem->url() != pageLoadState().url()) {
</span><del>-        RELEASE_LOG_ERROR_IF_ALLOWED(ProcessSwapping, "suspendCurrentPageIfPossible: Not suspending current page for process pid %i because fromItem's URL does not match the page URL.", m_process->processIdentifier());
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG_ERROR(ProcessSwapping, "suspendCurrentPageIfPossible: Not suspending current page for process pid %i because fromItem's URL does not match the page URL.", m_process->processIdentifier());
</ins><span class="cx">         return false;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -891,13 +891,13 @@
</span><span class="cx">     bool needsSuspendedPageToPreventFlashing = shouldDelayClosingUntilFirstLayerFlush == ShouldDelayClosingUntilFirstLayerFlush::Yes;
</span><span class="cx">     if (!needsSuspendedPageToPreventFlashing && (!fromItem || !shouldUseBackForwardCache())) {
</span><span class="cx">         if (!fromItem)
</span><del>-            RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "suspendCurrentPageIfPossible: Not suspending current page for process pid %i there is no associated WebBackForwardListItem", m_process->processIdentifier());
</del><ins>+            WEBPAGEPROXY_RELEASE_LOG(ProcessSwapping, "suspendCurrentPageIfPossible: Not suspending current page for process pid %i there is no associated WebBackForwardListItem", m_process->processIdentifier());
</ins><span class="cx">         else
</span><del>-            RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "suspendCurrentPageIfPossible: Not suspending current page for process pid %i the back / forward cache is disabled", m_process->processIdentifier());
</del><ins>+            WEBPAGEPROXY_RELEASE_LOG(ProcessSwapping, "suspendCurrentPageIfPossible: Not suspending current page for process pid %i the back / forward cache is disabled", m_process->processIdentifier());
</ins><span class="cx">         return false;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "suspendCurrentPageIfPossible: Suspending current page for process pid %i", m_process->processIdentifier());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(ProcessSwapping, "suspendCurrentPageIfPossible: Suspending current page for process pid %i", m_process->processIdentifier());
</ins><span class="cx">     auto suspendedPage = makeUnique<SuspendedPageProxy>(*this, m_process.copyRef(), *mainFrameID, shouldDelayClosingUntilFirstLayerFlush);
</span><span class="cx"> 
</span><span class="cx">     LOG(ProcessSwapping, "WebPageProxy %" PRIu64 " created suspended page %s for process pid %i, back/forward item %s" PRIu64, identifier().toUInt64(), suspendedPage->loggingString(), m_process->processIdentifier(), fromItem ? fromItem->itemID().logString() : 0);
</span><span class="lines">@@ -927,7 +927,7 @@
</span><span class="cx"> void WebPageProxy::swapToProvisionalPage(std::unique_ptr<ProvisionalPageProxy> provisionalPage)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_isClosed);
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "swapToProvisionalPage: newWebPageID=%" PRIu64, provisionalPage->webPageID().toUInt64());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "swapToProvisionalPage: newWebPageID=%" PRIu64, provisionalPage->webPageID().toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     m_process = provisionalPage->process();
</span><span class="cx">     m_webPageID = provisionalPage->webPageID();
</span><span class="lines">@@ -941,8 +941,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+    // FIXME: Do we really need to disable this logging in ephemeral sessions?
</ins><span class="cx">     if (m_logger)
</span><del>-        m_logger->setEnabled(this, isAlwaysOnLoggingAllowed());
</del><ins>+        m_logger->setEnabled(this, !sessionID().isEphemeral());
</ins><span class="cx"> 
</span><span class="cx">     m_hasRunningProcess = true;
</span><span class="cx"> 
</span><span class="lines">@@ -1035,10 +1036,10 @@
</span><span class="cx"> 
</span><span class="cx"> RefPtr<API::Navigation> WebPageProxy::launchProcessForReload()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "launchProcessForReload:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "launchProcessForReload:");
</ins><span class="cx"> 
</span><span class="cx">     if (m_isClosed) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(Loading, "launchProcessForReload: page is closed");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(Loading, "launchProcessForReload: page is closed");
</ins><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="lines">@@ -1047,7 +1048,7 @@
</span><span class="cx">     launchProcess(registrableDomain, ProcessLaunchReason::Crash);
</span><span class="cx"> 
</span><span class="cx">     if (!m_backForwardList->currentItem()) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(Loading, "launchProcessForReload: no current item to reload");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(Loading, "launchProcessForReload: no current item to reload");
</ins><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1109,7 +1110,7 @@
</span><span class="cx">     if (m_isClosed)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "close:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "close:");
</ins><span class="cx"> 
</span><span class="cx">     m_isClosed = true;
</span><span class="cx"> 
</span><span class="lines">@@ -1188,7 +1189,7 @@
</span><span class="cx">     if (!hasRunningProcess())
</span><span class="cx">         return true;
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED(Process, "tryClose:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Process, "tryClose:");
</ins><span class="cx"> 
</span><span class="cx">     // Close without delay if the process allows it. Our goal is to terminate
</span><span class="cx">     // the process, so we check a per-process status bit.
</span><span class="lines">@@ -1213,7 +1214,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::tryCloseTimedOut()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_ERROR_IF_ALLOWED(Process, "tryCloseTimedOut: Timed out waiting for the process to respond to the WebPage::TryClose IPC, closing the page now");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG_ERROR(Process, "tryCloseTimedOut: Timed out waiting for the process to respond to the WebPage::TryClose IPC, closing the page now");
</ins><span class="cx">     closePage();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1310,7 +1311,7 @@
</span><span class="cx">     if (m_isClosed)
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "loadRequest:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "loadRequest:");
</ins><span class="cx"> 
</span><span class="cx">     if (!hasRunningProcess())
</span><span class="cx">         launchProcess(RegistrableDomain { request.url() }, ProcessLaunchReason::InitialProcess);
</span><span class="lines">@@ -1332,7 +1333,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_isClosed);
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "loadRequestWithNavigationShared:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "loadRequestWithNavigationShared:");
</ins><span class="cx"> 
</span><span class="cx">     auto transaction = m_pageLoadState.transaction();
</span><span class="cx"> 
</span><span class="lines">@@ -1368,10 +1369,10 @@
</span><span class="cx"> 
</span><span class="cx"> RefPtr<API::Navigation> WebPageProxy::loadFile(const String& fileURLString, const String& resourceDirectoryURLString, API::Object* userData)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "loadFile:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "loadFile:");
</ins><span class="cx"> 
</span><span class="cx">     if (m_isClosed) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(Loading, "loadFile: page is closed");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(Loading, "loadFile: page is closed");
</ins><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1380,7 +1381,7 @@
</span><span class="cx"> 
</span><span class="cx">     URL fileURL = URL(URL(), fileURLString);
</span><span class="cx">     if (!fileURL.isLocalFile()) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(Loading, "loadFile: file is not local");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(Loading, "loadFile: file is not local");
</ins><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1390,7 +1391,7 @@
</span><span class="cx">     else {
</span><span class="cx">         resourceDirectoryURL = URL(URL(), resourceDirectoryURLString);
</span><span class="cx">         if (!resourceDirectoryURL.isLocalFile()) {
</span><del>-            RELEASE_LOG_IF_ALLOWED(Loading, "loadFile: resource URL is not local");
</del><ins>+            WEBPAGEPROXY_RELEASE_LOG(Loading, "loadFile: resource URL is not local");
</ins><span class="cx">             return nullptr;
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="lines">@@ -1424,7 +1425,7 @@
</span><span class="cx"> 
</span><span class="cx"> RefPtr<API::Navigation> WebPageProxy::loadData(const IPC::DataReference& data, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "loadData:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "loadData:");
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(APP_BOUND_DOMAINS)
</span><span class="cx">     if (MIMEType == "text/html"_s && !isFullWebBrowser())
</span><span class="lines">@@ -1432,7 +1433,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     if (m_isClosed) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(Loading, "loadData: page is closed");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(Loading, "loadData: page is closed");
</ins><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1450,7 +1451,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::loadDataWithNavigationShared(Ref<WebProcessProxy>&& process, WebCore::PageIdentifier webPageID, API::Navigation& navigation, const IPC::DataReference& data, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData, ShouldTreatAsContinuingLoad shouldTreatAsContinuingLoad, std::optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain, std::optional<WebsitePoliciesData>&& websitePolicies, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "loadDataWithNavigation");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "loadDataWithNavigation");
</ins><span class="cx"> 
</span><span class="cx">     ASSERT(!m_isClosed);
</span><span class="cx"> 
</span><span class="lines">@@ -1478,7 +1479,7 @@
</span><span class="cx"> 
</span><span class="cx"> RefPtr<API::Navigation> WebPageProxy::loadSimulatedRequest(WebCore::ResourceRequest&& simulatedRequest, WebCore::ResourceResponse&& simulatedResponse, const IPC::DataReference& data)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "loadSimulatedRequest:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "loadSimulatedRequest:");
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(APP_BOUND_DOMAINS)
</span><span class="cx">     if (simulatedResponse.mimeType() == "text/html"_s && !isFullWebBrowser())
</span><span class="lines">@@ -1486,7 +1487,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     if (m_isClosed) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(Loading, "loadSimulatedRequest: page is closed");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(Loading, "loadSimulatedRequest: page is closed");
</ins><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1532,13 +1533,13 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::loadAlternateHTML(const IPC::DataReference& htmlData, const String& encoding, const URL& baseURL, const URL& unreachableURL, API::Object* userData)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "loadAlternateHTML");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "loadAlternateHTML");
</ins><span class="cx"> 
</span><span class="cx">     // When the UIProcess is in the process of handling a failing provisional load, do not attempt to
</span><span class="cx">     // start a second alternative HTML load as this will prevent the page load state from being
</span><span class="cx">     // handled properly.
</span><span class="cx">     if (m_isClosed || m_isLoadingAlternateHTMLStringForFailingProvisionalLoad) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(Loading, "loadAlternateHTML: page is closed (or other)");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(Loading, "loadAlternateHTML: page is closed (or other)");
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1575,10 +1576,10 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::loadWebArchiveData(API::Data* webArchiveData, API::Object* userData)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "loadWebArchiveData:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "loadWebArchiveData:");
</ins><span class="cx"> 
</span><span class="cx">     if (m_isClosed) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(Loading, "loadWebArchiveData: page is closed");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(Loading, "loadWebArchiveData: page is closed");
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1602,10 +1603,10 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::navigateToPDFLinkWithSimulatedClick(const String& urlString, IntPoint documentPoint, IntPoint screenPoint)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "navigateToPDFLinkWithSimulatedClick:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "navigateToPDFLinkWithSimulatedClick:");
</ins><span class="cx"> 
</span><span class="cx">     if (m_isClosed) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(Loading, "navigateToPDFLinkWithSimulatedClick: page is closed:");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(Loading, "navigateToPDFLinkWithSimulatedClick: page is closed:");
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1621,10 +1622,10 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::stopLoading()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "stopLoading:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "stopLoading:");
</ins><span class="cx"> 
</span><span class="cx">     if (!hasRunningProcess()) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(Loading, "navigateToPDFLinkWithSimulatedClick: page is not valid");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(Loading, "navigateToPDFLinkWithSimulatedClick: page is not valid");
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1638,7 +1639,7 @@
</span><span class="cx"> 
</span><span class="cx"> RefPtr<API::Navigation> WebPageProxy::reload(OptionSet<WebCore::ReloadOption> options)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "reload:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "reload:");
</ins><span class="cx"> 
</span><span class="cx">     SandboxExtension::Handle sandboxExtensionHandle;
</span><span class="cx"> 
</span><span class="lines">@@ -1719,11 +1720,11 @@
</span><span class="cx"> 
</span><span class="cx"> RefPtr<API::Navigation> WebPageProxy::goToBackForwardItem(WebBackForwardListItem& item, FrameLoadType frameLoadType)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "goToBackForwardItem:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "goToBackForwardItem:");
</ins><span class="cx">     LOG(Loading, "WebPageProxy %p goToBackForwardItem to item URL %s", this, item.url().utf8().data());
</span><span class="cx"> 
</span><span class="cx">     if (m_isClosed) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(Loading, "goToBackForwardItem: page is closed");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(Loading, "goToBackForwardItem: page is closed");
</ins><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1749,10 +1750,10 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::tryRestoreScrollPosition()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "tryRestoreScrollPosition:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "tryRestoreScrollPosition:");
</ins><span class="cx"> 
</span><span class="cx">     if (!hasRunningProcess()) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(Loading, "tryRestoreScrollPosition: page is not valid");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(Loading, "tryRestoreScrollPosition: page is not valid");
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -2021,7 +2022,7 @@
</span><span class="cx">         if (isNowVisible)
</span><span class="cx">             m_activityState.add(ActivityState::IsVisible);
</span><span class="cx">         if (wasVisible != isNowVisible)
</span><del>-            RELEASE_LOG_IF_ALLOWED(ViewState, "updateActivityState: view visibility state changed %d -> %d", wasVisible, isNowVisible);
</del><ins>+            WEBPAGEPROXY_RELEASE_LOG(ViewState, "updateActivityState: view visibility state changed %d -> %d", wasVisible, isNowVisible);
</ins><span class="cx">     }
</span><span class="cx">     if (flagsToUpdate & ActivityState::IsVisibleOrOccluded && pageClient().isViewVisibleOrOccluded())
</span><span class="cx">         m_activityState.add(ActivityState::IsVisibleOrOccluded);
</span><span class="lines">@@ -2181,11 +2182,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool WebPageProxy::isAlwaysOnLoggingAllowed() const
-{
-    return sessionID().isAlwaysOnLoggingAllowed();
-}
-
</del><span class="cx"> void WebPageProxy::updateThrottleState()
</span><span class="cx"> {
</span><span class="cx">     bool processSuppressionEnabled = m_preferences->pageVisibilityBasedProcessSuppressionEnabled();
</span><span class="lines">@@ -2204,11 +2200,11 @@
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx">     if (isViewVisible()) {
</span><span class="cx">         if (!m_isVisibleActivity || !m_isVisibleActivity->isValid()) {
</span><del>-            RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "updateThrottleState: UIProcess is taking a foreground assertion because the view is visible");
</del><ins>+            WEBPAGEPROXY_RELEASE_LOG(ProcessSuspension, "updateThrottleState: UIProcess is taking a foreground assertion because the view is visible");
</ins><span class="cx">             m_isVisibleActivity = m_process->throttler().foregroundActivity("View is visible"_s).moveToUniquePtr();
</span><span class="cx">         }
</span><span class="cx">     } else if (m_isVisibleActivity) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "updateThrottleState: UIProcess is releasing a foreground assertion because the view is no longer visible");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(ProcessSuspension, "updateThrottleState: UIProcess is releasing a foreground assertion because the view is no longer visible");
</ins><span class="cx">         m_isVisibleActivity = nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -2215,12 +2211,12 @@
</span><span class="cx">     bool isAudible = m_activityState.contains(ActivityState::IsAudible);
</span><span class="cx">     if (isAudible) {
</span><span class="cx">         if (!m_isAudibleActivity || !m_isAudibleActivity->isValid()) {
</span><del>-            RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "updateThrottleState: UIProcess is taking a foreground assertion because we are playing audio");
</del><ins>+            WEBPAGEPROXY_RELEASE_LOG(ProcessSuspension, "updateThrottleState: UIProcess is taking a foreground assertion because we are playing audio");
</ins><span class="cx">             m_isAudibleActivity = m_process->throttler().foregroundActivity("View is playing audio"_s).moveToUniquePtr();
</span><span class="cx">         }
</span><span class="cx">         m_audibleActivityTimer.stop();
</span><span class="cx">     } else if (m_isAudibleActivity) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "updateThrottleState: UIProcess will release a foreground assertion in %g seconds because we are no longer playing audio", audibleActivityClearDelay.seconds());
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(ProcessSuspension, "updateThrottleState: UIProcess will release a foreground assertion in %g seconds because we are no longer playing audio", audibleActivityClearDelay.seconds());
</ins><span class="cx">         if (!m_audibleActivityTimer.isActive())
</span><span class="cx">             m_audibleActivityTimer.startOneShot(audibleActivityClearDelay);
</span><span class="cx">     }
</span><span class="lines">@@ -2228,11 +2224,11 @@
</span><span class="cx">     bool isCapturingMedia = m_activityState.contains(ActivityState::IsCapturingMedia);
</span><span class="cx">     if (isCapturingMedia) {
</span><span class="cx">         if (!m_isCapturingActivity || !m_isCapturingActivity->isValid()) {
</span><del>-            RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "updateThrottleState: UIProcess is taking a foreground assertion because media capture is active");
</del><ins>+            WEBPAGEPROXY_RELEASE_LOG(ProcessSuspension, "updateThrottleState: UIProcess is taking a foreground assertion because media capture is active");
</ins><span class="cx">             m_isCapturingActivity = m_process->throttler().foregroundActivity("View is capturing media"_s).moveToUniquePtr();
</span><span class="cx">         }
</span><span class="cx">     } else if (m_isCapturingActivity) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "updateThrottleState: UIProcess is releasing a foreground assertion because media capture is no longer active");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(ProcessSuspension, "updateThrottleState: UIProcess is releasing a foreground assertion because media capture is no longer active");
</ins><span class="cx">         m_isCapturingActivity = nullptr;
</span><span class="cx">     }
</span><span class="cx"> #endif
</span><span class="lines">@@ -2241,7 +2237,7 @@
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx"> void WebPageProxy::clearAudibleActivity()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "updateThrottleState: UIProcess is releasing a foreground assertion because we are no longer playing audio");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(ProcessSuspension, "updateThrottleState: UIProcess is releasing a foreground assertion because we are no longer playing audio");
</ins><span class="cx">     m_isAudibleActivity = nullptr;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -2524,7 +2520,7 @@
</span><span class="cx"> void WebPageProxy::stopMakingViewBlankDueToLackOfRenderingUpdate()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_hasUpdatedRenderingAfterDidCommitLoad);
</span><del>-    RELEASE_LOG_IF_ALLOWED(Process, "stopMakingViewBlankDueToLackOfRenderingUpdate:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Process, "stopMakingViewBlankDueToLackOfRenderingUpdate:");
</ins><span class="cx">     pageClient().makeViewBlank(false);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2540,7 +2536,7 @@
</span><span class="cx">         static bool shouldMakeViewBlank = true;
</span><span class="cx"> #endif
</span><span class="cx">         if (shouldMakeViewBlank) {
</span><del>-            RELEASE_LOG_IF_ALLOWED(Process, "makeViewBlankIfUnpaintedSinceLastLoadCommit: Making the view blank because of a JS prompt before the first paint for its page");
</del><ins>+            WEBPAGEPROXY_RELEASE_LOG(Process, "makeViewBlankIfUnpaintedSinceLastLoadCommit: Making the view blank because of a JS prompt before the first paint for its page");
</ins><span class="cx">             pageClient().makeViewBlank(true);
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="lines">@@ -3354,7 +3350,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, API::Navigation* navigation, Ref<API::NavigationAction>&& navigationAction, ProcessSwapRequestedByClient processSwapRequestedByClient, WebFrameProxy& frame, RefPtr<API::WebsitePolicies>&& policies, Ref<PolicyDecisionSender>&& sender)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "receivedNavigationPolicyDecision: frameID=%llu, navigationID=%llu, policyAction=%u", frame.frameID().toUInt64(), navigation ? navigation->navigationID() : 0, (unsigned)policyAction);
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "receivedNavigationPolicyDecision: frameID=%llu, navigationID=%llu, policyAction=%u", frame.frameID().toUInt64(), navigation ? navigation->navigationID() : 0, (unsigned)policyAction);
</ins><span class="cx"> 
</span><span class="cx">     Ref<WebsiteDataStore> websiteDataStore = m_websiteDataStore.copyRef();
</span><span class="cx">     if (policies) {
</span><span class="lines">@@ -3416,10 +3412,10 @@
</span><span class="cx">         bool shouldProcessSwap = processForNavigation.ptr() != sourceProcess.ptr();
</span><span class="cx">         if (shouldProcessSwap) {
</span><span class="cx">             policyAction = PolicyAction::StopAllLoads;
</span><del>-            RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "decidePolicyForNavigationAction, swapping process %i with process %i for navigation, reason=%" PUBLIC_LOG_STRING, processIdentifier(), processForNavigation->processIdentifier(), reason.utf8().data());
</del><ins>+            WEBPAGEPROXY_RELEASE_LOG(ProcessSwapping, "decidePolicyForNavigationAction, swapping process %i with process %i for navigation, reason=%" PUBLIC_LOG_STRING, processIdentifier(), processForNavigation->processIdentifier(), reason.utf8().data());
</ins><span class="cx">             LOG(ProcessSwapping, "(ProcessSwapping) Switching from process %i to new process (%i) for navigation %" PRIu64 " '%s'", processIdentifier(), processForNavigation->processIdentifier(), navigation->navigationID(), navigation->loggingString());
</span><span class="cx">         } else
</span><del>-            RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "decidePolicyForNavigationAction: keep using process %i for navigation, reason=%" PUBLIC_LOG_STRING, processIdentifier(), reason.utf8().data());
</del><ins>+            WEBPAGEPROXY_RELEASE_LOG(ProcessSwapping, "decidePolicyForNavigationAction: keep using process %i for navigation, reason=%" PUBLIC_LOG_STRING, processIdentifier(), reason.utf8().data());
</ins><span class="cx"> 
</span><span class="cx">         std::optional<SandboxExtension::Handle> optionalHandle;
</span><span class="cx">         if (shouldProcessSwap) {
</span><span class="lines">@@ -3498,7 +3494,7 @@
</span><span class="cx"> void WebPageProxy::commitProvisionalPage(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, WebCore::FrameLoadType frameLoadType, const WebCore::CertificateInfo& certificateInfo, bool usedLegacyTLS, bool containsPluginDocument, std::optional<WebCore::HasInsecureContent> forcedHasInsecureContent, WebCore::MouseEventPolicy mouseEventPolicy, const UserData& userData)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_provisionalPage);
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "commitProvisionalPage: newPID=%i", m_provisionalPage->process().processIdentifier());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "commitProvisionalPage: newPID=%i", m_provisionalPage->process().processIdentifier());
</ins><span class="cx"> 
</span><span class="cx">     std::optional<FrameIdentifier> mainFrameIDInPreviousProcess = m_mainFrame ? std::make_optional(m_mainFrame->frameID()) : std::nullopt;
</span><span class="cx"> 
</span><span class="lines">@@ -3536,12 +3532,12 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::continueNavigationInNewProcess(API::Navigation& navigation, std::unique_ptr<SuspendedPageProxy>&& suspendedPage, Ref<WebProcessProxy>&& newProcess, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<API::WebsitePolicies>&& websitePolicies)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "continueNavigationInNewProcess: newProcessPID=%i, hasSuspendedPage=%i", newProcess->processIdentifier(), !!suspendedPage);
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "continueNavigationInNewProcess: newProcessPID=%i, hasSuspendedPage=%i", newProcess->processIdentifier(), !!suspendedPage);
</ins><span class="cx">     LOG(Loading, "Continuing navigation %" PRIu64 " '%s' in a new web process", navigation.navigationID(), navigation.loggingString());
</span><span class="cx">     RELEASE_ASSERT(!newProcess->isInProcessCache());
</span><span class="cx"> 
</span><span class="cx">     if (m_provisionalPage) {
</span><del>-        RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "continueNavigationInNewProcess: There is already a pending provisional load, cancelling it (provisonalNavigationID=%llu, navigationID=%llu)", m_provisionalPage->navigationID(), navigation.navigationID());
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(ProcessSwapping, "continueNavigationInNewProcess: There is already a pending provisional load, cancelling it (provisonalNavigationID=%llu, navigationID=%llu)", m_provisionalPage->navigationID(), navigation.navigationID());
</ins><span class="cx">         if (m_provisionalPage->navigationID() != navigation.navigationID())
</span><span class="cx">             m_provisionalPage->cancel();
</span><span class="cx">         m_provisionalPage = nullptr;
</span><span class="lines">@@ -3674,7 +3670,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::suspend(CompletionHandler<void(bool)>&& completionHandler)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "suspend:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "suspend:");
</ins><span class="cx">     if (!hasRunningProcess() || m_isSuspended)
</span><span class="cx">         return completionHandler(false);
</span><span class="cx"> 
</span><span class="lines">@@ -3684,7 +3680,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::resume(CompletionHandler<void(bool)>&& completionHandler)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "resume:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "resume:");
</ins><span class="cx"> 
</span><span class="cx">     if (!hasRunningProcess() || !m_isSuspended)
</span><span class="cx">         return completionHandler(false);
</span><span class="lines">@@ -3730,7 +3726,7 @@
</span><span class="cx"> 
</span><span class="cx"> RefPtr<API::Navigation> WebPageProxy::restoreFromSessionState(SessionState sessionState, bool navigate)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "restoreFromSessionState:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "restoreFromSessionState:");
</ins><span class="cx"> 
</span><span class="cx">     m_sessionRestorationRenderTreeSize = 0;
</span><span class="cx">     m_hitRenderTreeSizeThreshold = false;
</span><span class="lines">@@ -4548,7 +4544,7 @@
</span><span class="cx">         navigation = navigationState().navigation(navigationID);
</span><span class="cx"> 
</span><span class="cx">     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());
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "didStartProvisionalLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "didStartProvisionalLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     auto transaction = m_pageLoadState.transaction();
</span><span class="cx">     m_pageLoadState.clearPendingAPIRequest(transaction);
</span><span class="lines">@@ -4585,7 +4581,7 @@
</span><span class="cx">     MESSAGE_CHECK(m_process, frame);
</span><span class="cx"> 
</span><span class="cx">     if (!checkURLReceivedFromCurrentOrPreviousWebProcess(m_process, url)) {
</span><del>-        RELEASE_LOG_ERROR_IF_ALLOWED(Process, "Ignoring WebPageProxy::DidExplicitOpenForFrame() IPC from the WebContent process because the file URL is outside the sandbox");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG_ERROR(Process, "Ignoring WebPageProxy::DidExplicitOpenForFrame() IPC from the WebContent process because the file URL is outside the sandbox");
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -4610,7 +4606,7 @@
</span><span class="cx"> void WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrameShared(Ref<WebProcessProxy>&& process, FrameIdentifier frameID, uint64_t navigationID, ResourceRequest&& request, const UserData& userData)
</span><span class="cx"> {
</span><span class="cx">     LOG(Loading, "WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame to frameID %" PRIu64 ", navigationID %" PRIu64 ", url %s", frameID.toUInt64(), navigationID, request.url().string().utf8().data());
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "didReceiveServerRedirectForProvisionalLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "didReceiveServerRedirectForProvisionalLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     PageClientProtector protector(pageClient());
</span><span class="cx"> 
</span><span class="lines">@@ -4639,7 +4635,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::willPerformClientRedirectForFrame(FrameIdentifier frameID, const String& url, double delay, WebCore::LockBackForwardList)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "willPerformClientRedirectForFrame: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "willPerformClientRedirectForFrame: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     PageClientProtector protector(pageClient());
</span><span class="cx"> 
</span><span class="lines">@@ -4652,7 +4648,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::didCancelClientRedirectForFrame(FrameIdentifier frameID)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "didCancelClientRedirectForFrame: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "didCancelClientRedirectForFrame: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     PageClientProtector protector(pageClient());
</span><span class="cx"> 
</span><span class="lines">@@ -4700,7 +4696,7 @@
</span><span class="cx"> void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref<WebProcessProxy>&& process, FrameIdentifier frameID, FrameInfoData&& frameInfo, WebCore::ResourceRequest&& request, uint64_t navigationID, const String& provisionalURL, const ResourceError& error, WillContinueLoading willContinueLoading, const UserData& userData)
</span><span class="cx"> {
</span><span class="cx">     LOG(Loading, "(Loading) WebPageProxy %" PRIu64 " in web process pid %i didFailProvisionalLoadForFrame to provisionalURL %s", m_identifier.toUInt64(), process->processIdentifier(), provisionalURL.utf8().data());
</span><del>-    RELEASE_LOG_ERROR_IF_ALLOWED(Process, "didFailProvisionalLoadForFrame: frameID=%" PRIu64 ", domain=%s, code=%d", frameID.toUInt64(), error.domain().utf8().data(), error.errorCode());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG_ERROR(Process, "didFailProvisionalLoadForFrame: frameID=%" PRIu64 ", domain=%s, code=%d", frameID.toUInt64(), error.domain().utf8().data(), error.errorCode());
</ins><span class="cx"> 
</span><span class="cx">     PageClientProtector protector(pageClient());
</span><span class="cx"> 
</span><span class="lines">@@ -4771,7 +4767,7 @@
</span><span class="cx"> {
</span><span class="cx">     LOG(Loading, "(Loading) WebPageProxy %" PRIu64 " didCommitLoadForFrame in navigation %" PRIu64, m_identifier.toUInt64(), navigationID);
</span><span class="cx">     LOG(BackForward, "(Back/Forward) After load commit, back/forward list is now:%s", m_backForwardList->loggingString());
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "didCommitLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "didCommitLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     PageClientProtector protector(pageClient());
</span><span class="cx"> 
</span><span class="lines">@@ -4895,7 +4891,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::didFinishDocumentLoadForFrame(FrameIdentifier frameID, uint64_t navigationID, const UserData& userData)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "didFinishDocumentLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "didFinishDocumentLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     PageClientProtector protector(pageClient());
</span><span class="cx"> 
</span><span class="lines">@@ -4923,7 +4919,7 @@
</span><span class="cx"> void WebPageProxy::didFinishLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, const UserData& userData)
</span><span class="cx"> {
</span><span class="cx">     LOG(Loading, "WebPageProxy::didFinishLoadForFrame - WebPageProxy %p with navigationID %" PRIu64 " didFinishLoad", this, navigationID);
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "didFinishLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "didFinishLoadForFrame: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     PageClientProtector protector(pageClient());
</span><span class="cx"> 
</span><span class="lines">@@ -4974,7 +4970,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::didFailLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, const ResourceError& error, const UserData& userData)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_ERROR_IF_ALLOWED(Loading, "didFailLoadForFrame: frameID=%" PRIu64 ", domain=%s, code=%d", frameID.toUInt64(), error.domain().utf8().data(), error.errorCode());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "didFailLoadForFrame: frameID=%" PRIu64 ", domain=%s, code=%d", frameID.toUInt64(), error.domain().utf8().data(), error.errorCode());
</ins><span class="cx"> 
</span><span class="cx">     PageClientProtector protector(pageClient());
</span><span class="cx"> 
</span><span class="lines">@@ -5019,7 +5015,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::didSameDocumentNavigationForFrame(FrameIdentifier frameID, uint64_t navigationID, uint32_t opaqueSameDocumentNavigationType, URL&& url, const UserData& userData)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "didSameDocumentNavigationForFrame: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "didSameDocumentNavigationForFrame: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     PageClientProtector protector(pageClient());
</span><span class="cx"> 
</span><span class="lines">@@ -5205,7 +5201,7 @@
</span><span class="cx">     NavigationActionData&& navigationActionData, FrameInfoData&& originatingFrameInfoData, std::optional<WebPageProxyIdentifier> originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&& request,
</span><span class="cx">     IPC::FormDataReference&& requestBody, WebCore::ResourceResponse&& redirectResponse, const UserData& userData, Ref<PolicyDecisionSender>&& sender)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "decidePolicyForNavigationAction: frameID=%llu, navigationID=%llu", frame.frameID().toUInt64(), navigationID);
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "decidePolicyForNavigationAction: frameID=%llu, navigationID=%llu", frame.frameID().toUInt64(), navigationID);
</ins><span class="cx"> 
</span><span class="cx">     LOG(Loading, "WebPageProxy::decidePolicyForNavigationAction - Original URL %s, current target URL %s", originalRequest.url().string().utf8().data(), request.url().string().utf8().data());
</span><span class="cx"> 
</span><span class="lines">@@ -5221,7 +5217,7 @@
</span><span class="cx">         m_pageLoadState.clearPendingAPIRequest(transaction);
</span><span class="cx"> 
</span><span class="cx">     if (!checkURLReceivedFromCurrentOrPreviousWebProcess(process, request.url())) {
</span><del>-        RELEASE_LOG_ERROR_IF_ALLOWED(Process, "Ignoring request to load this main resource because it is outside the sandbox");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG_ERROR(Process, "Ignoring request to load this main resource because it is outside the sandbox");
</ins><span class="cx">         sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt });
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="lines">@@ -5287,7 +5283,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx">     if (frame.didHandleContentFilterUnblockNavigation(request)) {
</span><del>-        RELEASE_LOG_ERROR_IF_ALLOWED(Process, "Ignoring request to load this main resource because it was handled by content filter");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG_ERROR(Process, "Ignoring request to load this main resource because it was handled by content filter");
</ins><span class="cx">         return receivedPolicyDecision(PolicyAction::Ignore, m_navigationState->navigation(navigationID), nullptr, WTFMove(navigationAction), WTFMove(sender));
</span><span class="cx">     }
</span><span class="cx"> #endif
</span><span class="lines">@@ -5302,7 +5298,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     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, std::optional<NavigatingToAppBoundDomain> isAppBoundDomain) mutable {
</span><del>-        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);
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG(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);
</ins><span class="cx"> 
</span><span class="cx">         auto completionHandler = [this, protectedThis, frame, sender = WTFMove(sender), navigation, navigationAction = WTFMove(navigationAction), processSwapRequestedByClient, policies = makeRefPtr(policies)] (PolicyAction policyAction) mutable {
</span><span class="cx">             if (frame->isMainFrame()) {
</span><span class="lines">@@ -5321,7 +5317,7 @@
</span><span class="cx">             if (!setIsNavigatingToAppBoundDomainAndCheckIfPermitted(frame->isMainFrame(), navigation->currentRequest().url(), isAppBoundDomain)) {
</span><span class="cx">                 auto error = errorForUnpermittedAppBoundDomainNavigation(navigation->currentRequest().url());
</span><span class="cx">                 m_navigationClient->didFailProvisionalNavigationWithError(*this, FrameInfoData { frameInfo }, navigation.get(), error, userDataObject);
</span><del>-                RELEASE_LOG_ERROR_IF_ALLOWED(Loading, "Ignoring request to load this main resource because it is attempting to navigate away from an app-bound domain or navigate after using restricted APIs");
</del><ins>+                WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "Ignoring request to load this main resource because it is attempting to navigate away from an app-bound domain or navigate after using restricted APIs");
</ins><span class="cx">                 completionHandler(PolicyAction::Ignore);
</span><span class="cx">                 return;
</span><span class="cx">             }
</span><span class="lines">@@ -5597,7 +5593,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::didNavigateWithNavigationDataShared(Ref<WebProcessProxy>&& process, const WebNavigationDataStore& store, FrameIdentifier frameID)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "didNavigateWithNavigationDataShared:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "didNavigateWithNavigationDataShared:");
</ins><span class="cx"> 
</span><span class="cx">     PageClientProtector protector(pageClient());
</span><span class="cx"> 
</span><span class="lines">@@ -5617,7 +5613,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::didPerformClientRedirectShared(Ref<WebProcessProxy>&& process, const String& sourceURLString, const String& destinationURLString, FrameIdentifier frameID)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "didPerformClientRedirectShared: frameID=%" PRIu64, frameID.toUInt64());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "didPerformClientRedirectShared: frameID=%" PRIu64, frameID.toUInt64());
</ins><span class="cx"> 
</span><span class="cx">     PageClientProtector protector(pageClient());
</span><span class="cx"> 
</span><span class="lines">@@ -5644,7 +5640,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::didPerformServerRedirectShared(Ref<WebProcessProxy>&& process, const String& sourceURLString, const String& destinationURLString, FrameIdentifier frameID)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Loading, "didPerformServerRedirect:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Loading, "didPerformServerRedirect:");
</ins><span class="cx"> 
</span><span class="cx">     PageClientProtector protector(pageClient());
</span><span class="cx"> 
</span><span class="lines">@@ -5774,7 +5770,7 @@
</span><span class="cx">     if (isClosed())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED(Process, "closePage:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:");
</ins><span class="cx">     pageClient().clearAllEditCommands();
</span><span class="cx">     m_uiClient->close(this);
</span><span class="cx"> }
</span><span class="lines">@@ -7495,7 +7491,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::processDidBecomeUnresponsive()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_ERROR_IF_ALLOWED(Process, "processDidBecomeUnresponsive:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG_ERROR(Process, "processDidBecomeUnresponsive:");
</ins><span class="cx"> 
</span><span class="cx">     if (!hasRunningProcess())
</span><span class="cx">         return;
</span><span class="lines">@@ -7507,7 +7503,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::processDidBecomeResponsive()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Process, "processDidBecomeResponsive:");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Process, "processDidBecomeResponsive:");
</ins><span class="cx"> 
</span><span class="cx">     if (!hasRunningProcess())
</span><span class="cx">         return;
</span><span class="lines">@@ -7548,7 +7544,7 @@
</span><span class="cx"> void WebPageProxy::resetStateAfterProcessTermination(ProcessTerminationReason reason)
</span><span class="cx"> {
</span><span class="cx">     if (reason != ProcessTerminationReason::NavigationSwap)
</span><del>-        RELEASE_LOG_ERROR_IF_ALLOWED(Process, "processDidTerminate: (pid %d), reason %d", processIdentifier(), reason);
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG_ERROR(Process, "processDidTerminate: (pid %d), reason %d", processIdentifier(), reason);
</ins><span class="cx"> 
</span><span class="cx">     ASSERT(m_hasRunningProcess);
</span><span class="cx"> 
</span><span class="lines">@@ -7602,7 +7598,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_ERROR_IF_ALLOWED(Loading, "dispatchProcessDidTerminate: reason=%d", reason);
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%d", reason);
</ins><span class="cx"> 
</span><span class="cx">     bool handledByClient = false;
</span><span class="cx">     if (m_loaderClient)
</span><span class="lines">@@ -7619,11 +7615,11 @@
</span><span class="cx">     m_resetRecentCrashCountTimer.stop();
</span><span class="cx"> 
</span><span class="cx">     if (++m_recentCrashCount > maximumWebProcessRelaunchAttempts) {
</span><del>-        RELEASE_LOG_ERROR_IF_ALLOWED(Process, "tryReloadAfterProcessTermination: process crashed and the client did not handle it, not reloading the page because we reached the maximum number of attempts");
</del><ins>+        WEBPAGEPROXY_RELEASE_LOG_ERROR(Process, "tryReloadAfterProcessTermination: process crashed and the client did not handle it, not reloading the page because we reached the maximum number of attempts");
</ins><span class="cx">         m_recentCrashCount = 0;
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    RELEASE_LOG_IF_ALLOWED(Process, "tryReloadAfterProcessTermination: process crashed and the client did not handle it, reloading the page");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Process, "tryReloadAfterProcessTermination: process crashed and the client did not handle it, reloading the page");
</ins><span class="cx">     reload(ReloadOption::ExpiredOnly);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -8270,16 +8266,16 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::requestStorageSpace(FrameIdentifier frameID, const String& originIdentifier, const String& databaseName, const String& displayName, uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage, CompletionHandler<void(uint64_t)>&& completionHandler)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_IF_ALLOWED(Storage, "requestStorageSpace for frame %" PRIu64 ", current quota %" PRIu64 " current usage %" PRIu64 " expected usage %" PRIu64, frameID.toUInt64(), currentQuota, currentDatabaseUsage, expectedUsage);
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Storage, "requestStorageSpace for frame %" PRIu64 ", current quota %" PRIu64 " current usage %" PRIu64 " expected usage %" PRIu64, frameID.toUInt64(), currentQuota, currentDatabaseUsage, expectedUsage);
</ins><span class="cx"> 
</span><span class="cx">     StorageRequests::singleton().processOrAppend([this, protectedThis = makeRef(*this), pageURL = currentURL(), frameID, originIdentifier, databaseName, displayName, currentQuota, currentOriginUsage, currentDatabaseUsage, expectedUsage, completionHandler = WTFMove(completionHandler)]() mutable {
</span><span class="cx">         this->makeStorageSpaceRequest(frameID, originIdentifier, databaseName, displayName, currentQuota, currentOriginUsage, currentDatabaseUsage, expectedUsage, [this, protectedThis = WTFMove(protectedThis), frameID, pageURL = WTFMove(pageURL), completionHandler = WTFMove(completionHandler), currentQuota](auto quota) mutable {
</span><span class="cx"> 
</span><del>-            RELEASE_LOG_IF_ALLOWED(Storage, "requestStorageSpace response for frame %" PRIu64 ", quota %" PRIu64, frameID.toUInt64(), quota);
</del><ins>+            WEBPAGEPROXY_RELEASE_LOG(Storage, "requestStorageSpace response for frame %" PRIu64 ", quota %" PRIu64, frameID.toUInt64(), quota);
</ins><span class="cx">             UNUSED_VARIABLE(frameID);
</span><span class="cx"> 
</span><span class="cx">             if (quota <= currentQuota && this->currentURL() == pageURL) {
</span><del>-                RELEASE_LOG_IF_ALLOWED(Storage, "storage space increase denied");
</del><ins>+                WEBPAGEPROXY_RELEASE_LOG(Storage, "storage space increase denied");
</ins><span class="cx">                 m_isQuotaIncreaseDenied =  true;
</span><span class="cx">             }
</span><span class="cx">             completionHandler(quota);
</span><span class="lines">@@ -9368,7 +9364,7 @@
</span><span class="cx">     if (!haveReportedCapture && willReportCapture)
</span><span class="cx">         m_updateReportedMediaCaptureStateTimer.startOneShot(m_mediaCaptureReportingDelay);
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_IF_ALLOWED(WebRTC, "updateReportedMediaCaptureState: from %d to %d", m_reportedMediaCaptureState.toRaw(), activeCaptureState.toRaw());
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(WebRTC, "updateReportedMediaCaptureState: from %d to %d", m_reportedMediaCaptureState.toRaw(), activeCaptureState.toRaw());
</ins><span class="cx"> 
</span><span class="cx">     bool microphoneCaptureChanged = (m_reportedMediaCaptureState & MediaProducer::AudioCaptureMask) != (activeCaptureState & MediaProducer::AudioCaptureMask);
</span><span class="cx">     bool cameraCaptureChanged = (m_reportedMediaCaptureState & MediaProducer::VideoCaptureMask) != (activeCaptureState & MediaProducer::VideoCaptureMask);
</span><span class="lines">@@ -9607,13 +9603,13 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::didExceedInactiveMemoryLimitWhileActive()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_ERROR_IF_ALLOWED(PerformanceLogging, "didExceedInactiveMemoryLimitWhileActive");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG_ERROR(PerformanceLogging, "didExceedInactiveMemoryLimitWhileActive");
</ins><span class="cx">     m_uiClient->didExceedBackgroundResourceLimitWhileInForeground(*this, kWKResourceLimitMemory);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::didExceedBackgroundCPULimitWhileInForeground()
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_ERROR_IF_ALLOWED(PerformanceLogging, "didExceedBackgroundCPULimitWhileInForeground");
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG_ERROR(PerformanceLogging, "didExceedBackgroundCPULimitWhileInForeground");
</ins><span class="cx">     m_uiClient->didExceedBackgroundResourceLimitWhileInForeground(*this, kWKResourceLimitCPU);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -10421,7 +10417,8 @@
</span><span class="cx"> {
</span><span class="cx">     if (!m_logger) {
</span><span class="cx">         m_logger = Logger::create(this);
</span><del>-        m_logger->setEnabled(this, isAlwaysOnLoggingAllowed());
</del><ins>+        // FIXME: Does this really need to be disabled in ephemeral sessions?
+        m_logger->setEnabled(this, !sessionID().isEphemeral());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return *m_logger;
</span><span class="lines">@@ -10680,7 +10677,8 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><del>-#undef RELEASE_LOG_IF_ALLOWED
</del><ins>+#undef WEBPAGEPROXY_RELEASE_LOG
+#undef WEBPAGEPROXY_RELEASE_LOG_ERROR
</ins><span class="cx"> #undef MESSAGE_CHECK_COMPLETION
</span><span class="cx"> #undef MESSAGE_CHECK_URL
</span><span class="cx"> #undef MESSAGE_CHECK
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (278314 => 278315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.h     2021-06-01 17:36:49 UTC (rev 278314)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h        2021-06-01 18:14:29 UTC (rev 278315)
</span><span class="lines">@@ -1590,7 +1590,7 @@
</span><span class="cx">     void externalOutputDeviceAvailableDidChange(WebCore::PlaybackTargetClientContextIdentifier, bool) final;
</span><span class="cx">     void setShouldPlayToPlaybackTarget(WebCore::PlaybackTargetClientContextIdentifier, bool) final;
</span><span class="cx">     void playbackTargetPickerWasDismissed(WebCore::PlaybackTargetClientContextIdentifier) final;
</span><del>-    bool alwaysOnLoggingAllowed() const final { return isAlwaysOnLoggingAllowed(); }
</del><ins>+    bool alwaysOnLoggingAllowed() const final { return sessionID().isAlwaysOnLoggingAllowed(); }
</ins><span class="cx">     bool useiTunesAVOutputContext() const final;
</span><span class="cx">     PlatformView* platformView() const final;
</span><span class="cx"> 
</span><span class="lines">@@ -1624,8 +1624,6 @@
</span><span class="cx">     bool isNeverRichlyEditableForTouchBar() const { return m_isNeverRichlyEditableForTouchBar; }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    bool isAlwaysOnLoggingAllowed() const;
-
</del><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx">     void gamepadActivity(const Vector<GamepadData>&, WebCore::EventMakesGamepadsVisible);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (278314 => 278315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm     2021-06-01 17:36:49 UTC (rev 278314)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm        2021-06-01 18:14:29 UTC (rev 278315)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> 
</span><span class="cx"> #define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, process().connection())
</span><span class="cx"> 
</span><del>-#define RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), channel, "%p - [pageProxyID=%llu, webPageID=%llu, PID=%i] WebPageProxy::" fmt, this, m_identifier.toUInt64(), m_webPageID.toUInt64(), m_process->processIdentifier(), ##__VA_ARGS__)
</del><ins>+#define WEBPAGEPROXY_RELEASE_LOG(channel, fmt, ...) RELEASE_LOG(channel, "%p - [pageProxyID=%llu, webPageID=%llu, PID=%i] WebPageProxy::" fmt, this, m_identifier.toUInt64(), m_webPageID.toUInt64(), m_process->processIdentifier(), ##__VA_ARGS__)
</ins><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -589,7 +589,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool isSuspendedUnderLock = [UIApp isSuspendedUnderLock];
</span><span class="cx">     
</span><del>-    RELEASE_LOG_IF_ALLOWED(ViewState, "applicationDidEnterBackground: isSuspendedUnderLock? %d", isSuspendedUnderLock);
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(ViewState, "applicationDidEnterBackground: isSuspendedUnderLock? %d", isSuspendedUnderLock);
</ins><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(WATCHOS)
</span><span class="cx">     // We normally delay process suspension when the app is backgrounded until the current page load completes. However,
</span><span class="lines">@@ -619,7 +619,7 @@
</span><span class="cx">     m_lastObservedStateWasBackground = false;
</span><span class="cx"> 
</span><span class="cx">     bool isSuspendedUnderLock = [UIApp isSuspendedUnderLock];
</span><del>-    RELEASE_LOG_IF_ALLOWED(ViewState, "applicationWillEnterForeground: isSuspendedUnderLock? %d", isSuspendedUnderLock);
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(ViewState, "applicationWillEnterForeground: isSuspendedUnderLock? %d", isSuspendedUnderLock);
</ins><span class="cx"> 
</span><span class="cx">     m_process->send(Messages::WebPage::ApplicationWillEnterForeground(isSuspendedUnderLock), m_webPageID);
</span><span class="cx">     m_process->send(Messages::WebPage::HardwareKeyboardAvailabilityChanged(isInHardwareKeyboardMode()), m_webPageID);
</span><span class="lines">@@ -633,7 +633,7 @@
</span><span class="cx"> void WebPageProxy::applicationDidEnterBackgroundForMedia()
</span><span class="cx"> {
</span><span class="cx">     bool isSuspendedUnderLock = [UIApp isSuspendedUnderLock];
</span><del>-    RELEASE_LOG_IF_ALLOWED(ViewState, "applicationWillEnterForegroundForMedia: isSuspendedUnderLock? %d", isSuspendedUnderLock);
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(ViewState, "applicationWillEnterForegroundForMedia: isSuspendedUnderLock? %d", isSuspendedUnderLock);
</ins><span class="cx"> 
</span><span class="cx">     m_process->send(Messages::WebPage::ApplicationDidEnterBackgroundForMedia(isSuspendedUnderLock), m_webPageID);
</span><span class="cx"> }
</span><span class="lines">@@ -641,7 +641,7 @@
</span><span class="cx"> void WebPageProxy::applicationWillEnterForegroundForMedia()
</span><span class="cx"> {
</span><span class="cx">     bool isSuspendedUnderLock = [UIApp isSuspendedUnderLock];
</span><del>-    RELEASE_LOG_IF_ALLOWED(ViewState, "applicationDidEnterBackgroundForMedia: isSuspendedUnderLock? %d", isSuspendedUnderLock);
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(ViewState, "applicationDidEnterBackgroundForMedia: isSuspendedUnderLock? %d", isSuspendedUnderLock);
</ins><span class="cx"> 
</span><span class="cx">     m_process->send(Messages::WebPage::ApplicationWillEnterForegroundForMedia(isSuspendedUnderLock), m_webPageID);
</span><span class="cx"> }
</span><span class="lines">@@ -1466,7 +1466,7 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     bool canTakeForegroundAssertions = pageClient().canTakeForegroundAssertions();
</span><del>-    RELEASE_LOG_IF_ALLOWED(Process, "WebPageProxy::shouldForceForegroundPriorityForClientNavigation() returns %d based on PageClient::canTakeForegroundAssertions()", canTakeForegroundAssertions);
</del><ins>+    WEBPAGEPROXY_RELEASE_LOG(Process, "WebPageProxy::shouldForceForegroundPriorityForClientNavigation() returns %d based on PageClient::canTakeForegroundAssertions()", canTakeForegroundAssertions);
</ins><span class="cx">     return canTakeForegroundAssertions;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1578,7 +1578,7 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><del>-#undef RELEASE_LOG_IF_ALLOWED
</del><ins>+#undef WEBPAGEPROXY_RELEASE_LOG
</ins><span class="cx"> #undef MESSAGE_CHECK
</span><span class="cx"> 
</span><span class="cx"> #endif // PLATFORM(IOS_FAMILY)
</span></span></pre>
</div>
</div>

</body>
</html>