<!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>[207801] branches/safari-602-branch/Source</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/207801">207801</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-24 20:23:10 -0700 (Mon, 24 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204472">r204472</a>. rdar://problem/28544885</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWTFChangeLog">branches/safari-602-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWTFwtfAssertionsh">branches/safari-602-branch/Source/WTF/wtf/Assertions.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreloaderFrameLoadercpp">branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformMemoryPressureHandlercpp">branches/safari-602-branch/Source/WebCore/platform/MemoryPressureHandler.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformMemoryPressureHandlerh">branches/safari-602-branch/Source/WebCore/platform/MemoryPressureHandler.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformgraphicscocoaIOSurfacemm">branches/safari-602-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2NetworkProcessDownloadsDownloadcpp">branches/safari-602-branch/Source/WebKit2/NetworkProcess/Downloads/Download.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2NetworkProcessNetworkProcesscpp">branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2NetworkProcessNetworkResourceLoadercpp">branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2PlatformIPCConnectioncpp">branches/safari-602-branch/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2SharedChildProcesscpp">branches/safari-602-branch/Source/WebKit2/Shared/ChildProcess.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessCocoaNavigationStatemm">branches/safari-602-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">branches/safari-602-branch/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessProcessThrottlercpp">branches/safari-602-branch/Source/WebKit2/UIProcess/ProcessThrottler.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessWebProcessProxycpp">branches/safari-602-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessiosProcessAssertionIOSmm">branches/safari-602-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessNetworkWebLoaderStrategycpp">branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessNetworkWebResourceLoadercpp">branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebProcesscpp">branches/safari-602-branch/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WTF/ChangeLog (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WTF/ChangeLog 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WTF/ChangeLog 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-10-24 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r204472. rdar://problem/28544885
+
+ 2016-08-15 Keith Rollin <krollin@apple.com>
+
+ Rename LOG_ALWAYS
+ https://bugs.webkit.org/show_bug.cgi?id=160768
+
+ Rename LOG_ALWAYS and friends, given that the first parameter to it is
+ a boolean expression that determines whether or not logging should be
+ performed.
+
+ Reviewed by Chris Dumez.
+
+ * wtf/Assertions.h:
+
</ins><span class="cx"> 2016-10-19 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r205859. rdar://problem/28635084
</span></span></pre></div>
<a id="branchessafari602branchSourceWTFwtfAssertionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WTF/wtf/Assertions.h (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WTF/wtf/Assertions.h 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WTF/wtf/Assertions.h 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> #define LOG_DISABLED ASSERTIONS_DISABLED_DEFAULT
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#ifndef LOG_ALWAYS_DISABLED
-#define LOG_ALWAYS_DISABLED !(USE(OS_LOG))
</del><ins>+#ifndef RELEASE_LOG_DISABLED
+#define RELEASE_LOG_DISABLED !(USE(OS_LOG))
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if COMPILER(GCC_OR_CLANG)
</span><span class="lines">@@ -380,17 +380,19 @@
</span><span class="cx"> #define LOG_VERBOSE(channel, ...) WTFLogVerbose(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-/* LOG_ALWAYS */
</del><ins>+/* RELEASE_LOG */
</ins><span class="cx">
</span><span class="cx"> #define WTF_LOGGING_PREFIX "#WK: "
</span><del>-#if LOG_ALWAYS_DISABLED
-#define LOG_ALWAYS(isAllowed, format, ...) ((void)0)
-#define LOG_ALWAYS_ERROR(isAllowed, format, ...) WTFReportError(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, format, ##__VA_ARGS__)
</del><ins>+#if RELEASE_LOG_DISABLED
+#define RELEASE_LOG(format, ...) ((void)0)
+#define RELEASE_LOG_ERROR(format, ...) WTFReportError(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, format, ##__VA_ARGS__)
</ins><span class="cx"> #else
</span><span class="cx"> #define WTF_LOG_DEFAULT OS_LOG_DEFAULT
</span><del>-#define LOG_ALWAYS(isAllowed, format, ...) do { if (isAllowed) os_log(WTF_LOG_DEFAULT, WTF_LOGGING_PREFIX format, ##__VA_ARGS__); } while (0)
-#define LOG_ALWAYS_ERROR(isAllowed, format, ...) do { if (isAllowed) os_log_error(WTF_LOG_DEFAULT, WTF_LOGGING_PREFIX format, ##__VA_ARGS__); } while (0)
</del><ins>+#define RELEASE_LOG(format, ...) os_log(WTF_LOG_DEFAULT, WTF_LOGGING_PREFIX format, ##__VA_ARGS__)
+#define RELEASE_LOG_ERROR(format, ...) os_log_error(WTF_LOG_DEFAULT, WTF_LOGGING_PREFIX format, ##__VA_ARGS__)
</ins><span class="cx"> #endif
</span><ins>+#define RELEASE_LOG_IF(isAllowed, format, ...) do { if (isAllowed) RELEASE_LOG(format, ##__VA_ARGS__); } while (0)
+#define RELEASE_LOG_ERROR_IF(isAllowed, format, ...) do { if (isAllowed) RELEASE_LOG_ERROR(format, ##__VA_ARGS__); } while (0)
</ins><span class="cx">
</span><span class="cx"> /* RELEASE_ASSERT */
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-10-24 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r204472. rdar://problem/28544885
+
+ 2016-08-15 Keith Rollin <krollin@apple.com>
+
+ Rename LOG_ALWAYS
+ https://bugs.webkit.org/show_bug.cgi?id=160768
+
+ Rename LOG_ALWAYS and friends, given that the first parameter to it is
+ a boolean expression that determines whether or not logging should be
+ performed.
+
+ Reviewed by Chris Dumez.
+
+ No new tests. No new functionality is added. Only some macro names
+ have been changed.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::prepareForLoadStart):
+ (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+ * platform/MemoryPressureHandler.cpp:
+ (WebCore::MemoryPressureHandler::ReliefLogger::logMemoryUsageChange):
+ * platform/graphics/cocoa/IOSurface.mm:
+ (WebCore::IOSurface::IOSurface):
+
</ins><span class="cx"> 2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r207220. rdar://problem/28811939
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> #include "WKContentObservation.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define FRAMELOADER_LOG_ALWAYS(...) LOG_ALWAYS(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -1102,7 +1102,7 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::prepareForLoadStart()
</span><span class="cx"> {
</span><del>- FRAMELOADER_LOG_ALWAYS("Starting frame load, frame = %p, main = %d", &m_frame, m_frame.isMainFrame());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Starting frame load, frame = %p, main = %d", &m_frame, m_frame.isMainFrame());
</ins><span class="cx">
</span><span class="cx"> m_progressTracker->progressStarted();
</span><span class="cx"> m_client.dispatchDidStartProvisionalLoad();
</span><span class="lines">@@ -2309,11 +2309,11 @@
</span><span class="cx">
</span><span class="cx"> AXObjectCache::AXLoadingEvent loadingEvent;
</span><span class="cx"> if (!error.isNull()) {
</span><del>- FRAMELOADER_LOG_ALWAYS("Finished frame load with error, frame = %p, main = %d, isTimeout = %d, isCancellation = %d, errorCode = %d", &m_frame, m_frame.isMainFrame(), error.isTimeout(), error.isCancellation(), error.errorCode());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Finished frame load with error, frame = %p, main = %d, isTimeout = %d, isCancellation = %d, errorCode = %d", &m_frame, m_frame.isMainFrame(), error.isTimeout(), error.isCancellation(), error.errorCode());
</ins><span class="cx"> m_client.dispatchDidFailLoad(error);
</span><span class="cx"> loadingEvent = AXObjectCache::AXLoadingFailed;
</span><span class="cx"> } else {
</span><del>- FRAMELOADER_LOG_ALWAYS("Finished frame load without error, frame = %p, main = %d", &m_frame, m_frame.isMainFrame());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Finished frame load without error, frame = %p, main = %d", &m_frame, m_frame.isMainFrame());
</ins><span class="cx"> #if ENABLE(DATA_DETECTION)
</span><span class="cx"> auto* document = m_frame.document();
</span><span class="cx"> if (m_frame.settings().dataDetectorTypes() != DataDetectorTypeNone && document) {
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/MemoryPressureHandler.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/MemoryPressureHandler.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebCore/platform/MemoryPressureHandler.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -207,9 +207,9 @@
</span><span class="cx">
</span><span class="cx"> void MemoryPressureHandler::ReliefLogger::logMemoryUsageChange()
</span><span class="cx"> {
</span><del>-#if !LOG_ALWAYS_DISABLED
</del><ins>+#if !RELEASE_LOG_DISABLED
</ins><span class="cx"> #define STRING_SPECIFICATION "%{public}s"
</span><del>-#define MEMORYPRESSURE_LOG(...) LOG_ALWAYS(true, __VA_ARGS__)
</del><ins>+#define MEMORYPRESSURE_LOG(...) RELEASE_LOG(__VA_ARGS__)
</ins><span class="cx"> #else
</span><span class="cx"> #define STRING_SPECIFICATION "%s"
</span><span class="cx"> #define MEMORYPRESSURE_LOG(...) WTFLogAlways(__VA_ARGS__)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformMemoryPressureHandlerh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/MemoryPressureHandler.h (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/MemoryPressureHandler.h 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebCore/platform/MemoryPressureHandler.h 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> public:
</span><span class="cx"> explicit ReliefLogger(const char *log)
</span><span class="cx"> : m_logString(log)
</span><del>-#if !LOG_ALWAYS_DISABLED
</del><ins>+#if !RELEASE_LOG_DISABLED
</ins><span class="cx"> , m_initialMemory(platformMemoryUsage())
</span><span class="cx"> #else
</span><span class="cx"> , m_initialMemory(s_loggingEnabled ? platformMemoryUsage() : 0)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> ~ReliefLogger()
</span><span class="cx"> {
</span><del>-#if !LOG_ALWAYS_DISABLED
</del><ins>+#if !RELEASE_LOG_DISABLED
</ins><span class="cx"> logMemoryUsageChange();
</span><span class="cx"> #else
</span><span class="cx"> if (s_loggingEnabled)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformgraphicscocoaIOSurfacemm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> if (success)
</span><span class="cx"> m_totalBytes = IOSurfaceGetAllocSize(m_surface.get());
</span><span class="cx"> else
</span><del>- LOG_ALWAYS_ERROR(true, "Surface creation failed for size: (%d %d) and format: (%d)", size.width(), size.height(), format);
</del><ins>+ RELEASE_LOG_ERROR("Surface creation failed for size: (%d %d) and format: (%d)", size.width(), size.height(), format);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCore::IOSurface::IOSurface(IOSurfaceRef surface, CGColorSpaceRef colorSpace)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -1,3 +1,79 @@
</span><ins>+2016-10-24 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r204472. rdar://problem/28544885
+
+ 2016-08-15 Keith Rollin <krollin@apple.com>
+
+ Rename LOG_ALWAYS
+ https://bugs.webkit.org/show_bug.cgi?id=160768
+
+ Rename LOG_ALWAYS and friends, given that the first parameter to it is
+ a boolean expression that determines whether or not logging should be
+ performed.
+
+ Reviewed by Chris Dumez.
+
+ * NetworkProcess/Downloads/Download.cpp:
+ (WebKit::Download::didReceiveResponse):
+ (WebKit::Download::didReceiveData):
+ (WebKit::Download::didFinish):
+ (WebKit::Download::didFail):
+ (WebKit::Download::didCancel):
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::prepareToSuspend):
+ (WebKit::NetworkProcess::cancelPrepareToSuspend):
+ (WebKit::NetworkProcess::processDidResume):
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::startNetworkLoad):
+ (WebKit::NetworkResourceLoader::didFinishLoading):
+ (WebKit::NetworkResourceLoader::didFailLoading):
+ (WebKit::NetworkResourceLoader::continueWillSendRequest):
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::waitForSyncReply):
+ * Shared/ChildProcess.cpp:
+ (WebKit::didCloseOnConnectionWorkQueue):
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::didChangeIsLoading):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::fetchWebsiteData):
+ (WebKit::NetworkProcessProxy::deleteWebsiteData):
+ (WebKit::NetworkProcessProxy::deleteWebsiteDataForOrigins):
+ (WebKit::NetworkProcessProxy::setIsHoldingLockedFiles):
+ * UIProcess/ProcessThrottler.cpp:
+ (WebKit::ProcessThrottler::updateAssertionNow):
+ (WebKit::ProcessThrottler::updateAssertion):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::updateActivityToken):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::fetchWebsiteData):
+ (WebKit::WebProcessProxy::deleteWebsiteData):
+ (WebKit::WebProcessProxy::deleteWebsiteDataForOrigins):
+ (WebKit::WebProcessProxy::didSetAssertionState):
+ (WebKit::WebProcessProxy::setIsHoldingLockedFiles):
+ * UIProcess/ios/ProcessAssertionIOS.mm:
+ (-[WKProcessAssertionBackgroundTaskManager _updateBackgroundTask]):
+ (WebKit::ProcessAssertion::ProcessAssertion):
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::scheduleLoad):
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::willSendRequest):
+ (WebKit::WebResourceLoader::didReceiveResponse):
+ (WebKit::WebResourceLoader::didReceiveData):
+ (WebKit::WebResourceLoader::didFinishResourceLoad):
+ (WebKit::WebResourceLoader::didFailResourceLoad):
+ (WebKit::WebResourceLoader::didReceiveResource):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::layerVolatilityTimerFired):
+ (WebKit::WebPage::markLayersVolatile):
+ (WebKit::WebPage::cancelMarkLayersVolatile):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::actualPrepareToSuspend):
+ (WebKit::WebProcess::processWillSuspendImminently):
+ (WebKit::WebProcess::prepareToSuspend):
+ (WebKit::WebProcess::cancelPrepareToSuspend):
+ (WebKit::WebProcess::markAllLayersVolatile):
+ (WebKit::WebProcess::processDidResume):
+
</ins><span class="cx"> 2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r206771. rdar://problem/28811939
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2NetworkProcessDownloadsDownloadcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#define DOWNLOAD_LOG_ALWAYS(...) LOG_ALWAYS(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
-#define DOWNLOAD_LOG_ALWAYS_ERROR(...) LOG_ALWAYS_ERROR(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
+#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> void Download::didReceiveResponse(const ResourceResponse& response)
</span><span class="cx"> {
</span><del>- DOWNLOAD_LOG_ALWAYS("Download task (%llu) created", downloadID().downloadID());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Download task (%llu) created", downloadID().downloadID());
</ins><span class="cx">
</span><span class="cx"> send(Messages::DownloadProxy::DidReceiveResponse(response));
</span><span class="cx"> }
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> void Download::didReceiveData(uint64_t length)
</span><span class="cx"> {
</span><span class="cx"> if (!m_hasReceivedData) {
</span><del>- DOWNLOAD_LOG_ALWAYS("Download task (%llu) started receiving data", downloadID().downloadID());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Download task (%llu) started receiving data", downloadID().downloadID());
</ins><span class="cx"> m_hasReceivedData = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx">
</span><span class="cx"> void Download::didFinish()
</span><span class="cx"> {
</span><del>- DOWNLOAD_LOG_ALWAYS("Download task (%llu) finished", downloadID().downloadID());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Download task (%llu) finished", downloadID().downloadID());
</ins><span class="cx">
</span><span class="cx"> platformDidFinish();
</span><span class="cx">
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx">
</span><span class="cx"> void Download::didFail(const ResourceError& error, const IPC::DataReference& resumeData)
</span><span class="cx"> {
</span><del>- DOWNLOAD_LOG_ALWAYS("Download task (%llu) failed, isTimeout = %d, isCancellation = %d, errCode = %d",
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Download task (%llu) failed, isTimeout = %d, isCancellation = %d, errCode = %d",
</ins><span class="cx"> downloadID().downloadID(), error.isTimeout(), error.isCancellation(), error.errorCode());
</span><span class="cx">
</span><span class="cx"> send(Messages::DownloadProxy::DidFail(error, resumeData));
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx">
</span><span class="cx"> void Download::didCancel(const IPC::DataReference& resumeData)
</span><span class="cx"> {
</span><del>- DOWNLOAD_LOG_ALWAYS("Download task (%llu) canceled", downloadID().downloadID());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Download task (%llu) canceled", downloadID().downloadID());
</ins><span class="cx">
</span><span class="cx"> send(Messages::DownloadProxy::DidCancel(resumeData));
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -599,10 +599,10 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::prepareToSuspend()
</span><span class="cx"> {
</span><del>- LOG_ALWAYS(true, "%p - NetworkProcess::prepareToSuspend()", this);
</del><ins>+ RELEASE_LOG("%p - NetworkProcess::prepareToSuspend()", this);
</ins><span class="cx"> lowMemoryHandler(Critical::Yes);
</span><span class="cx">
</span><del>- LOG_ALWAYS(true, "%p - NetworkProcess::prepareToSuspend() Sending ProcessReadyToSuspend IPC message", this);
</del><ins>+ RELEASE_LOG("%p - NetworkProcess::prepareToSuspend() Sending ProcessReadyToSuspend IPC message", this);
</ins><span class="cx"> parentProcessConnection()->send(Messages::NetworkProcessProxy::ProcessReadyToSuspend(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -612,12 +612,12 @@
</span><span class="cx"> // we do not because prepareToSuspend() already replied with a NetworkProcessProxy::ProcessReadyToSuspend
</span><span class="cx"> // message. And NetworkProcessProxy expects to receive either a NetworkProcessProxy::ProcessReadyToSuspend-
</span><span class="cx"> // or NetworkProcessProxy::DidCancelProcessSuspension- message, but not both.
</span><del>- LOG_ALWAYS(true, "%p - NetworkProcess::cancelPrepareToSuspend()", this);
</del><ins>+ RELEASE_LOG("%p - NetworkProcess::cancelPrepareToSuspend()", this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::processDidResume()
</span><span class="cx"> {
</span><del>- LOG_ALWAYS(true, "%p - NetworkProcess::processDidResume()", this);
</del><ins>+ RELEASE_LOG("%p - NetworkProcess::processDidResume()", this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::prefetchDNS(const String& hostname)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -49,8 +49,8 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#define NETWORKRESOURCELOADER_LOG_ALWAYS(...) LOG_ALWAYS(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
-#define NETWORKRESOURCELOADER_LOG_ALWAYS_ERROR(...) LOG_ALWAYS_ERROR(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
+#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> m_bufferedDataForCache = SharedBuffer::create();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- NETWORKRESOURCELOADER_LOG_ALWAYS("Starting network resource load: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Starting network resource load: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous());
</ins><span class="cx">
</span><span class="cx"> NetworkLoadParameters parameters = m_parameters;
</span><span class="cx"> parameters.defersLoading = m_defersLoading;
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx">
</span><span class="cx"> auto NetworkResourceLoader::didReceiveResponse(ResourceResponse&& receivedResponse) -> ShouldContinueDidReceiveResponse
</span><span class="cx"> {
</span><del>- NETWORKRESOURCELOADER_LOG_ALWAYS("Received network resource response: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d, httpStatusCode = %d", this, m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous(), receivedResponse.httpStatusCode());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Received network resource response: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d, httpStatusCode = %d", this, m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous(), receivedResponse.httpStatusCode());
</ins><span class="cx">
</span><span class="cx"> m_response = WTFMove(receivedResponse);
</span><span class="cx">
</span><span class="lines">@@ -322,9 +322,9 @@
</span><span class="cx"> if (isSynchronous())
</span><span class="cx"> m_synchronousLoadData->response = m_response;
</span><span class="cx"> else {
</span><del>- NETWORKRESOURCELOADER_LOG_ALWAYS("Sending didReceiveResponse message to the WebContent process: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Sending didReceiveResponse message to the WebContent process: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</ins><span class="cx"> if (!sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponse(m_response, shouldWaitContinueDidReceiveResponse))) {
</span><del>- NETWORKRESOURCELOADER_LOG_ALWAYS_ERROR("Failed to send the didReceiveResponse IPC message to the WebContent process: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_ERROR_IF_ALLOWED("Failed to send the didReceiveResponse IPC message to the WebContent process: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</ins><span class="cx"> return ShouldContinueDidReceiveResponse::No;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -337,11 +337,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (shouldContinueDidReceiveResponse) {
</span><del>- NETWORKRESOURCELOADER_LOG_ALWAYS("Should wait for message from WebContent process before continuing resource load: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Should wait for message from WebContent process before continuing resource load: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</ins><span class="cx"> return ShouldContinueDidReceiveResponse::Yes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NETWORKRESOURCELOADER_LOG_ALWAYS("Should not wait for message from WebContent process before continuing resource load: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Should not wait for message from WebContent process before continuing resource load: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</ins><span class="cx"> return ShouldContinueDidReceiveResponse::No;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::didFinishLoading(double finishTime)
</span><span class="cx"> {
</span><del>- NETWORKRESOURCELOADER_LOG_ALWAYS("Finished loading network resource: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Finished loading network resource: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> if (m_cacheEntryForValidation) {
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::didFailLoading(const ResourceError& error)
</span><span class="cx"> {
</span><del>- NETWORKRESOURCELOADER_LOG_ALWAYS("Failed loading network resource: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d, isTimeout = %d, isCancellation = %d, errCode = %d", this, m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous(), error.isTimeout(), error.isCancellation(), error.errorCode());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Failed loading network resource: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d, isTimeout = %d, isCancellation = %d, errCode = %d", this, m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous(), error.isTimeout(), error.isCancellation(), error.errorCode());
</ins><span class="cx">
</span><span class="cx"> ASSERT(!error.isNull());
</span><span class="cx">
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::continueWillSendRequest(ResourceRequest&& newRequest)
</span><span class="cx"> {
</span><del>- NETWORKRESOURCELOADER_LOG_ALWAYS("Following redirect of network resource: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("Following redirect of network resource: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> if (m_isWaitingContinueWillSendRequestForCachedRedirect) {
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/Platform/IPC/Connection.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/Platform/IPC/Connection.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/Platform/IPC/Connection.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -34,8 +34,6 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> #include <wtf/threads/BinarySemaphore.h>
</span><span class="cx">
</span><del>-#define CONNECTION_LOG_ALWAYS_ERROR(...) LOG_ALWAYS_ERROR(true, __VA_ARGS__)
-
</del><span class="cx"> namespace IPC {
</span><span class="cx">
</span><span class="cx"> struct WaitForMessageState {
</span><span class="lines">@@ -585,7 +583,7 @@
</span><span class="cx"> // If that happens, we need to stop waiting, or we'll hang since we won't get
</span><span class="cx"> // any more incoming messages.
</span><span class="cx"> if (!isValid()) {
</span><del>- CONNECTION_LOG_ALWAYS_ERROR("Connection::waitForSyncReply: Connection no longer valid, id = %" PRIu64, syncRequestID);
</del><ins>+ RELEASE_LOG_ERROR("Connection::waitForSyncReply: Connection no longer valid, id = %" PRIu64, syncRequestID);
</ins><span class="cx"> didReceiveSyncReply(syncSendFlags);
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -596,7 +594,7 @@
</span><span class="cx"> timedOut = !SyncMessageState::singleton().wait(absoluteTime);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CONNECTION_LOG_ALWAYS_ERROR("Connection::waitForSyncReply: Timed-out while waiting for reply, id = %" PRIu64, syncRequestID);
</del><ins>+ RELEASE_LOG_ERROR("Connection::waitForSyncReply: Timed-out while waiting for reply, id = %" PRIu64, syncRequestID);
</ins><span class="cx"> didReceiveSyncReply(syncSendFlags);
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2SharedChildProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/Shared/ChildProcess.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/Shared/ChildProcess.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/Shared/ChildProcess.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #include "SandboxInitializationParameters.h"
</span><span class="cx"> #include <unistd.h>
</span><span class="cx">
</span><del>-#define CHILDPROCESS_LOG_ALWAYS_ERROR(...) LOG_ALWAYS_ERROR(true, __VA_ARGS__)
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> ChildProcess::ChildProcess()
</span><span class="lines">@@ -55,7 +53,7 @@
</span><span class="cx"> // We use _exit here since the watchdog callback is called from another thread and we don't want
</span><span class="cx"> // global destructors or atexit handlers to be called from this thread while the main thread is busy
</span><span class="cx"> // doing its thing.
</span><del>- CHILDPROCESS_LOG_ALWAYS_ERROR("Exiting process early due to unacknowledged closed-connection");
</del><ins>+ RELEASE_LOG_ERROR("Exiting process early due to unacknowledged closed-connection");
</ins><span class="cx"> _exit(EXIT_FAILURE);
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -823,10 +823,10 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (m_webView->_page->pageLoadState().isLoading()) {
</span><del>- LOG_ALWAYS(m_webView->_page->isAlwaysOnLoggingAllowed(), "UIProcess is taking a background assertion because a page load started");
</del><ins>+ RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), "UIProcess is taking a background assertion because a page load started");
</ins><span class="cx"> m_activityToken = m_webView->_page->process().throttler().backgroundActivityToken();
</span><span class="cx"> } else {
</span><del>- LOG_ALWAYS(m_webView->_page->isAlwaysOnLoggingAllowed(), "UIProcess is releasing a background assertion because a page load completed");
</del><ins>+ RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), "UIProcess is releasing a background assertion because a page load completed");
</ins><span class="cx"> m_activityToken = nullptr;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -126,11 +126,11 @@
</span><span class="cx">
</span><span class="cx"> uint64_t callbackID = generateCallbackID();
</span><span class="cx"> auto token = throttler().backgroundActivityToken();
</span><del>- LOG_ALWAYS(sessionID.isAlwaysOnLoggingAllowed(), "%p - NetworkProcessProxy is taking a background assertion because the Network process is fetching Website data", this);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - NetworkProcessProxy is taking a background assertion because the Network process is fetching Website data", this);
</ins><span class="cx">
</span><span class="cx"> m_pendingFetchWebsiteDataCallbacks.add(callbackID, [this, token, completionHandler, sessionID](WebsiteData websiteData) {
</span><span class="cx"> completionHandler(WTFMove(websiteData));
</span><del>- LOG_ALWAYS(sessionID.isAlwaysOnLoggingAllowed(), "%p - NetworkProcessProxy is releasing a background assertion because the Network process is done fetching Website data", this);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - NetworkProcessProxy is releasing a background assertion because the Network process is done fetching Website data", this);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> send(Messages::NetworkProcess::FetchWebsiteData(sessionID, dataTypes, fetchOptions, callbackID), 0);
</span><span class="lines">@@ -140,11 +140,11 @@
</span><span class="cx"> {
</span><span class="cx"> auto callbackID = generateCallbackID();
</span><span class="cx"> auto token = throttler().backgroundActivityToken();
</span><del>- LOG_ALWAYS(sessionID.isAlwaysOnLoggingAllowed(), "%p - NetworkProcessProxy is taking a background assertion because the Network process is deleting Website data", this);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - NetworkProcessProxy is taking a background assertion because the Network process is deleting Website data", this);
</ins><span class="cx">
</span><span class="cx"> m_pendingDeleteWebsiteDataCallbacks.add(callbackID, [this, token, completionHandler, sessionID] {
</span><span class="cx"> completionHandler();
</span><del>- LOG_ALWAYS(sessionID.isAlwaysOnLoggingAllowed(), "%p - NetworkProcessProxy is releasing a background assertion because the Network process is done deleting Website data", this);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - NetworkProcessProxy is releasing a background assertion because the Network process is done deleting Website data", this);
</ins><span class="cx"> });
</span><span class="cx"> send(Messages::NetworkProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -155,11 +155,11 @@
</span><span class="cx">
</span><span class="cx"> uint64_t callbackID = generateCallbackID();
</span><span class="cx"> auto token = throttler().backgroundActivityToken();
</span><del>- LOG_ALWAYS(sessionID.isAlwaysOnLoggingAllowed(), "%p - NetworkProcessProxy is taking a background assertion because the Network process is deleting Website data for several origins", this);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - NetworkProcessProxy is taking a background assertion because the Network process is deleting Website data for several origins", this);
</ins><span class="cx">
</span><span class="cx"> m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, [this, token, completionHandler, sessionID] {
</span><span class="cx"> completionHandler();
</span><del>- LOG_ALWAYS(sessionID.isAlwaysOnLoggingAllowed(), "%p - NetworkProcessProxy is releasing a background assertion because the Network process is done deleting Website data for several origins", this);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - NetworkProcessProxy is releasing a background assertion because the Network process is done deleting Website data for several origins", this);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> Vector<SecurityOriginData> originData;
</span><span class="lines">@@ -400,12 +400,12 @@
</span><span class="cx"> void NetworkProcessProxy::setIsHoldingLockedFiles(bool isHoldingLockedFiles)
</span><span class="cx"> {
</span><span class="cx"> if (!isHoldingLockedFiles) {
</span><del>- LOG_ALWAYS(true, "UIProcess is releasing a background assertion because the Network process is no longer holding locked files");
</del><ins>+ RELEASE_LOG("UIProcess is releasing a background assertion because the Network process is no longer holding locked files");
</ins><span class="cx"> m_tokenForHoldingLockedFiles = nullptr;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (!m_tokenForHoldingLockedFiles) {
</span><del>- LOG_ALWAYS(true, "UIProcess is taking a background assertion because the Network process is holding locked files");
</del><ins>+ RELEASE_LOG("UIProcess is taking a background assertion because the Network process is holding locked files");
</ins><span class="cx"> m_tokenForHoldingLockedFiles = m_throttler.backgroundActivityToken();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessProcessThrottlercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ProcessThrottler.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> m_suspendTimer.stop();
</span><span class="cx"> if (m_assertion) {
</span><span class="cx"> if (m_assertion->state() != assertionState())
</span><del>- LOG_ALWAYS(true, "%p - ProcessThrottler::updateAssertionNow() updating process assertion state to %u (foregroundActivities: %lu, backgroundActivities: %lu)", this, assertionState(), m_foregroundCounter.value(), m_backgroundCounter.value());
</del><ins>+ RELEASE_LOG("%p - ProcessThrottler::updateAssertionNow() updating process assertion state to %u (foregroundActivities: %lu, backgroundActivities: %lu)", this, assertionState(), m_foregroundCounter.value(), m_backgroundCounter.value());
</ins><span class="cx"> m_assertion->setState(assertionState());
</span><span class="cx"> m_process.didSetAssertionState(assertionState());
</span><span class="cx"> }
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> // in the background for too long.
</span><span class="cx"> if (m_assertion && m_assertion->state() != AssertionState::Suspended && !m_foregroundCounter.value() && !m_backgroundCounter.value()) {
</span><span class="cx"> ++m_suspendMessageCount;
</span><del>- LOG_ALWAYS(true, "%p - ProcessThrottler::updateAssertion() sending PrepareToSuspend IPC", this);
</del><ins>+ RELEASE_LOG("%p - ProcessThrottler::updateAssertion() sending PrepareToSuspend IPC", this);
</ins><span class="cx"> m_process.sendPrepareToSuspend();
</span><span class="cx"> m_suspendTimer.startOneShot(processSuspensionTimeout);
</span><span class="cx"> m_assertion->setState(AssertionState::Background);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> #define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, m_process->connection())
</span><span class="cx"> #define MESSAGE_CHECK_URL(url) MESSAGE_CHECK_BASE(m_process->checkURLReceivedFromWebProcess(url), m_process->connection())
</span><span class="cx">
</span><del>-#define WEBPAGEPROXY_LOG_ALWAYS(...) LOG_ALWAYS(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -1580,14 +1580,14 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (!isViewVisible() && !m_alwaysRunsAtForegroundPriority) {
</span><span class="cx"> if (m_activityToken) {
</span><del>- WEBPAGEPROXY_LOG_ALWAYS("%p - UIProcess is releasing a foreground assertion because the view is no longer visible", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("%p - UIProcess is releasing a foreground assertion because the view is no longer visible", this);
</ins><span class="cx"> m_activityToken = nullptr;
</span><span class="cx"> }
</span><span class="cx"> } else if (!m_activityToken) {
</span><span class="cx"> if (isViewVisible())
</span><del>- WEBPAGEPROXY_LOG_ALWAYS("%p - UIProcess is taking a foreground assertion because the view is visible", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("%p - UIProcess is taking a foreground assertion because the view is visible", this);
</ins><span class="cx"> else
</span><del>- WEBPAGEPROXY_LOG_ALWAYS("%p - UIProcess is taking a foreground assertion even though the view is not visible because m_alwaysRunsAtForegroundPriority is true", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("%p - UIProcess is taking a foreground assertion even though the view is not visible because m_alwaysRunsAtForegroundPriority is true", this);
</ins><span class="cx"> m_activityToken = m_process->throttler().foregroundActivityToken();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -753,11 +753,11 @@
</span><span class="cx">
</span><span class="cx"> uint64_t callbackID = generateCallbackID();
</span><span class="cx"> auto token = throttler().backgroundActivityToken();
</span><del>- LOG_ALWAYS(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is taking a background assertion because the Web process is fetching Website data", this);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is taking a background assertion because the Web process is fetching Website data", this);
</ins><span class="cx">
</span><span class="cx"> m_pendingFetchWebsiteDataCallbacks.add(callbackID, [this, token, completionHandler, sessionID](WebsiteData websiteData) {
</span><span class="cx"> completionHandler(WTFMove(websiteData));
</span><del>- LOG_ALWAYS(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is releasing a background assertion because the Web process is done fetching Website data", this);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is releasing a background assertion because the Web process is done fetching Website data", this);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> send(Messages::WebProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);
</span><span class="lines">@@ -769,11 +769,11 @@
</span><span class="cx">
</span><span class="cx"> uint64_t callbackID = generateCallbackID();
</span><span class="cx"> auto token = throttler().backgroundActivityToken();
</span><del>- LOG_ALWAYS(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is taking a background assertion because the Web process is deleting Website data", this);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is taking a background assertion because the Web process is deleting Website data", this);
</ins><span class="cx">
</span><span class="cx"> m_pendingDeleteWebsiteDataCallbacks.add(callbackID, [this, token, completionHandler, sessionID] {
</span><span class="cx"> completionHandler();
</span><del>- LOG_ALWAYS(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is releasing a background assertion because the Web process is done deleting Website data", this);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is releasing a background assertion because the Web process is done deleting Website data", this);
</ins><span class="cx"> });
</span><span class="cx"> send(Messages::WebProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -784,11 +784,11 @@
</span><span class="cx">
</span><span class="cx"> uint64_t callbackID = generateCallbackID();
</span><span class="cx"> auto token = throttler().backgroundActivityToken();
</span><del>- LOG_ALWAYS(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is taking a background assertion because the Web process is deleting Website data for several origins", this);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is taking a background assertion because the Web process is deleting Website data for several origins", this);
</ins><span class="cx">
</span><span class="cx"> m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, [this, token, completionHandler, sessionID] {
</span><span class="cx"> completionHandler();
</span><del>- LOG_ALWAYS(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is releasing a background assertion because the Web process is done deleting Website data for several origins", this);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is releasing a background assertion because the Web process is done deleting Website data for several origins", this);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> Vector<SecurityOriginData> originData;
</span><span class="lines">@@ -991,7 +991,7 @@
</span><span class="cx">
</span><span class="cx"> switch (state) {
</span><span class="cx"> case AssertionState::Suspended:
</span><del>- LOG_ALWAYS(true, "%p - WebProcessProxy::didSetAssertionState(Suspended) release all assertions for network process", this);
</del><ins>+ RELEASE_LOG("%p - WebProcessProxy::didSetAssertionState(Suspended) release all assertions for network process", this);
</ins><span class="cx"> m_foregroundTokenForNetworkProcess = nullptr;
</span><span class="cx"> m_backgroundTokenForNetworkProcess = nullptr;
</span><span class="cx"> for (auto& page : m_pageMap.values())
</span><span class="lines">@@ -999,13 +999,13 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case AssertionState::Background:
</span><del>- LOG_ALWAYS(true, "%p - WebProcessProxy::didSetAssertionState(Background) taking background assertion for network process", this);
</del><ins>+ RELEASE_LOG("%p - WebProcessProxy::didSetAssertionState(Background) taking background assertion for network process", this);
</ins><span class="cx"> m_backgroundTokenForNetworkProcess = processPool().ensureNetworkProcess().throttler().backgroundActivityToken();
</span><span class="cx"> m_foregroundTokenForNetworkProcess = nullptr;
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case AssertionState::Foreground:
</span><del>- LOG_ALWAYS(true, "%p - WebProcessProxy::didSetAssertionState(Foreground) taking foreground assertion for network process", this);
</del><ins>+ RELEASE_LOG("%p - WebProcessProxy::didSetAssertionState(Foreground) taking foreground assertion for network process", this);
</ins><span class="cx"> m_foregroundTokenForNetworkProcess = processPool().ensureNetworkProcess().throttler().foregroundActivityToken();
</span><span class="cx"> m_backgroundTokenForNetworkProcess = nullptr;
</span><span class="cx"> for (auto& page : m_pageMap.values())
</span><span class="lines">@@ -1022,12 +1022,12 @@
</span><span class="cx"> void WebProcessProxy::setIsHoldingLockedFiles(bool isHoldingLockedFiles)
</span><span class="cx"> {
</span><span class="cx"> if (!isHoldingLockedFiles) {
</span><del>- LOG_ALWAYS(true, "UIProcess is releasing a background assertion because the WebContent process is no longer holding locked files");
</del><ins>+ RELEASE_LOG("UIProcess is releasing a background assertion because the WebContent process is no longer holding locked files");
</ins><span class="cx"> m_tokenForHoldingLockedFiles = nullptr;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (!m_tokenForHoldingLockedFiles) {
</span><del>- LOG_ALWAYS(true, "UIProcess is taking a background assertion because the WebContent process is holding locked files");
</del><ins>+ RELEASE_LOG("UIProcess is taking a background assertion because the WebContent process is holding locked files");
</ins><span class="cx"> m_tokenForHoldingLockedFiles = m_throttler.backgroundActivityToken();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessiosProcessAssertionIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (_needsToRunInBackgroundCount && _backgroundTask == UIBackgroundTaskInvalid) {
</span><span class="cx"> _backgroundTask = [[UIApplication sharedApplication] beginBackgroundTaskWithName:@"com.apple.WebKit.ProcessAssertion" expirationHandler:^{
</span><del>- LOG_ALWAYS_ERROR(true, "Background task expired while holding WebKit ProcessAssertion (isMainThread? %d).", RunLoop::isMain());
</del><ins>+ RELEASE_LOG_ERROR("Background task expired while holding WebKit ProcessAssertion (isMainThread? %d).", RunLoop::isMain());
</ins><span class="cx"> // The expiration handler gets called on a non-main thread when the underlying assertion could not be taken (rdar://problem/27278419).
</span><span class="cx"> if (RunLoop::isMain())
</span><span class="cx"> [self _notifyClientsOfImminentSuspension];
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> auto weakThis = createWeakPtr();
</span><span class="cx"> BKSProcessAssertionAcquisitionHandler handler = ^(BOOL acquired) {
</span><span class="cx"> if (!acquired) {
</span><del>- LOG_ALWAYS_ERROR(true, "Unable to acquire assertion for process %d", pid);
</del><ins>+ RELEASE_LOG_ERROR("Unable to acquire assertion for process %d", pid);
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> if (weakThis)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#define WEBLOADERSTRATEGY_LOG_ALWAYS(...) LOG_ALWAYS(loadParameters.sessionID.isAlwaysOnLoggingAllowed(), __VA_ARGS__)
-#define WEBLOADERSTRATEGY_LOG_ALWAYS_ERROR(...) LOG_ALWAYS_ERROR(loadParameters.sessionID.isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(loadParameters.sessionID.isAlwaysOnLoggingAllowed(), __VA_ARGS__)
+#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(loadParameters.sessionID.isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == DoNotAskClientForAnyCredentials);
</span><span class="cx">
</span><span class="cx"> if (!WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) {
</span><del>- WEBLOADERSTRATEGY_LOG_ALWAYS_ERROR("WebLoaderStrategy::scheduleLoad: Unable to schedule resource with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu", static_cast<int>(resourceLoader.request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID));
</del><ins>+ RELEASE_LOG_ERROR_IF_ALLOWED("WebLoaderStrategy::scheduleLoad: Unable to schedule resource with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu", static_cast<int>(resourceLoader.request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID));
</ins><span class="cx"> // We probably failed to schedule this load with the NetworkProcess because it had crashed.
</span><span class="cx"> // This load will never succeed so we will schedule it to fail asynchronously.
</span><span class="cx"> scheduleInternallyFailedLoad(resourceLoader);
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto webResourceLoader = WebResourceLoader::create(resourceLoader);
</span><del>- WEBLOADERSTRATEGY_LOG_ALWAYS("WebLoaderStrategy::scheduleLoad: Resource will be scheduled with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu, WebResourceLoader = %p", static_cast<int>(resourceLoader.request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID), webResourceLoader.ptr());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("WebLoaderStrategy::scheduleLoad: Resource will be scheduled with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu, WebResourceLoader = %p", static_cast<int>(resourceLoader.request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID), webResourceLoader.ptr());
</ins><span class="cx"> m_webResourceLoaders.set(identifier, WTFMove(webResourceLoader));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#define WEBRESOURCELOADER_LOG_ALWAYS(...) LOG_ALWAYS(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> void WebResourceLoader::willSendRequest(ResourceRequest&& proposedRequest, ResourceResponse&& redirectResponse)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::willSendRequest to '%s'", proposedRequest.url().string().latin1().data());
</span><del>- WEBRESOURCELOADER_LOG_ALWAYS("WebResourceLoader::willSendRequest, WebResourceLoader = %p", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("WebResourceLoader::willSendRequest, WebResourceLoader = %p", this);
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebResourceLoader> protectedThis(this);
</span><span class="cx">
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> void WebResourceLoader::didReceiveResponse(const ResourceResponse& response, bool needsContinueDidReceiveResponseMessage)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didReceiveResponse for '%s'. Status %d.", m_coreLoader->url().string().latin1().data(), response.httpStatusCode());
</span><del>- WEBRESOURCELOADER_LOG_ALWAYS("WebResourceLoader::didReceiveResponse, WebResourceLoader = %p, status = %d.", this, response.httpStatusCode());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("WebResourceLoader::didReceiveResponse, WebResourceLoader = %p, status = %d.", this, response.httpStatusCode());
</ins><span class="cx">
</span><span class="cx"> Ref<WebResourceLoader> protect(*this);
</span><span class="cx">
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didReceiveData of size %lu for '%s'", data.size(), m_coreLoader->url().string().latin1().data());
</span><span class="cx">
</span><span class="cx"> if (!m_hasReceivedData) {
</span><del>- WEBRESOURCELOADER_LOG_ALWAYS("WebResourceLoader::didReceiveData, WebResourceLoader = %p, size = %lu", this, data.size());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("WebResourceLoader::didReceiveData, WebResourceLoader = %p, size = %lu", this, data.size());
</ins><span class="cx"> m_hasReceivedData = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> void WebResourceLoader::didFinishResourceLoad(double finishTime)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didFinishResourceLoad for '%s'", m_coreLoader->url().string().latin1().data());
</span><del>- WEBRESOURCELOADER_LOG_ALWAYS("WebResourceLoader::didFinishResourceLoad, WebResourceLoader = %p", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("WebResourceLoader::didFinishResourceLoad, WebResourceLoader = %p", this);
</ins><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> if (QuickLookHandle* quickLookHandle = m_coreLoader->documentLoader()->quickLookHandle()) {
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> void WebResourceLoader::didFailResourceLoad(const ResourceError& error)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didFailResourceLoad for '%s'", m_coreLoader->url().string().latin1().data());
</span><del>- WEBRESOURCELOADER_LOG_ALWAYS("WebResourceLoader::didFailResourceLoad, WebResourceLoader = %p", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("WebResourceLoader::didFailResourceLoad, WebResourceLoader = %p", this);
</ins><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> if (QuickLookHandle* quickLookHandle = m_coreLoader->documentLoader()->quickLookHandle())
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> void WebResourceLoader::didReceiveResource(const ShareableResource::Handle& handle, double finishTime)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didReceiveResource for '%s'", m_coreLoader->url().string().latin1().data());
</span><del>- WEBRESOURCELOADER_LOG_ALWAYS("WebResourceLoader::didReceiveResource, WebResourceLoader = %p", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("WebResourceLoader::didReceiveResource, WebResourceLoader = %p", this);
</ins><span class="cx">
</span><span class="cx"> RefPtr<SharedBuffer> buffer = handle.tryWrapInSharedBuffer();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -254,8 +254,8 @@
</span><span class="cx"> static const std::chrono::milliseconds initialLayerVolatilityTimerInterval { 20 };
</span><span class="cx"> static const std::chrono::seconds maximumLayerVolatilityTimerInterval { 2 };
</span><span class="cx">
</span><del>-#define WEBPAGE_LOG_ALWAYS(...) LOG_ALWAYS(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
-#define WEBPAGE_LOG_ALWAYS_ERROR(...) LOG_ALWAYS_ERROR(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
+#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> class SendStopResponsivenessTimer {
</span><span class="cx"> public:
</span><span class="lines">@@ -2085,12 +2085,12 @@
</span><span class="cx"> bool didSucceed = markLayersVolatileImmediatelyIfPossible();
</span><span class="cx"> if (didSucceed || newInterval > maximumLayerVolatilityTimerInterval) {
</span><span class="cx"> m_layerVolatilityTimer.stop();
</span><del>- WEBPAGE_LOG_ALWAYS("%p - WebPage - Attempted to mark surfaces as volatile, success? %d", this, didSucceed);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("%p - WebPage - Attempted to mark surfaces as volatile, success? %d", this, didSucceed);
</ins><span class="cx"> callVolatilityCompletionHandlers();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WEBPAGE_LOG_ALWAYS_ERROR("%p - WebPage - Failed to mark all layers as volatile, will retry in %lld ms", this, static_cast<long long>(newInterval.count()));
</del><ins>+ RELEASE_LOG_ERROR_IF_ALLOWED("%p - WebPage - Failed to mark all layers as volatile, will retry in %lld ms", this, static_cast<long long>(newInterval.count()));
</ins><span class="cx"> m_layerVolatilityTimer.startRepeating(newInterval);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2101,7 +2101,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::markLayersVolatile(std::function<void ()> completionHandler)
</span><span class="cx"> {
</span><del>- WEBPAGE_LOG_ALWAYS("%p - WebPage::markLayersVolatile()", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("%p - WebPage::markLayersVolatile()", this);
</ins><span class="cx">
</span><span class="cx"> if (m_layerVolatilityTimer.isActive())
</span><span class="cx"> m_layerVolatilityTimer.stop();
</span><span class="lines">@@ -2112,22 +2112,22 @@
</span><span class="cx"> bool didSucceed = markLayersVolatileImmediatelyIfPossible();
</span><span class="cx"> if (didSucceed || m_isSuspendedUnderLock) {
</span><span class="cx"> if (didSucceed)
</span><del>- WEBPAGE_LOG_ALWAYS("%p - WebPage - Successfully marked layers as volatile", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("%p - WebPage - Successfully marked layers as volatile", this);
</ins><span class="cx"> else {
</span><span class="cx"> // If we get suspended when locking the screen, it is expected that some IOSurfaces cannot be marked as purgeable so we do not keep retrying.
</span><del>- WEBPAGE_LOG_ALWAYS("%p - WebPage - Did what we could to mark IOSurfaces as purgeable after locking the screen", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("%p - WebPage - Did what we could to mark IOSurfaces as purgeable after locking the screen", this);
</ins><span class="cx"> }
</span><span class="cx"> callVolatilityCompletionHandlers();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WEBPAGE_LOG_ALWAYS("%p - Failed to mark all layers as volatile, will retry in %lld ms", this, initialLayerVolatilityTimerInterval.count());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("%p - Failed to mark all layers as volatile, will retry in %lld ms", this, initialLayerVolatilityTimerInterval.count());
</ins><span class="cx"> m_layerVolatilityTimer.startRepeating(initialLayerVolatilityTimerInterval);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::cancelMarkLayersVolatile()
</span><span class="cx"> {
</span><del>- WEBPAGE_LOG_ALWAYS("%p - WebPage::cancelMarkLayersVolatile()", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("%p - WebPage::cancelMarkLayersVolatile()", this);
</ins><span class="cx"> m_layerVolatilityTimer.stop();
</span><span class="cx"> m_markLayersAsVolatileCompletionHandlers.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebProcess.cpp (207800 => 207801)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2016-10-25 03:23:02 UTC (rev 207800)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2016-10-25 03:23:10 UTC (rev 207801)
</span><span class="lines">@@ -142,8 +142,6 @@
</span><span class="cx"> // This should be greater than tileRevalidationTimeout in TileController.
</span><span class="cx"> static const double nonVisibleProcessCleanupDelay = 10;
</span><span class="cx">
</span><del>-#define WEBPROCESS_LOG_ALWAYS(...) LOG_ALWAYS(true, __VA_ARGS__)
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> WebProcess& WebProcess::singleton()
</span><span class="lines">@@ -1242,10 +1240,10 @@
</span><span class="cx"> setAllLayerTreeStatesFrozen(true);
</span><span class="cx">
</span><span class="cx"> markAllLayersVolatile([this, shouldAcknowledgeWhenReadyToSuspend] {
</span><del>- WEBPROCESS_LOG_ALWAYS("%p - WebProcess::markAllLayersVolatile() Successfuly marked all layers as volatile", this);
</del><ins>+ RELEASE_LOG("%p - WebProcess::markAllLayersVolatile() Successfuly marked all layers as volatile", this);
</ins><span class="cx">
</span><span class="cx"> if (shouldAcknowledgeWhenReadyToSuspend == ShouldAcknowledgeWhenReadyToSuspend::Yes) {
</span><del>- WEBPROCESS_LOG_ALWAYS("%p - WebProcess::actualPrepareToSuspend() Sending ProcessReadyToSuspend IPC message", this);
</del><ins>+ RELEASE_LOG("%p - WebProcess::actualPrepareToSuspend() Sending ProcessReadyToSuspend IPC message", this);
</ins><span class="cx"> parentProcessConnection()->send(Messages::WebProcessProxy::ProcessReadyToSuspend(), 0);
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -1261,7 +1259,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WEBPROCESS_LOG_ALWAYS("%p - WebProcess::processWillSuspendImminently()", this);
</del><ins>+ RELEASE_LOG("%p - WebProcess::processWillSuspendImminently()", this);
</ins><span class="cx"> DatabaseTracker::tracker().closeAllDatabases(CurrentQueryBehavior::Interrupt);
</span><span class="cx"> actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend::No);
</span><span class="cx"> handled = true;
</span><span class="lines">@@ -1269,13 +1267,13 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::prepareToSuspend()
</span><span class="cx"> {
</span><del>- WEBPROCESS_LOG_ALWAYS("%p - WebProcess::prepareToSuspend()", this);
</del><ins>+ RELEASE_LOG("%p - WebProcess::prepareToSuspend()", this);
</ins><span class="cx"> actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend::Yes);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::cancelPrepareToSuspend()
</span><span class="cx"> {
</span><del>- WEBPROCESS_LOG_ALWAYS("%p - WebProcess::cancelPrepareToSuspend()", this);
</del><ins>+ RELEASE_LOG("%p - WebProcess::cancelPrepareToSuspend()", this);
</ins><span class="cx"> setAllLayerTreeStatesFrozen(false);
</span><span class="cx">
</span><span class="cx"> // If we've already finished cleaning up and sent ProcessReadyToSuspend, we
</span><span class="lines">@@ -1285,13 +1283,13 @@
</span><span class="cx">
</span><span class="cx"> cancelMarkAllLayersVolatile();
</span><span class="cx">
</span><del>- WEBPROCESS_LOG_ALWAYS("%p - WebProcess::cancelPrepareToSuspend() Sending DidCancelProcessSuspension IPC message", this);
</del><ins>+ RELEASE_LOG("%p - WebProcess::cancelPrepareToSuspend() Sending DidCancelProcessSuspension IPC message", this);
</ins><span class="cx"> parentProcessConnection()->send(Messages::WebProcessProxy::DidCancelProcessSuspension(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::markAllLayersVolatile(std::function<void()> completionHandler)
</span><span class="cx"> {
</span><del>- WEBPROCESS_LOG_ALWAYS("%p - WebProcess::markAllLayersVolatile()", this);
</del><ins>+ RELEASE_LOG("%p - WebProcess::markAllLayersVolatile()", this);
</ins><span class="cx"> m_pagesMarkingLayersAsVolatile = m_pageMap.size();
</span><span class="cx"> if (!m_pagesMarkingLayersAsVolatile) {
</span><span class="cx"> completionHandler();
</span><span class="lines">@@ -1324,7 +1322,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::processDidResume()
</span><span class="cx"> {
</span><del>- WEBPROCESS_LOG_ALWAYS("%p - WebProcess::processDidResume()", this);
</del><ins>+ RELEASE_LOG("%p - WebProcess::processDidResume()", this);
</ins><span class="cx">
</span><span class="cx"> cancelMarkAllLayersVolatile();
</span><span class="cx"> setAllLayerTreeStatesFrozen(false);
</span></span></pre>
</div>
</div>
</body>
</html>