<!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>[205275] trunk/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/205275">205275</a></dd>
<dt>Author</dt> <dd>krollin@apple.com</dd>
<dt>Date</dt> <dd>2016-08-31 18:33:40 -0700 (Wed, 31 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit should set a subsystem for os_log so it's easier to filter for WebKit log messages
https://bugs.webkit.org/show_bug.cgi?id=160969
<rdar://problem/26068734>
Reviewed by Simon Fraser.
Source/WebCore:
- Specify a channel when using RELEASE_LOG macros
- Add a new channel so that we have something to pass to the
RELEASE_LOG macros (Layers).
- Enable subsystem- and channel-related data and functions when using
RELEASE_LOG macros.
- Use the DECLARE_LOG_CHANNEL, DEFINE_LOG_CHANNEL, and
LOG_CHANNEL_ADDRESS macros that are now defined in WTF.
No new tests. There are no tests for logging.
* loader/FrameLoader.cpp:
* platform/LogInitialization.h:
* platform/LogMacros.h:
* platform/Logging.cpp:
* platform/Logging.h:
* platform/MemoryPressureHandler.cpp:
(WebCore::MemoryPressureHandler::ReliefLogger::logMemoryUsageChange):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::drawNativeImage):
* platform/graphics/cocoa/IOSurface.mm:
(WebCore::IOSurface::IOSurface):
* platform/mac/LoggingMac.mm:
* platform/unix/LoggingUnix.cpp:
* platform/win/LoggingWin.cpp:
* testing/js/WebCoreTestSupport.cpp:
(WebCoreTestSupport::initializeLogChannelsIfNecessary):
Source/WebKit/mac:
Enable subsystem- and channel-related data and functions when using
RELEASE_LOG macros. Use the DECLARE_LOG_CHANNEL, DEFINE_LOG_CHANNEL,
and LOG_CHANNEL_ADDRESS macros that are now defined in WTF.
* Misc/WebKitLogging.h:
* Misc/WebKitLogging.m:
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
Source/WebKit/win:
Enable subsystem- and channel-related data and functions when using
RELEASE_LOG macros. Use the DECLARE_LOG_CHANNEL, DEFINE_LOG_CHANNEL,
and LOG_CHANNEL_ADDRESS macros that are now defined in WTF.
* WebKitLogging.cpp:
* WebKitLogging.h:
* WebView.cpp:
(WebView::initWithFrame):
Source/WebKit2:
- Specify a channel when using RELEASE_LOG macros.
- Add some new channels so that we have something to pass to the
RELEASE_LOG macros (ProcessSuspension, IPC, Layers).
- Enable subsystem- and channel-related data and functions when using
RELEASE_LOG macros.
- Use the DECLARE_LOG_CHANNEL, DEFINE_LOG_CHANNEL, and
LOG_CHANNEL_ADDRESS macros that are now defined in WTF.
* NetworkProcess/Downloads/Download.cpp:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::prepareToSuspend):
(WebKit::NetworkProcess::cancelPrepareToSuspend):
(WebKit::NetworkProcess::processDidResume):
* NetworkProcess/NetworkResourceLoader.cpp:
* Platform/IPC/Connection.cpp:
(IPC::Connection::waitForSyncReply):
* Platform/LogInitialization.h:
* Platform/Logging.cpp:
(WebKit::initializeLogChannelsIfNecessary):
* Platform/Logging.h:
* Platform/foundation/LoggingFoundation.mm:
* Platform/unix/LoggingUnix.cpp:
* Shared/ChildProcess.cpp:
(WebKit::didCloseOnConnectionWorkQueue):
* Shared/WebKit2Initialize.cpp:
(WebKit::InitializeWebKit2):
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::releaseNetworkActivityToken):
(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:
* UIProcess/WebProcessPool.cpp:
(WebKit::m_hiddenPageThrottlingTimer):
* 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:
* WebProcess/Network/WebResourceLoader.cpp:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::layerVolatilityTimerFired):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::actualPrepareToSuspend):
(WebKit::WebProcess::processWillSuspendImminently):
(WebKit::WebProcess::prepareToSuspend):
(WebKit::WebProcess::cancelPrepareToSuspend):
(WebKit::WebProcess::markAllLayersVolatile):
(WebKit::WebProcess::processDidResume):
Source/WTF:
Add support for attaching a subsystem and category when logging via
the RELEASE_LOG macros. This support is provided by adding subsystem
and category information to WTFLogChannel. An os_log_t object is then
created to enacpsulate that information. When using RELEASE_LOG to log
through that channel, the associated log object is used when calling
os_log.
To help support the inclusion of the subsystem and category
information in WTFLogChannel, the DECLARE_LOG_CHANNEL,
DEFINE_LOG_CHANNEL, and LOG_CHANNEL_ADDRESS macros that were defined
in various modules are consolidated and moved to Assertions.h.
DEFINE_LOG_CHANNEL is now defined to initialize the subsystem and
category.
* wtf/Assertions.cpp:
* wtf/Assertions.h:
* wtf/RefCountedLeakCounter.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAssertionscpp">trunk/Source/WTF/wtf/Assertions.cpp</a></li>
<li><a href="#trunkSourceWTFwtfAssertionsh">trunk/Source/WTF/wtf/Assertions.h</a></li>
<li><a href="#trunkSourceWTFwtfRefCountedLeakCountercpp">trunk/Source/WTF/wtf/RefCountedLeakCounter.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLogInitializationh">trunk/Source/WebCore/platform/LogInitialization.h</a></li>
<li><a href="#trunkSourceWebCoreplatformLogMacrosh">trunk/Source/WebCore/platform/LogMacros.h</a></li>
<li><a href="#trunkSourceWebCoreplatformLoggingcpp">trunk/Source/WebCore/platform/Logging.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLoggingh">trunk/Source/WebCore/platform/Logging.h</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlercpp">trunk/Source/WebCore/platform/MemoryPressureHandler.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm">trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacLoggingMacmm">trunk/Source/WebCore/platform/mac/LoggingMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformunixLoggingUnixcpp">trunk/Source/WebCore/platform/unix/LoggingUnix.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinLoggingWincpp">trunk/Source/WebCore/platform/win/LoggingWin.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingjsWebCoreTestSupportcpp">trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitLoggingh">trunk/Source/WebKit/mac/Misc/WebKitLogging.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitLoggingm">trunk/Source/WebKit/mac/Misc/WebKitLogging.m</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebKitLoggingcpp">trunk/Source/WebKit/win/WebKitLogging.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebKitLoggingh">trunk/Source/WebKit/win/WebKitLogging.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformLogInitializationh">trunk/Source/WebKit2/Platform/LogInitialization.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformLoggingcpp">trunk/Source/WebKit2/Platform/Logging.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformLoggingh">trunk/Source/WebKit2/Platform/Logging.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformfoundationLoggingFoundationmm">trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformunixLoggingUnixcpp">trunk/Source/WebKit2/Platform/unix/LoggingUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedChildProcesscpp">trunk/Source/WebKit2/Shared/ChildProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebKit2Initializecpp">trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlercpp">trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosProcessAssertionIOSmm">trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp">trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WTF/ChangeLog 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-08-31 Keith Rollin <krollin@apple.com>
+
+ WebKit should set a subsystem for os_log so it's easier to filter for WebKit log messages
+ https://bugs.webkit.org/show_bug.cgi?id=160969
+ <rdar://problem/26068734>
+
+ Reviewed by Simon Fraser.
+
+ Add support for attaching a subsystem and category when logging via
+ the RELEASE_LOG macros. This support is provided by adding subsystem
+ and category information to WTFLogChannel. An os_log_t object is then
+ created to enacpsulate that information. When using RELEASE_LOG to log
+ through that channel, the associated log object is used when calling
+ os_log.
+
+ To help support the inclusion of the subsystem and category
+ information in WTFLogChannel, the DECLARE_LOG_CHANNEL,
+ DEFINE_LOG_CHANNEL, and LOG_CHANNEL_ADDRESS macros that were defined
+ in various modules are consolidated and moved to Assertions.h.
+ DEFINE_LOG_CHANNEL is now defined to initialize the subsystem and
+ category.
+
+ * wtf/Assertions.cpp:
+ * wtf/Assertions.h:
+ * wtf/RefCountedLeakCounter.cpp:
+
</ins><span class="cx"> 2016-08-31 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Implement IPv6 parsing in URLParser
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -555,6 +555,13 @@
</span><span class="cx">
</span><span class="cx"> void WTFInitializeLogChannelStatesFromString(WTFLogChannel* channels[], size_t count, const char* logLevel)
</span><span class="cx"> {
</span><ins>+#if !RELEASE_LOG_DISABLED
+ for (size_t i = 0; i < count; ++i) {
+ WTFLogChannel* channel = channels[i];
+ channel->osLogChannel = os_log_create(channel->subsystem, channel->name);
+ }
+#endif
+
</ins><span class="cx"> String logLevelString = logLevel;
</span><span class="cx"> Vector<String> components;
</span><span class="cx"> logLevelString.split(',', components);
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.h (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.h 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WTF/wtf/Assertions.h 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -135,8 +135,32 @@
</span><span class="cx"> typedef struct {
</span><span class="cx"> WTFLogChannelState state;
</span><span class="cx"> const char* name;
</span><ins>+#if !RELEASE_LOG_DISABLED
+ const char* subsystem;
+ __unsafe_unretained os_log_t osLogChannel;
+#endif
</ins><span class="cx"> } WTFLogChannel;
</span><span class="cx">
</span><ins>+#define LOG_CHANNEL(name) JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name)
+#define LOG_CHANNEL_ADDRESS(name) &LOG_CHANNEL(name),
+#define JOIN_LOG_CHANNEL_WITH_PREFIX(prefix, channel) JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel)
+#define JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel) prefix ## channel
+
+#define LOG_CHANNEL_WEBKIT_SUBSYSTEM "com.apple.WebKit"
+
+#define DECLARE_LOG_CHANNEL(name) \
+ extern WTFLogChannel LOG_CHANNEL(name);
+
+#if !defined(DEFINE_LOG_CHANNEL)
+#if RELEASE_LOG_DISABLED
+#define DEFINE_LOG_CHANNEL(name, subsystem) \
+ WTFLogChannel LOG_CHANNEL(name) = { WTFLogChannelOff, #name };
+#else
+#define DEFINE_LOG_CHANNEL(name, subsystem) \
+ WTFLogChannel LOG_CHANNEL(name) = { WTFLogChannelOff, #name, subsystem, OS_LOG_DEFAULT };
+#endif
+#endif
+
</ins><span class="cx"> WTF_EXPORT_PRIVATE void WTFReportAssertionFailure(const char* file, int line, const char* function, const char* assertion);
</span><span class="cx"> WTF_EXPORT_PRIVATE void WTFReportAssertionFailureWithMessage(const char* file, int line, const char* function, const char* assertion, const char* format, ...) WTF_ATTRIBUTE_PRINTF(5, 6);
</span><span class="cx"> WTF_EXPORT_PRIVATE void WTFReportArgumentAssertionFailure(const char* file, int line, const char* function, const char* argName, const char* assertion);
</span><span class="lines">@@ -367,9 +391,7 @@
</span><span class="cx"> #if LOG_DISABLED
</span><span class="cx"> #define LOG(channel, ...) ((void)0)
</span><span class="cx"> #else
</span><del>-#define LOG(channel, ...) WTFLog(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
-#define JOIN_LOG_CHANNEL_WITH_PREFIX(prefix, channel) JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel)
-#define JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel) prefix ## channel
</del><ins>+#define LOG(channel, ...) WTFLog(&LOG_CHANNEL(channel), __VA_ARGS__)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* LOG_VERBOSE */
</span><span class="lines">@@ -377,23 +399,26 @@
</span><span class="cx"> #if LOG_DISABLED
</span><span class="cx"> #define LOG_VERBOSE(channel, ...) ((void)0)
</span><span class="cx"> #else
</span><del>-#define LOG_VERBOSE(channel, ...) WTFLogVerbose(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
</del><ins>+#define LOG_VERBOSE(channel, ...) WTFLogVerbose(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, &LOG_CHANNEL(channel), __VA_ARGS__)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* RELEASE_LOG */
</span><span class="cx">
</span><del>-#define WTF_LOGGING_PREFIX "#WK: "
</del><span class="cx"> #if RELEASE_LOG_DISABLED
</span><del>-#define RELEASE_LOG(format, ...) ((void)0)
-#define RELEASE_LOG_ERROR(format, ...) WTFReportError(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, format, ##__VA_ARGS__)
</del><ins>+#define RELEASE_LOG( channel, format, ...) ((void)0)
+#define RELEASE_LOG_ERROR(channel, format, ...) LOG_ERROR(format, ##__VA_ARGS__)
+
+#define RELEASE_LOG_IF( isAllowed, channel, format, ...) ((void)0)
+#define RELEASE_LOG_ERROR_IF(isAllowed, channel, format, ...) do { if (isAllowed) RELEASE_LOG_ERROR(channel, format, ##__VA_ARGS__); } while (0)
</ins><span class="cx"> #else
</span><del>-#define WTF_LOG_DEFAULT OS_LOG_DEFAULT
-#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__)
</del><ins>+#define RELEASE_LOG( channel, format, ...) os_log( LOG_CHANNEL(channel).osLogChannel, format, ##__VA_ARGS__)
+#define RELEASE_LOG_ERROR(channel, format, ...) os_log_error(LOG_CHANNEL(channel).osLogChannel, format, ##__VA_ARGS__)
+
+#define RELEASE_LOG_IF( isAllowed, channel, format, ...) do { if (isAllowed) RELEASE_LOG( channel, format, ##__VA_ARGS__); } while (0)
+#define RELEASE_LOG_ERROR_IF(isAllowed, channel, format, ...) do { if (isAllowed) RELEASE_LOG_ERROR(channel, format, ##__VA_ARGS__); } while (0)
</ins><span class="cx"> #endif
</span><del>-#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)
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> /* RELEASE_ASSERT */
</span><span class="cx">
</span><span class="cx"> #if ASSERT_DISABLED
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefCountedLeakCountercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefCountedLeakCounter.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefCountedLeakCounter.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WTF/wtf/RefCountedLeakCounter.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -39,7 +39,11 @@
</span><span class="cx"> #else
</span><span class="cx">
</span><span class="cx"> #define LOG_CHANNEL_PREFIX Log
</span><ins>+#if RELEASE_LOG_DISABLED
</ins><span class="cx"> static WTFLogChannel LogRefCountedLeaks = { WTFLogChannelOn, "RefCountedLeaks" };
</span><ins>+#else
+static WTFLogChannel LogRefCountedLeaks = { WTFLogChannelOn, "RefCountedLeaks", LOG_CHANNEL_WEBKIT_SUBSYSTEM, OS_LOG_DEFAULT };
+#endif
</ins><span class="cx">
</span><span class="cx"> typedef HashCountedSet<const char*, PtrHash<const char*>> ReasonSet;
</span><span class="cx"> static ReasonSet* leakMessageSuppressionReasons;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/ChangeLog 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-08-31 Keith Rollin <krollin@apple.com>
+
+ WebKit should set a subsystem for os_log so it's easier to filter for WebKit log messages
+ https://bugs.webkit.org/show_bug.cgi?id=160969
+ <rdar://problem/26068734>
+
+ Reviewed by Simon Fraser.
+
+ - Specify a channel when using RELEASE_LOG macros
+ - Add a new channel so that we have something to pass to the
+ RELEASE_LOG macros (Layers).
+ - Enable subsystem- and channel-related data and functions when using
+ RELEASE_LOG macros.
+ - Use the DECLARE_LOG_CHANNEL, DEFINE_LOG_CHANNEL, and
+ LOG_CHANNEL_ADDRESS macros that are now defined in WTF.
+
+ No new tests. There are no tests for logging.
+
+ * loader/FrameLoader.cpp:
+ * platform/LogInitialization.h:
+ * platform/LogMacros.h:
+ * platform/Logging.cpp:
+ * platform/Logging.h:
+ * platform/MemoryPressureHandler.cpp:
+ (WebCore::MemoryPressureHandler::ReliefLogger::logMemoryUsageChange):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::drawNativeImage):
+ * platform/graphics/cocoa/IOSurface.mm:
+ (WebCore::IOSurface::IOSurface):
+ * platform/mac/LoggingMac.mm:
+ * platform/unix/LoggingUnix.cpp:
+ * platform/win/LoggingWin.cpp:
+ * testing/js/WebCoreTestSupport.cpp:
+ (WebCoreTestSupport::initializeLogChannelsIfNecessary):
+
</ins><span class="cx"> 2016-08-31 Ricky Mondello <rmondello@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable the YouTube Flash plug-in replacement behavior on all Cocoa ports
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</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 RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLogInitializationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LogInitialization.h (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LogInitialization.h 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/platform/LogInitialization.h 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> String logLevelString();
</span><span class="cx"> bool isLogChannelEnabled(const String& name);
</span><span class="lines">@@ -37,6 +37,6 @@
</span><span class="cx"> WEBCORE_EXPORT void setLogChannelToAccumulate(const String& name);
</span><span class="cx"> WEBCORE_EXPORT void initializeLogChannelsIfNecessary();
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLogMacrosh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LogMacros.h (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LogMacros.h 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/platform/LogMacros.h 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include <functional>
</span><span class="cx">
</span><del>-#if LOG_DISABLED
</del><ins>+#if LOG_DISABLED && RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> #define LOG_RESULT(channel, function) ((void)0)
</span><span class="cx"> #define LOG_WITH_STREAM(channel, commands) ((void)0)
</span><span class="lines">@@ -47,4 +47,4 @@
</span><span class="cx"> return stream.release().utf8().data(); \
</span><span class="cx"> });
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Logging.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Logging.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/platform/Logging.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -35,20 +35,18 @@
</span><span class="cx"> #include <notify.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#define DEFINE_LOG_CHANNEL(name) \
- WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name) = { WTFLogChannelOff, #name };
-WEBCORE_LOG_CHANNELS(DEFINE_LOG_CHANNEL)
</del><ins>+#define DEFINE_WEBCORE_LOG_CHANNEL(name) DEFINE_LOG_CHANNEL(name, LOG_CHANNEL_WEBKIT_SUBSYSTEM)
+WEBCORE_LOG_CHANNELS(DEFINE_WEBCORE_LOG_CHANNEL)
</ins><span class="cx">
</span><del>-#define LOG_CHANNEL_ADDRESS(name) &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name),
-WTFLogChannel* logChannels[] = {
</del><ins>+static WTFLogChannel* logChannels[] = {
</ins><span class="cx"> WEBCORE_LOG_CHANNELS(LOG_CHANNEL_ADDRESS)
</span><span class="cx"> };
</span><span class="cx">
</span><del>-size_t logChannelCount = WTF_ARRAY_LENGTH(logChannels);
</del><ins>+static const size_t logChannelCount = WTF_ARRAY_LENGTH(logChannels);
</ins><span class="cx">
</span><span class="cx"> bool isLogChannelEnabled(const String& name)
</span><span class="cx"> {
</span><span class="lines">@@ -102,4 +100,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Logging.h (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Logging.h 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/platform/Logging.h 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> #ifndef LOG_CHANNEL_PREFIX
</span><span class="cx"> #define LOG_CHANNEL_PREFIX Log
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> M(DOMTimers) \
</span><span class="cx"> M(Editing) \
</span><span class="cx"> M(Events) \
</span><del>- M(FTP) \
</del><span class="cx"> M(FileAPI) \
</span><span class="cx"> M(Frames) \
</span><ins>+ M(FTP) \
</ins><span class="cx"> M(Fullscreen) \
</span><span class="cx"> M(Gamepad) \
</span><span class="cx"> M(History) \
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> M(IconDatabase) \
</span><span class="cx"> M(Images) \
</span><span class="cx"> M(IndexedDB) \
</span><ins>+ M(Layers) \
</ins><span class="cx"> M(Layout) \
</span><span class="cx"> M(Loading) \
</span><span class="cx"> M(Media) \
</span><span class="lines">@@ -70,12 +71,13 @@
</span><span class="cx"> M(Progress) \
</span><span class="cx"> M(RemoteInspector) \
</span><span class="cx"> M(ResourceLoading) \
</span><del>- M(SQLDatabase) \
- M(SVG) \
</del><ins>+ M(ResourceLoadObserver) \
+ M(Scrolling) \
</ins><span class="cx"> M(Services) \
</span><del>- M(Scrolling) \
</del><span class="cx"> M(SpellingAndGrammar) \
</span><ins>+ M(SQLDatabase) \
</ins><span class="cx"> M(StorageAPI) \
</span><ins>+ M(SVG) \
</ins><span class="cx"> M(TextAutosizing) \
</span><span class="cx"> M(Threading) \
</span><span class="cx"> M(URLParser) \
</span><span class="lines">@@ -83,8 +85,8 @@
</span><span class="cx"> M(WebGL) \
</span><span class="cx"> M(WebReplay) \
</span><span class="cx"> M(WheelEventTestTriggers) \
</span><del>- M(ResourceLoadObserver) \
</del><span class="cx">
</span><ins>+#undef DECLARE_LOG_CHANNEL
</ins><span class="cx"> #define DECLARE_LOG_CHANNEL(name) \
</span><span class="cx"> WEBCORE_EXPORT extern WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name);
</span><span class="cx">
</span><span class="lines">@@ -97,6 +99,6 @@
</span><span class="cx"> void registerNotifyCallback(const String& notifyID, std::function<void()> callback);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "GCController.h"
</span><span class="cx"> #include "HTMLMediaElement.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageCache.h"
</span><span class="lines">@@ -220,7 +221,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if !RELEASE_LOG_DISABLED
</span><span class="cx"> #define STRING_SPECIFICATION "%{public}s"
</span><del>-#define MEMORYPRESSURE_LOG(...) RELEASE_LOG(__VA_ARGS__)
</del><ins>+#define MEMORYPRESSURE_LOG(...) RELEASE_LOG(MemoryPressure, __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="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx"> double startTime = currentTime();
</span><span class="cx"> #endif
</span><span class="cx"> RetainPtr<CGImageRef> subImage(image);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import "IOSurfaceSPI.h"
</span><span class="cx"> #import "ImageBuffer.h"
</span><span class="cx"> #import "ImageBufferDataCG.h"
</span><ins>+#import "Logging.h"
</ins><span class="cx"> #import "MachSendRight.h"
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MathExtras.h>
</span><span class="lines">@@ -211,7 +212,7 @@
</span><span class="cx"> if (success)
</span><span class="cx"> m_totalBytes = IOSurfaceGetAllocSize(m_surface.get());
</span><span class="cx"> else
</span><del>- RELEASE_LOG_ERROR("Surface creation failed for size: (%d %d) and format: (%d)", size.width(), size.height(), format);
</del><ins>+ RELEASE_LOG_ERROR(Layers, "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="trunkSourceWebCoreplatformmacLoggingMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/LoggingMac.mm (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/LoggingMac.mm 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/platform/mac/LoggingMac.mm 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -41,4 +41,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformunixLoggingUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/unix/LoggingUnix.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/unix/LoggingUnix.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/platform/unix/LoggingUnix.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> #include <string.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -46,4 +46,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformwinLoggingWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/LoggingWin.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/LoggingWin.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/platform/win/LoggingWin.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> #include <windows.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -52,4 +52,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins></span></pre></div>
<a id="trunkSourceWebCoretestingjsWebCoreTestSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> void initializeLogChannelsIfNecessary()
</span><span class="cx"> {
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx"> WebCore::initializeLogChannelsIfNecessary();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-08-31 Keith Rollin <krollin@apple.com>
+
+ WebKit should set a subsystem for os_log so it's easier to filter for WebKit log messages
+ https://bugs.webkit.org/show_bug.cgi?id=160969
+ <rdar://problem/26068734>
+
+ Reviewed by Simon Fraser.
+
+ Enable subsystem- and channel-related data and functions when using
+ RELEASE_LOG macros. Use the DECLARE_LOG_CHANNEL, DEFINE_LOG_CHANNEL,
+ and LOG_CHANNEL_ADDRESS macros that are now defined in WTF.
+
+ * Misc/WebKitLogging.h:
+ * Misc/WebKitLogging.m:
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+
</ins><span class="cx"> 2016-08-31 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> WK2 Gamepad provider on iOS.
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitLogging.h (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitLogging.h 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit/mac/Misc/WebKitLogging.h 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> #define WEBKIT_LOG_CHANNELS(M) \
</span><span class="cx"> M(BackForward) \
</span><span class="lines">@@ -64,15 +64,12 @@
</span><span class="cx"> M(Timing) \
</span><span class="cx"> M(View) \
</span><span class="cx">
</span><del>-#define DECLARE_LOG_CHANNEL(name) \
-extern WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name);
-
</del><span class="cx"> WEBKIT_LOG_CHANNELS(DECLARE_LOG_CHANNEL)
</span><span class="cx">
</span><span class="cx"> #undef DECLARE_LOG_CHANNEL
</span><span class="cx">
</span><span class="cx"> void WebKitInitializeLogChannelsIfNecessary(void);
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> void ReportDiscardedDelegateException(SEL delegateSelector, id exception);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitLoggingm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitLogging.m (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitLogging.m 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit/mac/Misc/WebKitLogging.m 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -28,13 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #import "WebKitLogging.h"
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><del>-#define DEFINE_LOG_CHANNEL(name) \
- WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name) = { WTFLogChannelOff, #name };
-WEBKIT_LOG_CHANNELS(DEFINE_LOG_CHANNEL)
</del><ins>+#define DEFINE_WEBKIT_LOG_CHANNEL(name) DEFINE_LOG_CHANNEL(name, LOG_CHANNEL_WEBKIT_SUBSYSTEM)
+WEBKIT_LOG_CHANNELS(DEFINE_WEBKIT_LOG_CHANNEL)
</ins><span class="cx">
</span><del>-#define LOG_CHANNEL_ADDRESS(name) &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name),
</del><span class="cx"> static WTFLogChannel* logChannels[] = {
</span><span class="cx"> WEBKIT_LOG_CHANNELS(LOG_CHANNEL_ADDRESS)
</span><span class="cx"> };
</span><span class="lines">@@ -58,7 +56,7 @@
</span><span class="cx"> WTFInitializeLogChannelStatesFromString(logChannels, logChannelCount, [logLevel UTF8String]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> void ReportDiscardedDelegateException(SEL delegateSelector, id exception)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -967,7 +967,7 @@
</span><span class="cx"> static bool didOneTimeInitialization = false;
</span><span class="cx"> #endif
</span><span class="cx"> if (!didOneTimeInitialization) {
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx"> WebKitInitializeLogChannelsIfNecessary();
</span><span class="cx"> WebCore::initializeLogChannelsIfNecessary();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit/win/ChangeLog 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-08-31 Keith Rollin <krollin@apple.com>
+
+ WebKit should set a subsystem for os_log so it's easier to filter for WebKit log messages
+ https://bugs.webkit.org/show_bug.cgi?id=160969
+ <rdar://problem/26068734>
+
+ Reviewed by Simon Fraser.
+
+ Enable subsystem- and channel-related data and functions when using
+ RELEASE_LOG macros. Use the DECLARE_LOG_CHANNEL, DEFINE_LOG_CHANNEL,
+ and LOG_CHANNEL_ADDRESS macros that are now defined in WTF.
+
+ * WebKitLogging.cpp:
+ * WebKitLogging.h:
+ * WebView.cpp:
+ (WebView::initWithFrame):
+
</ins><span class="cx"> 2016-08-16 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Accelerated compositing does not work in Wayland
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitLogging.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitLogging.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit/win/WebKitLogging.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -27,13 +27,11 @@
</span><span class="cx"> */
</span><span class="cx"> #include "WebKitLogging.h"
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><del>-#define DEFINE_LOG_CHANNEL(name) \
- WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name) = { WTFLogChannelOff, #name };
-WEBKIT_LOG_CHANNELS(DEFINE_LOG_CHANNEL)
</del><ins>+#define DEFINE_WEBKIT_LOG_CHANNEL(name) DEFINE_LOG_CHANNEL(name, LOG_CHANNEL_WEBKIT_SUBSYSTEM)
+WEBKIT_LOG_CHANNELS(DEFINE_WEBKIT_LOG_CHANNEL)
</ins><span class="cx">
</span><del>-#define LOG_CHANNEL_ADDRESS(name) &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name),
</del><span class="cx"> static WTFLogChannel* logChannels[] = {
</span><span class="cx"> WEBKIT_LOG_CHANNELS(LOG_CHANNEL_ADDRESS)
</span><span class="cx"> };
</span><span class="lines">@@ -51,4 +49,4 @@
</span><span class="cx"> WTFInitializeLogChannelStatesFromString(logChannels, logChannelCount, "");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebKitLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitLogging.h (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitLogging.h 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit/win/WebKitLogging.h 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> #ifndef LOG_CHANNEL_PREFIX
</span><span class="cx"> #define LOG_CHANNEL_PREFIX WebKitLog
</span><span class="lines">@@ -62,9 +62,6 @@
</span><span class="cx"> M(Timing) \
</span><span class="cx"> M(View) \
</span><span class="cx">
</span><del>-#define DECLARE_LOG_CHANNEL(name) \
-extern WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name);
-
</del><span class="cx"> WEBKIT_LOG_CHANNELS(DECLARE_LOG_CHANNEL)
</span><span class="cx">
</span><span class="cx"> #undef DECLARE_LOG_CHANNEL
</span><span class="lines">@@ -71,6 +68,6 @@
</span><span class="cx">
</span><span class="cx"> void WebKitInitializeLogChannelsIfNecessary(void);
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit/win/WebView.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -2906,9 +2906,9 @@
</span><span class="cx">
</span><span class="cx"> static bool didOneTimeInitialization;
</span><span class="cx"> if (!didOneTimeInitialization) {
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx"> initializeLogChannelsIfNecessary();
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> // Initialize our platform strategies first before invoking the rest
</span><span class="cx"> // of the initialization code which may depend on the strategies.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -1,3 +1,72 @@
</span><ins>+2016-08-31 Keith Rollin <krollin@apple.com>
+
+ WebKit should set a subsystem for os_log so it's easier to filter for WebKit log messages
+ https://bugs.webkit.org/show_bug.cgi?id=160969
+ <rdar://problem/26068734>
+
+ Reviewed by Simon Fraser.
+
+ - Specify a channel when using RELEASE_LOG macros.
+ - Add some new channels so that we have something to pass to the
+ RELEASE_LOG macros (ProcessSuspension, IPC, Layers).
+ - Enable subsystem- and channel-related data and functions when using
+ RELEASE_LOG macros.
+ - Use the DECLARE_LOG_CHANNEL, DEFINE_LOG_CHANNEL, and
+ LOG_CHANNEL_ADDRESS macros that are now defined in WTF.
+
+ * NetworkProcess/Downloads/Download.cpp:
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::prepareToSuspend):
+ (WebKit::NetworkProcess::cancelPrepareToSuspend):
+ (WebKit::NetworkProcess::processDidResume):
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::waitForSyncReply):
+ * Platform/LogInitialization.h:
+ * Platform/Logging.cpp:
+ (WebKit::initializeLogChannelsIfNecessary):
+ * Platform/Logging.h:
+ * Platform/foundation/LoggingFoundation.mm:
+ * Platform/unix/LoggingUnix.cpp:
+ * Shared/ChildProcess.cpp:
+ (WebKit::didCloseOnConnectionWorkQueue):
+ * Shared/WebKit2Initialize.cpp:
+ (WebKit::InitializeWebKit2):
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::releaseNetworkActivityToken):
+ (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:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::m_hiddenPageThrottlingTimer):
+ * 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:
+ * WebProcess/Network/WebResourceLoader.cpp:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::layerVolatilityTimerFired):
+ * 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-08-31 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Add event support for link preload.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "DownloadManager.h"
</span><span class="cx"> #include "DownloadProxyMessages.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="lines">@@ -37,8 +38,8 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
-#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
+#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -623,10 +623,10 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::prepareToSuspend()
</span><span class="cx"> {
</span><del>- RELEASE_LOG("%p - NetworkProcess::prepareToSuspend()", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%p - NetworkProcess::prepareToSuspend()", this);
</ins><span class="cx"> lowMemoryHandler(Critical::Yes);
</span><span class="cx">
</span><del>- RELEASE_LOG("%p - NetworkProcess::prepareToSuspend() Sending ProcessReadyToSuspend IPC message", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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">@@ -636,12 +636,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>- RELEASE_LOG("%p - NetworkProcess::cancelPrepareToSuspend()", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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>- RELEASE_LOG("%p - NetworkProcess::processDidResume()", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</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 RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
-#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
+#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Connection.h"
</span><span class="cx">
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -573,7 +574,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>- RELEASE_LOG_ERROR("Connection::waitForSyncReply: Connection no longer valid, id = %" PRIu64, syncRequestID);
</del><ins>+ RELEASE_LOG_ERROR(IPC, "Connection::waitForSyncReply: Connection no longer valid, id = %" PRIu64, syncRequestID);
</ins><span class="cx"> didReceiveSyncReply(sendSyncOptions);
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -584,7 +585,7 @@
</span><span class="cx"> timedOut = !SyncMessageState::singleton().wait(absoluteTime);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RELEASE_LOG_ERROR("Connection::waitForSyncReply: Timed-out while waiting for reply, id = %" PRIu64, syncRequestID);
</del><ins>+ RELEASE_LOG_ERROR(IPC, "Connection::waitForSyncReply: Timed-out while waiting for reply, id = %" PRIu64, syncRequestID);
</ins><span class="cx"> didReceiveSyncReply(sendSyncOptions);
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformLogInitializationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/LogInitialization.h (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/LogInitialization.h 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/Platform/LogInitialization.h 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -36,4 +36,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2PlatformLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/Logging.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/Logging.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/Platform/Logging.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -30,13 +30,11 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><del>-#define DEFINE_LOG_CHANNEL(name) \
- WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name) = { WTFLogChannelOff, #name };
-WEBKIT2_LOG_CHANNELS(DEFINE_LOG_CHANNEL)
</del><ins>+#define DEFINE_WEBKIT2_LOG_CHANNEL(name) DEFINE_LOG_CHANNEL(name, LOG_CHANNEL_WEBKIT_SUBSYSTEM)
+WEBKIT2_LOG_CHANNELS(DEFINE_WEBKIT2_LOG_CHANNEL)
</ins><span class="cx">
</span><del>-#define LOG_CHANNEL_ADDRESS(name) &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name),
</del><span class="cx"> static WTFLogChannel* logChannels[] = {
</span><span class="cx"> WEBKIT2_LOG_CHANNELS(LOG_CHANNEL_ADDRESS)
</span><span class="cx"> };
</span><span class="lines">@@ -43,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-const size_t logChannelCount = WTF_ARRAY_LENGTH(logChannels);
</del><ins>+static const size_t logChannelCount = WTF_ARRAY_LENGTH(logChannels);
</ins><span class="cx">
</span><span class="cx"> void initializeLogChannelsIfNecessary()
</span><span class="cx"> {
</span><span class="lines">@@ -62,4 +60,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2PlatformLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/Logging.h (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/Logging.h 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/Platform/Logging.h 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> #ifndef LOG_CHANNEL_PREFIX
</span><span class="cx"> #define LOG_CHANNEL_PREFIX WebKit2Log
</span><span class="lines">@@ -44,19 +44,22 @@
</span><span class="cx"> #define WEBKIT2_LOG_CHANNELS(M) \
</span><span class="cx"> M(ContextMenu) \
</span><span class="cx"> M(Gamepad) \
</span><ins>+ M(IconDatabase) \
</ins><span class="cx"> M(IDB) \
</span><del>- M(IconDatabase) \
</del><span class="cx"> M(IndexedDB) \
</span><span class="cx"> M(InspectorServer) \
</span><ins>+ M(IPC) \
</ins><span class="cx"> M(KeyHandling) \
</span><ins>+ M(Layers) \
</ins><span class="cx"> M(Network) \
</span><span class="cx"> M(NetworkCache) \
</span><ins>+ M(NetworkCacheSpeculativePreloading) \
</ins><span class="cx"> M(NetworkCacheStorage) \
</span><del>- M(NetworkCacheSpeculativePreloading) \
</del><ins>+ M(NetworkScheduling) \
</ins><span class="cx"> M(NetworkSession) \
</span><del>- M(NetworkScheduling) \
</del><span class="cx"> M(Plugins) \
</span><span class="cx"> M(Printing) \
</span><ins>+ M(ProcessSuspension) \
</ins><span class="cx"> M(RemoteLayerTree) \
</span><span class="cx"> M(Resize) \
</span><span class="cx"> M(Selection) \
</span><span class="lines">@@ -66,9 +69,6 @@
</span><span class="cx"> M(ViewGestures) \
</span><span class="cx"> M(VisibleRects) \
</span><span class="cx">
</span><del>-#define DECLARE_LOG_CHANNEL(name) \
- extern WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name);
-
</del><span class="cx"> WEBKIT2_LOG_CHANNELS(DECLARE_LOG_CHANNEL)
</span><span class="cx">
</span><span class="cx"> #undef DECLARE_LOG_CHANNEL
</span><span class="lines">@@ -77,6 +77,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> #endif // Logging_h
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformfoundationLoggingFoundationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> static NSString * const defaultsDomain = @"WebKit2Logging";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformunixLoggingUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/unix/LoggingUnix.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/unix/LoggingUnix.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/Platform/unix/LoggingUnix.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> String logLevelString()
</span><span class="cx"> {
</span><span class="lines">@@ -36,6 +36,6 @@
</span><span class="cx"> return getenv("WEBKIT_DEBUG");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedChildProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ChildProcess.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ChildProcess.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/Shared/ChildProcess.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ChildProcess.h"
</span><span class="cx">
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "SandboxInitializationParameters.h"
</span><span class="cx"> #include <unistd.h>
</span><span class="cx">
</span><span class="lines">@@ -53,7 +54,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>- RELEASE_LOG_ERROR("Exiting process early due to unacknowledged closed-connection");
</del><ins>+ RELEASE_LOG_ERROR(IPC, "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="trunkSourceWebKit2SharedWebKit2Initializecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -56,10 +56,10 @@
</span><span class="cx"> WTF::initializeMainThread();
</span><span class="cx"> RunLoop::initializeMainRunLoop();
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx"> WebCore::initializeLogChannelsIfNecessary();
</span><span class="cx"> WebKit::initializeLogChannelsIfNecessary();
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import "APIURL.h"
</span><span class="cx"> #import "AuthenticationDecisionListener.h"
</span><span class="cx"> #import "CompletionHandlerCallChecker.h"
</span><ins>+#import "Logging.h"
</ins><span class="cx"> #import "NavigationActionData.h"
</span><span class="cx"> #import "PageLoadState.h"
</span><span class="cx"> #import "WKBackForwardListInternal.h"
</span><span class="lines">@@ -825,7 +826,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void NavigationState::releaseNetworkActivityToken()
</span><span class="cx"> {
</span><del>- RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), "%p UIProcess is releasing a background assertion because a page load completed", this);
</del><ins>+ RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p UIProcess is releasing a background assertion because a page load completed", this);
</ins><span class="cx"> ASSERT(m_activityToken);
</span><span class="cx"> m_activityToken = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -838,7 +839,7 @@
</span><span class="cx"> if (m_releaseActivityTimer.isActive())
</span><span class="cx"> m_releaseActivityTimer.stop();
</span><span class="cx"> else {
</span><del>- RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), "%p - UIProcess is taking a background assertion because a page load started", this);
</del><ins>+ RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - UIProcess is taking a background assertion because a page load started", this);
</ins><span class="cx"> ASSERT(!m_activityToken);
</span><span class="cx"> m_activityToken = m_webView->_page->process().throttler().backgroundActivityToken();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "CustomProtocolManagerProxyMessages.h"
</span><span class="cx"> #include "DatabaseProcessMessages.h"
</span><span class="cx"> #include "DownloadProxyMessages.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "NetworkProcessCreationParameters.h"
</span><span class="cx"> #include "NetworkProcessMessages.h"
</span><span class="cx"> #include "SandboxExtension.h"
</span><span class="lines">@@ -125,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>- RELEASE_LOG_IF(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(), ProcessSuspension, "%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>- RELEASE_LOG_IF(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(), ProcessSuspension, "%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">@@ -139,11 +140,11 @@
</span><span class="cx"> {
</span><span class="cx"> auto callbackID = generateCallbackID();
</span><span class="cx"> auto token = throttler().backgroundActivityToken();
</span><del>- RELEASE_LOG_IF(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(), ProcessSuspension, "%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>- RELEASE_LOG_IF(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(), ProcessSuspension, "%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">@@ -154,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>- RELEASE_LOG_IF(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(), ProcessSuspension, "%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>- 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);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%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">@@ -401,12 +402,12 @@
</span><span class="cx"> void NetworkProcessProxy::setIsHoldingLockedFiles(bool isHoldingLockedFiles)
</span><span class="cx"> {
</span><span class="cx"> if (!isHoldingLockedFiles) {
</span><del>- RELEASE_LOG("UIProcess is releasing a background assertion because the Network process is no longer holding locked files");
</del><ins>+ RELEASE_LOG(ProcessSuspension, "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>- RELEASE_LOG("UIProcess is taking a background assertion because the Network process is holding locked files");
</del><ins>+ RELEASE_LOG(ProcessSuspension, "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="trunkSourceWebKit2UIProcessProcessThrottlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ProcessThrottler.h"
</span><span class="cx">
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "ProcessThrottlerClient.h"
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -57,7 +58,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>- RELEASE_LOG("%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(ProcessSuspension, "%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 +71,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>- RELEASE_LOG("%p - ProcessThrottler::updateAssertion() sending PrepareToSuspend IPC", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</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 RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), ProcessSuspension, __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -213,10 +213,10 @@
</span><span class="cx">
</span><span class="cx"> addLanguageChangeObserver(this, languageChanged);
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
</del><ins>+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx"> WebCore::initializeLogChannelsIfNecessary();
</span><span class="cx"> WebKit::initializeLogChannelsIfNecessary();
</span><del>-#endif // !LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> processPoolCounter.increment();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "CustomProtocolManagerProxyMessages.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "DownloadProxyMap.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "PluginInfoStore.h"
</span><span class="cx"> #include "PluginProcessManager.h"
</span><span class="cx"> #include "TextChecker.h"
</span><span class="lines">@@ -709,7 +710,7 @@
</span><span class="cx"> ASSERT(canSendMessage());
</span><span class="cx">
</span><span class="cx"> auto token = throttler().backgroundActivityToken();
</span><del>- RELEASE_LOG_IF(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(), ProcessSuspension, "%p - WebProcessProxy is taking a background assertion because the Web process is fetching Website data", this);
</ins><span class="cx">
</span><span class="cx"> connection()->sendWithReply(Messages::WebProcess::FetchWebsiteData(sessionID, dataTypes), 0, RunLoop::main(), [this, token, completionHandler = WTFMove(completionHandler), sessionID](auto reply) {
</span><span class="cx"> if (!reply) {
</span><span class="lines">@@ -718,7 +719,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> completionHandler(WTFMove(std::get<0>(*reply)));
</span><del>- RELEASE_LOG_IF(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(), ProcessSuspension, "%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">
</span><span class="lines">@@ -727,11 +728,11 @@
</span><span class="cx"> ASSERT(canSendMessage());
</span><span class="cx">
</span><span class="cx"> auto token = throttler().backgroundActivityToken();
</span><del>- RELEASE_LOG_IF(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(), ProcessSuspension, "%p - WebProcessProxy is taking a background assertion because the Web process is deleting Website data", this);
</ins><span class="cx">
</span><span class="cx"> connection()->sendWithReply(Messages::WebProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince), 0, RunLoop::main(), [this, token, completionHandler = WTFMove(completionHandler), sessionID](auto reply) {
</span><span class="cx"> completionHandler();
</span><del>- RELEASE_LOG_IF(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(), ProcessSuspension, "%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"> }
</span><span class="cx">
</span><span class="lines">@@ -740,7 +741,7 @@
</span><span class="cx"> ASSERT(canSendMessage());
</span><span class="cx">
</span><span class="cx"> auto token = throttler().backgroundActivityToken();
</span><del>- RELEASE_LOG_IF(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(), ProcessSuspension, "%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"> Vector<SecurityOriginData> originData;
</span><span class="cx"> for (auto& origin : origins)
</span><span class="lines">@@ -748,7 +749,7 @@
</span><span class="cx">
</span><span class="cx"> connection()->sendWithReply(Messages::WebProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, originData), 0, RunLoop::main(), [this, token, completionHandler = WTFMove(completionHandler), sessionID](auto reply) {
</span><span class="cx"> completionHandler();
</span><del>- 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);
</del><ins>+ RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%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">
</span><span class="lines">@@ -945,7 +946,7 @@
</span><span class="cx">
</span><span class="cx"> switch (state) {
</span><span class="cx"> case AssertionState::Suspended:
</span><del>- RELEASE_LOG("%p - WebProcessProxy::didSetAssertionState(Suspended) release all assertions for network process", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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">@@ -953,13 +954,13 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case AssertionState::Background:
</span><del>- RELEASE_LOG("%p - WebProcessProxy::didSetAssertionState(Background) taking background assertion for network process", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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>- RELEASE_LOG("%p - WebProcessProxy::didSetAssertionState(Foreground) taking foreground assertion for network process", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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">@@ -976,12 +977,12 @@
</span><span class="cx"> void WebProcessProxy::setIsHoldingLockedFiles(bool isHoldingLockedFiles)
</span><span class="cx"> {
</span><span class="cx"> if (!isHoldingLockedFiles) {
</span><del>- RELEASE_LOG("UIProcess is releasing a background assertion because the WebContent process is no longer holding locked files");
</del><ins>+ RELEASE_LOG(ProcessSuspension, "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>- RELEASE_LOG("UIProcess is taking a background assertion because the WebContent process is holding locked files");
</del><ins>+ RELEASE_LOG(ProcessSuspension, "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="trunkSourceWebKit2UIProcessiosProcessAssertionIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #import "AssertionServicesSPI.h"
</span><ins>+#import "Logging.h"
</ins><span class="cx"> #import <UIKit/UIApplication.h>
</span><span class="cx"> #import <wtf/HashSet.h>
</span><span class="cx"> #import <wtf/RunLoop.h>
</span><span class="lines">@@ -105,7 +106,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>- RELEASE_LOG_ERROR("Background task expired while holding WebKit ProcessAssertion (isMainThread? %d).", RunLoop::isMain());
</del><ins>+ RELEASE_LOG_ERROR(ProcessSuspension, "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 +166,7 @@
</span><span class="cx"> auto weakThis = createWeakPtr();
</span><span class="cx"> BKSProcessAssertionAcquisitionHandler handler = ^(BOOL acquired) {
</span><span class="cx"> if (!acquired) {
</span><del>- RELEASE_LOG_ERROR("Unable to acquire assertion for process %d", pid);
</del><ins>+ RELEASE_LOG_ERROR(ProcessSuspension, "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="trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</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 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__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(loadParameters.sessionID.isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
+#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(loadParameters.sessionID.isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</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 RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -255,8 +255,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 RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
-#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Layers, __VA_ARGS__)
+#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), Layers, __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> class SendStopResponsivenessTimer {
</span><span class="cx"> public:
</span><span class="lines">@@ -2064,7 +2064,7 @@
</span><span class="cx"> bool didSucceed = markLayersVolatileImmediatelyIfPossible();
</span><span class="cx"> if (didSucceed || newInterval > maximumLayerVolatilityTimerInterval) {
</span><span class="cx"> m_layerVolatilityTimer.stop();
</span><del>- RELEASE_LOG_IF_ALLOWED("%p - WebPage - Attempted to mark surfaces as volatile, success? %d", this, didSucceed);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("%p - WebPage - Attempted to mark layers as volatile, success? %d", this, didSucceed);
</ins><span class="cx"> callVolatilityCompletionHandlers();
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (205274 => 205275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-09-01 01:23:56 UTC (rev 205274)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-09-01 01:33:40 UTC (rev 205275)
</span><span class="lines">@@ -1272,10 +1272,10 @@
</span><span class="cx"> setAllLayerTreeStatesFrozen(true);
</span><span class="cx">
</span><span class="cx"> markAllLayersVolatile([this, shouldAcknowledgeWhenReadyToSuspend] {
</span><del>- RELEASE_LOG("%p - WebProcess::markAllLayersVolatile() Successfuly marked all layers as volatile", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%p - WebProcess::markAllLayersVolatile() Successfuly marked all layers as volatile", this);
</ins><span class="cx">
</span><span class="cx"> if (shouldAcknowledgeWhenReadyToSuspend == ShouldAcknowledgeWhenReadyToSuspend::Yes) {
</span><del>- RELEASE_LOG("%p - WebProcess::actualPrepareToSuspend() Sending ProcessReadyToSuspend IPC message", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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">@@ -1291,7 +1291,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RELEASE_LOG("%p - WebProcess::processWillSuspendImminently()", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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">@@ -1299,13 +1299,13 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::prepareToSuspend()
</span><span class="cx"> {
</span><del>- RELEASE_LOG("%p - WebProcess::prepareToSuspend()", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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>- RELEASE_LOG("%p - WebProcess::cancelPrepareToSuspend()", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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">@@ -1315,13 +1315,13 @@
</span><span class="cx">
</span><span class="cx"> cancelMarkAllLayersVolatile();
</span><span class="cx">
</span><del>- RELEASE_LOG("%p - WebProcess::cancelPrepareToSuspend() Sending DidCancelProcessSuspension IPC message", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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>- RELEASE_LOG("%p - WebProcess::markAllLayersVolatile()", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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">@@ -1354,7 +1354,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::processDidResume()
</span><span class="cx"> {
</span><del>- RELEASE_LOG("%p - WebProcess::processDidResume()", this);
</del><ins>+ RELEASE_LOG(ProcessSuspension, "%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>