<!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>[243135] trunk</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/243135">243135</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2019-03-19 06:25:16 -0700 (Tue, 19 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/243132">r243132</a>.

Broke GTK build

Reverted changeset:

"Make WTFLogChannelState and WTFLogLevel enum classes"
https://bugs.webkit.org/show_bug.cgi?id=195904
https://trac.webkit.org/changeset/243132</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAggregateLoggerh">trunk/Source/WTF/wtf/AggregateLogger.h</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="#trunkSourceWTFwtfLoggerh">trunk/Source/WTF/wtf/Logger.h</a></li>
<li><a href="#trunkSourceWTFwtfMemoryPressureHandlercpp">trunk/Source/WTF/wtf/MemoryPressureHandler.cpp</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="#trunkSourceWebCoreModulesmediasourceSourceBuffercpp">trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlFTPDirectoryDocumentcpp">trunk/Source/WebCore/html/FTPDirectoryDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectoragentsWebConsoleAgentcpp">trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLoggingcpp">trunk/Source/WebCore/platform/Logging.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramcpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCProvidercpp">trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp">trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcesswebrtcNetworkRTCProvidercpp">trunk/Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreLoggingcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/Logging.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WTF/ChangeLog  2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-03-19  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, rolling out r243132.
+
+        Broke GTK build
+
+        Reverted changeset:
+
+        "Make WTFLogChannelState and WTFLogLevel enum classes"
+        https://bugs.webkit.org/show_bug.cgi?id=195904
+        https://trac.webkit.org/changeset/243132
+
</ins><span class="cx"> 2019-03-18  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Make WTFLogChannelState and WTFLogLevel enum classes
</span></span></pre></div>
<a id="trunkSourceWTFwtfAggregateLoggerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/AggregateLogger.h (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/AggregateLogger.h   2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WTF/wtf/AggregateLogger.h      2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">         //  on some systems, so don't allow it.
</span><span class="cx">         UNUSED_PARAM(channel);
</span><span class="cx"> #else
</span><del>-        log(channel, WTFLogLevel::Always, arguments...);
</del><ins>+        log(channel, WTFLogLevelAlways, arguments...);
</ins><span class="cx"> #endif
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -64,25 +64,25 @@
</span><span class="cx">     template<typename... Arguments>
</span><span class="cx">     inline void error(WTFLogChannel& channel, const Arguments&... arguments) const
</span><span class="cx">     {
</span><del>-        log(channel, WTFLogLevel::Error, arguments...);
</del><ins>+        log(channel, WTFLogLevelError, arguments...);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     template<typename... Arguments>
</span><span class="cx">     inline void warning(WTFLogChannel& channel, const Arguments&... arguments) const
</span><span class="cx">     {
</span><del>-        log(channel, WTFLogLevel::Warning, arguments...);
</del><ins>+        log(channel, WTFLogLevelWarning, arguments...);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     template<typename... Arguments>
</span><span class="cx">     inline void info(WTFLogChannel& channel, const Arguments&... arguments) const
</span><span class="cx">     {
</span><del>-        log(channel, WTFLogLevel::Info, arguments...);
</del><ins>+        log(channel, WTFLogLevelInfo, arguments...);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     template<typename... Arguments>
</span><span class="cx">     inline void debug(WTFLogChannel& channel, const Arguments&... arguments) const
</span><span class="cx">     {
</span><del>-        log(channel, WTFLogLevel::Debug, arguments...);
</del><ins>+        log(channel, WTFLogLevelDebug, arguments...);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     inline bool willLog(const WTFLogChannel& channel, WTFLogLevel level) const
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.cpp      2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -409,15 +409,15 @@
</span><span class="cx"> 
</span><span class="cx"> bool WTFWillLogWithLevel(WTFLogChannel* channel, WTFLogLevel level)
</span><span class="cx"> {
</span><del>-    return channel->level >= level && channel->state != WTFLogChannelState::Off;
</del><ins>+    return channel->level >= level && channel->state != WTFLogChannelOff;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WTFLogWithLevel(WTFLogChannel* channel, WTFLogLevel level, const char* format, ...)
</span><span class="cx"> {
</span><del>-    if (level != WTFLogLevel::Always && level > channel->level)
</del><ins>+    if (level != WTFLogLevelAlways && level > channel->level)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    if (channel->level != WTFLogLevel::Always && channel->state == WTFLogChannelState::Off)
</del><ins>+    if (channel->level != WTFLogLevelAlways && channel->state == WTFLogChannelOff)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     va_list args;
</span><span class="lines">@@ -432,15 +432,15 @@
</span><span class="cx"> 
</span><span class="cx"> static void WTFLogVaList(WTFLogChannel* channel, const char* format, va_list args)
</span><span class="cx"> {
</span><del>-    if (channel->state == WTFLogChannelState::Off)
</del><ins>+    if (channel->state == WTFLogChannelOff)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    if (channel->state == WTFLogChannelState::On) {
</del><ins>+    if (channel->state == WTFLogChannelOn) {
</ins><span class="cx">         vprintf_stderr_with_trailing_newline(format, args);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ASSERT(channel->state == WTFLogChannelState::OnWithAccumulation);
</del><ins>+    ASSERT(channel->state == WTFLogChannelOnWithAccumulation);
</ins><span class="cx"> 
</span><span class="cx">     ALLOW_NONLITERAL_FORMAT_BEGIN
</span><span class="cx">     String loggingString = WTF::createWithFormatAndArguments(format, args);
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WTFLogVerbose(const char* file, int line, const char* function, WTFLogChannel* channel, const char* format, ...)
</span><span class="cx"> {
</span><del>-    if (channel->state != WTFLogChannelState::On)
</del><ins>+    if (channel->state != WTFLogChannelOn)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     va_list args;
</span><span class="lines">@@ -533,9 +533,9 @@
</span><span class="cx">         Vector<String> componentInfo = logLevelComponent.split('=');
</span><span class="cx">         String component = componentInfo[0].stripWhiteSpace();
</span><span class="cx"> 
</span><del>-        WTFLogChannelState logChannelState = WTFLogChannelState::On;
</del><ins>+        WTFLogChannelState logChannelState = WTFLogChannelOn;
</ins><span class="cx">         if (component.startsWith('-')) {
</span><del>-            logChannelState = WTFLogChannelState::Off;
</del><ins>+            logChannelState = WTFLogChannelOff;
</ins><span class="cx">             component = component.substring(1);
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -544,17 +544,17 @@
</span><span class="cx">             continue;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        WTFLogLevel logChannelLevel = WTFLogLevel::Error;
</del><ins>+        WTFLogLevel logChannelLevel = WTFLogLevelError;
</ins><span class="cx">         if (componentInfo.size() > 1) {
</span><span class="cx">             String level = componentInfo[1].stripWhiteSpace();
</span><span class="cx">             if (equalLettersIgnoringASCIICase(level, "error"))
</span><del>-                logChannelLevel = WTFLogLevel::Error;
</del><ins>+                logChannelLevel = WTFLogLevelError;
</ins><span class="cx">             else if (equalLettersIgnoringASCIICase(level, "warning"))
</span><del>-                logChannelLevel = WTFLogLevel::Warning;
</del><ins>+                logChannelLevel = WTFLogLevelWarning;
</ins><span class="cx">             else if (equalLettersIgnoringASCIICase(level, "info"))
</span><del>-                logChannelLevel = WTFLogLevel::Info;
</del><ins>+                logChannelLevel = WTFLogLevelInfo;
</ins><span class="cx">             else if (equalLettersIgnoringASCIICase(level, "debug"))
</span><del>-                logChannelLevel = WTFLogLevel::Debug;
</del><ins>+                logChannelLevel = WTFLogLevelDebug;
</ins><span class="cx">             else
</span><span class="cx">                 WTFLogAlways("Unknown logging level: %s", level.utf8().data());
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.h (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.h        2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WTF/wtf/Assertions.h   2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -148,13 +148,8 @@
</span><span class="cx"> #define NO_RETURN_DUE_TO_CRASH
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#ifdef __cplusplus
-enum class WTFLogChannelState : uint8_t { Off, On, OnWithAccumulation };
-enum class WTFLogLevel : uint8_t { Always, Error, Warning, Info, Debug };
-#else
-typedef uint8_t WTFLogChannelState;
-typedef uint8_t WTFLogLevel;
-#endif
</del><ins>+typedef enum { WTFLogChannelOff, WTFLogChannelOn, WTFLogChannelOnWithAccumulation } WTFLogChannelState;
+typedef enum { WTFLogLevelAlways, WTFLogLevelError, WTFLogLevelWarning, WTFLogLevelInfo, WTFLogLevelDebug } WTFLogLevel;
</ins><span class="cx"> 
</span><span class="cx"> typedef struct {
</span><span class="cx">     WTFLogChannelState state;
</span><span class="lines">@@ -179,10 +174,10 @@
</span><span class="cx"> #if !defined(DEFINE_LOG_CHANNEL)
</span><span class="cx"> #if RELEASE_LOG_DISABLED
</span><span class="cx"> #define DEFINE_LOG_CHANNEL(name, subsystem) \
</span><del>-    WTFLogChannel LOG_CHANNEL(name) = { (WTFLogChannelState)0, #name, (WTFLogLevel)1 };
</del><ins>+    WTFLogChannel LOG_CHANNEL(name) = { WTFLogChannelOff, #name, WTFLogLevelError };
</ins><span class="cx"> #else
</span><span class="cx"> #define DEFINE_LOG_CHANNEL(name, subsystem) \
</span><del>-    WTFLogChannel LOG_CHANNEL(name) = { (WTFLogChannelState)0, #name, (WTFLogLevel)1, subsystem, OS_LOG_DEFAULT };
</del><ins>+    WTFLogChannel LOG_CHANNEL(name) = { WTFLogChannelOff, #name, WTFLogLevelError, subsystem, OS_LOG_DEFAULT };
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWTFwtfLoggerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Logger.h (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Logger.h    2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WTF/wtf/Logger.h       2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -126,10 +126,10 @@
</span><span class="cx">         //  on some systems, so don't allow it.
</span><span class="cx">         UNUSED_PARAM(channel);
</span><span class="cx"> #else
</span><del>-        if (!willLog(channel, WTFLogLevel::Always))
</del><ins>+        if (!willLog(channel, WTFLogLevelAlways))
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        log(channel, WTFLogLevel::Always, arguments...);
</del><ins>+        log(channel, WTFLogLevelAlways, arguments...);
</ins><span class="cx"> #endif
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -136,37 +136,37 @@
</span><span class="cx">     template<typename... Arguments>
</span><span class="cx">     inline void error(WTFLogChannel& channel, const Arguments&... arguments) const
</span><span class="cx">     {
</span><del>-        if (!willLog(channel, WTFLogLevel::Error))
</del><ins>+        if (!willLog(channel, WTFLogLevelError))
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        log(channel, WTFLogLevel::Error, arguments...);
</del><ins>+        log(channel, WTFLogLevelError, arguments...);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     template<typename... Arguments>
</span><span class="cx">     inline void warning(WTFLogChannel& channel, const Arguments&... arguments) const
</span><span class="cx">     {
</span><del>-        if (!willLog(channel, WTFLogLevel::Warning))
</del><ins>+        if (!willLog(channel, WTFLogLevelWarning))
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        log(channel, WTFLogLevel::Warning, arguments...);
</del><ins>+        log(channel, WTFLogLevelWarning, arguments...);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     template<typename... Arguments>
</span><span class="cx">     inline void info(WTFLogChannel& channel, const Arguments&... arguments) const
</span><span class="cx">     {
</span><del>-        if (!willLog(channel, WTFLogLevel::Info))
</del><ins>+        if (!willLog(channel, WTFLogLevelInfo))
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        log(channel, WTFLogLevel::Info, arguments...);
</del><ins>+        log(channel, WTFLogLevelInfo, arguments...);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     template<typename... Arguments>
</span><span class="cx">     inline void debug(WTFLogChannel& channel, const Arguments&... arguments) const
</span><span class="cx">     {
</span><del>-        if (!willLog(channel, WTFLogLevel::Debug))
</del><ins>+        if (!willLog(channel, WTFLogLevelDebug))
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        log(channel, WTFLogLevel::Debug, arguments...);
</del><ins>+        log(channel, WTFLogLevelDebug, arguments...);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     inline bool willLog(const WTFLogChannel& channel, WTFLogLevel level) const
</span><span class="lines">@@ -174,10 +174,10 @@
</span><span class="cx">         if (!m_enabled)
</span><span class="cx">             return false;
</span><span class="cx"> 
</span><del>-        if (level <= WTFLogLevel::Error)
</del><ins>+        if (level <= WTFLogLevelError)
</ins><span class="cx">             return true;
</span><span class="cx"> 
</span><del>-        if (channel.state == WTFLogChannelState::Off || level > channel.level)
</del><ins>+        if (channel.state == WTFLogChannelOff || level > channel.level)
</ins><span class="cx">             return false;
</span><span class="cx"> 
</span><span class="cx">         return m_enabled;
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx">         os_log(channel.osLogChannel, "%{public}s", logMessage.utf8().data());
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-        if (channel.state == WTFLogChannelState::Off || level > channel.level)
</del><ins>+        if (channel.state == WTFLogChannelOff || level > channel.level)
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         for (Observer& observer : observers())
</span></span></pre></div>
<a id="trunkSourceWTFwtfMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MemoryPressureHandler.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MemoryPressureHandler.cpp   2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WTF/wtf/MemoryPressureHandler.cpp      2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx"> namespace WTF {
</span><span class="cx"> 
</span><span class="cx"> #if RELEASE_LOG_DISABLED
</span><del>-WTFLogChannel LogMemoryPressure = { WTFLogChannelState::On, "MemoryPressure", WTFLogLevel::Error };
</del><ins>+WTFLogChannel LogMemoryPressure = { WTFLogChannelOn, "MemoryPressure", WTFLogLevelError };
</ins><span class="cx"> #else
</span><del>-WTFLogChannel LogMemoryPressure = { WTFLogChannelState::On, "MemoryPressure", WTFLogLevel::Error, LOG_CHANNEL_WEBKIT_SUBSYSTEM, OS_LOG_DEFAULT };
</del><ins>+WTFLogChannel LogMemoryPressure = { WTFLogChannelOn, "MemoryPressure", WTFLogLevelError, LOG_CHANNEL_WEBKIT_SUBSYSTEM, OS_LOG_DEFAULT };
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> WTF_EXPORT_PRIVATE bool MemoryPressureHandler::ReliefLogger::s_loggingEnabled = false;
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefCountedLeakCountercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefCountedLeakCounter.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefCountedLeakCounter.cpp   2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WTF/wtf/RefCountedLeakCounter.cpp      2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -40,9 +40,9 @@
</span><span class="cx"> 
</span><span class="cx"> #define LOG_CHANNEL_PREFIX Log
</span><span class="cx"> #if RELEASE_LOG_DISABLED
</span><del>-static WTFLogChannel LogRefCountedLeaks = { WTFLogChannelState::On, "RefCountedLeaks", WTFLogLevel::Error };
</del><ins>+static WTFLogChannel LogRefCountedLeaks = { WTFLogChannelOn, "RefCountedLeaks", WTFLogLevelError };
</ins><span class="cx"> #else
</span><del>-static WTFLogChannel LogRefCountedLeaks = { WTFLogChannelState::On, "RefCountedLeaks", WTFLogLevel::Error, LOG_CHANNEL_WEBKIT_SUBSYSTEM, OS_LOG_DEFAULT };
</del><ins>+static WTFLogChannel LogRefCountedLeaks = { WTFLogChannelOn, "RefCountedLeaks", WTFLogLevelError, LOG_CHANNEL_WEBKIT_SUBSYSTEM, OS_LOG_DEFAULT };
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> typedef HashCountedSet<const char*, PtrHash<const char*>> ReasonSet;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/ChangeLog      2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-03-19  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, rolling out r243132.
+
+        Broke GTK build
+
+        Reverted changeset:
+
+        "Make WTFLogChannelState and WTFLogLevel enum classes"
+        https://bugs.webkit.org/show_bug.cgi?id=195904
+        https://trac.webkit.org/changeset/243132
+
</ins><span class="cx"> 2019-03-19  Antti Koivisto  <antti@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Layer with no backing store should still hit-test over a scroller
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp        2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp   2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -741,7 +741,7 @@
</span><span class="cx">     size_t bytesRemoved = 0;
</span><span class="cx">     auto logIdentifier = WTF::Logger::LogSiteIdentifier(buffer->logClassName(), logPrefix, buffer->logIdentifier());
</span><span class="cx">     auto& logger = buffer->logger();
</span><del>-    auto willLog = logger.willLog(buffer->logChannel(), WTFLogLevel::Debug);
</del><ins>+    auto willLog = logger.willLog(buffer->logChannel(), WTFLogLevelDebug);
</ins><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(logPrefix);
</span><span class="cx">     UNUSED_PARAM(buffer);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp    2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp       2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -865,7 +865,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         for (auto iterator = report->begin(); iterator != report->end(); ++iterator) {
</span><del>-            if (logger().willLog(logChannel(), WTFLogLevel::Debug)) {
</del><ins>+            if (logger().willLog(logChannel(), WTFLogLevelDebug)) {
</ins><span class="cx">                 // Stats are very verbose, let's only display them in inspector console in verbose mode.
</span><span class="cx">                 logger().debug(LogWebRTC,
</span><span class="cx">                     Logger::LogSiteIdentifier("LibWebRTCMediaEndpoint", "OnStatsDelivered", logIdentifier()),
</span><span class="lines">@@ -904,7 +904,7 @@
</span><span class="cx"> 
</span><span class="cx"> Seconds LibWebRTCMediaEndpoint::statsLogInterval(int64_t reportTimestamp) const
</span><span class="cx"> {
</span><del>-    if (logger().willLog(logChannel(), WTFLogLevel::Info))
</del><ins>+    if (logger().willLog(logChannel(), WTFLogLevelInfo))
</ins><span class="cx">         return 2_s;
</span><span class="cx"> 
</span><span class="cx">     if (reportTimestamp - m_statsFirstDeliveredTimestamp > 15000000)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp    2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/dom/Document.cpp       2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -8538,18 +8538,18 @@
</span><span class="cx"> static MessageLevel messageLevelFromWTFLogLevel(WTFLogLevel level)
</span><span class="cx"> {
</span><span class="cx">     switch (level) {
</span><del>-    case WTFLogLevel::Always:
</del><ins>+    case WTFLogLevelAlways:
</ins><span class="cx">         return MessageLevel::Log;
</span><del>-    case WTFLogLevel::Error:
</del><ins>+    case WTFLogLevelError:
</ins><span class="cx">         return MessageLevel::Error;
</span><span class="cx">         break;
</span><del>-    case WTFLogLevel::Warning:
</del><ins>+    case WTFLogLevelWarning:
</ins><span class="cx">         return MessageLevel::Warning;
</span><span class="cx">         break;
</span><del>-    case WTFLogLevel::Info:
</del><ins>+    case WTFLogLevelInfo:
</ins><span class="cx">         return MessageLevel::Info;
</span><span class="cx">         break;
</span><del>-    case WTFLogLevel::Debug:
</del><ins>+    case WTFLogLevelDebug:
</ins><span class="cx">         return MessageLevel::Debug;
</span><span class="cx">         break;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlFTPDirectoryDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/FTPDirectoryDocument.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/FTPDirectoryDocument.cpp       2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/html/FTPDirectoryDocument.cpp  2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx">     : HTMLDocument(frame, url)
</span><span class="cx"> {
</span><span class="cx"> #if !LOG_DISABLED
</span><del>-    LogFTP.state = WTFLogChannelState::On;
</del><ins>+    LogFTP.state = WTFLogChannelOn;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp   2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp      2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -3075,7 +3075,7 @@
</span><span class="cx">     // time scale, we will ask the media engine to "seek" to the current movie time, which may be a noop and
</span><span class="cx">     // not generate a timechanged callback. This means m_seeking will never be cleared and we will never
</span><span class="cx">     // fire a 'seeked' event.
</span><del>-    if (willLog(WTFLogLevel::Debug)) {
</del><ins>+    if (willLog(WTFLogLevelDebug)) {
</ins><span class="cx">         MediaTime mediaTime = m_player->mediaTimeForTimeValue(time);
</span><span class="cx">         if (time != mediaTime)
</span><span class="cx">             INFO_LOG(LOGIDENTIFIER, time, " media timeline equivalent is ", mediaTime);
</span><span class="lines">@@ -4651,7 +4651,7 @@
</span><span class="cx">     UNUSED_PARAM(keySystem);
</span><span class="cx"> 
</span><span class="cx">     // Don't log if this was just called to find out if there are any valid <source> elements.
</span><del>-    bool shouldLog = willLog(WTFLogLevel::Debug) && actionIfInvalid != DoNothing;
</del><ins>+    bool shouldLog = willLog(WTFLogLevelDebug) && actionIfInvalid != DoNothing;
</ins><span class="cx">     if (shouldLog)
</span><span class="cx">         INFO_LOG(LOGIDENTIFIER);
</span><span class="cx"> 
</span><span class="lines">@@ -4750,7 +4750,7 @@
</span><span class="cx"> 
</span><span class="cx"> void HTMLMediaElement::sourceWasAdded(HTMLSourceElement& source)
</span><span class="cx"> {
</span><del>-    if (willLog(WTFLogLevel::Info) && source.hasTagName(sourceTag)) {
</del><ins>+    if (willLog(WTFLogLevelInfo) && source.hasTagName(sourceTag)) {
</ins><span class="cx">         URL url = source.getNonEmptyURLAttribute(srcAttr);
</span><span class="cx">         INFO_LOG(LOGIDENTIFIER, "'src' is ", url);
</span><span class="cx">     }
</span><span class="lines">@@ -4802,7 +4802,7 @@
</span><span class="cx"> 
</span><span class="cx"> void HTMLMediaElement::sourceWasRemoved(HTMLSourceElement& source)
</span><span class="cx"> {
</span><del>-    if (willLog(WTFLogLevel::Info) && source.hasTagName(sourceTag)) {
</del><ins>+    if (willLog(WTFLogLevelInfo) && source.hasTagName(sourceTag)) {
</ins><span class="cx">         URL url = source.getNonEmptyURLAttribute(srcAttr);
</span><span class="cx">         INFO_LOG(LOGIDENTIFIER, "'src' is ", url);
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectoragentsWebConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp        2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp   2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -68,15 +68,15 @@
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         auto level = Inspector::Protocol::Console::ChannelLevel::Off;
</span><del>-        if (logChannel->state != WTFLogChannelState::Off) {
</del><ins>+        if (logChannel->state != WTFLogChannelOff) {
</ins><span class="cx">             switch (logChannel->level) {
</span><del>-            case WTFLogLevel::Always:
-            case WTFLogLevel::Error:
-            case WTFLogLevel::Warning:
-            case WTFLogLevel::Info:
</del><ins>+            case WTFLogLevelAlways:
+            case WTFLogLevelError:
+            case WTFLogLevelWarning:
+            case WTFLogLevelInfo:
</ins><span class="cx">                 level = Inspector::Protocol::Console::ChannelLevel::Basic;
</span><span class="cx">                 break;
</span><del>-            case WTFLogLevel::Debug:
</del><ins>+            case WTFLogLevelDebug:
</ins><span class="cx">                 level = Inspector::Protocol::Console::ChannelLevel::Verbose;
</span><span class="cx">                 break;
</span><span class="cx">             }
</span><span class="lines">@@ -96,14 +96,14 @@
</span><span class="cx">     WTFLogLevel level;
</span><span class="cx"> 
</span><span class="cx">     if (equalIgnoringASCIICase(levelString, "off")) {
</span><del>-        state = WTFLogChannelState::Off;
-        level = WTFLogLevel::Error;
</del><ins>+        state = WTFLogChannelOff;
+        level = WTFLogLevelError;
</ins><span class="cx">     } else {
</span><del>-        state = WTFLogChannelState::On;
</del><ins>+        state = WTFLogChannelOn;
</ins><span class="cx">         if (equalIgnoringASCIICase(levelString, "basic"))
</span><del>-            level = WTFLogLevel::Warning;
</del><ins>+            level = WTFLogLevelWarning;
</ins><span class="cx">         else if (equalIgnoringASCIICase(levelString, "verbose"))
</span><del>-            level = WTFLogLevel::Debug;
</del><ins>+            level = WTFLogLevelDebug;
</ins><span class="cx">         else
</span><span class="cx">             return WTF::nullopt;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Logging.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Logging.cpp        2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/platform/Logging.cpp   2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">     WTFLogChannel* channel = WTFLogChannelByName(logChannels, logChannelCount, name.utf8().data());
</span><span class="cx">     if (!channel)
</span><span class="cx">         return false;
</span><del>-    return channel->state != WTFLogChannelState::Off;
</del><ins>+    return channel->state != WTFLogChannelOff;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static bool logChannelsNeedInitialization = true;
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">     if (!channel)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    channel->state = WTFLogChannelState::OnWithAccumulation;
</del><ins>+    channel->state = WTFLogChannelOnWithAccumulation;
</ins><span class="cx">     logChannelsNeedInitialization = true;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm   2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm      2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -3551,7 +3551,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx"> #if !RELEASE_LOG_DISABLED
</span><del>-        if (player->logger().willLog(player->logChannel(), WTFLogLevel::Debug) && !([keyPath isEqualToString:@"loadedTimeRanges"] || [keyPath isEqualToString:@"seekableTimeRanges"])) {
</del><ins>+        if (player->logger().willLog(player->logChannel(), WTFLogLevelDebug) && !([keyPath isEqualToString:@"loadedTimeRanges"] || [keyPath isEqualToString:@"seekableTimeRanges"])) {
</ins><span class="cx">             auto identifier = Logger::LogSiteIdentifier("MediaPlayerPrivateAVFoundation", "observeValueForKeyPath", player->logIdentifier());
</span><span class="cx"> 
</span><span class="cx">             if (shouldLogValue) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm    2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx">     sample.offsetTimestampsBy(timelineOffset);
</span><span class="cx">     DEBUG_LOG(LOGIDENTIFIER, "updated sample = ", sample);
</span><span class="cx"> 
</span><del>-    if (WILL_LOG(WTFLogLevel::Debug)) {
</del><ins>+    if (WILL_LOG(WTFLogLevelDebug)) {
</ins><span class="cx">         MediaTime now = streamTime();
</span><span class="cx">         double delta = (sample.presentationTime() - now).toDouble();
</span><span class="cx">         if (delta < 0)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp     2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp        2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> static inline bool compositingLogEnabled()
</span><span class="cx"> {
</span><span class="cx"> #if !LOG_DISABLED
</span><del>-    return LogCompositing.state == WTFLogChannelState::On;
</del><ins>+    return LogCompositing.state == WTFLogChannelOn;
</ins><span class="cx"> #else
</span><span class="cx">     return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp        2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp   2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -142,18 +142,18 @@
</span><span class="cx"> {
</span><span class="cx"> #if defined(NDEBUG)
</span><span class="cx"> #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</span><del>-    if (LogWebRTC.state != WTFLogChannelState::On)
</del><ins>+    if (LogWebRTC.state != WTFLogChannelOn)
</ins><span class="cx">         return rtc::LS_ERROR;
</span><span class="cx"> 
</span><span class="cx">     switch (LogWebRTC.level) {
</span><del>-    case WTFLogLevel::Always:
-    case WTFLogLevel::Error:
</del><ins>+    case WTFLogLevelAlways:
+    case WTFLogLevelError:
</ins><span class="cx">         return rtc::LS_ERROR;
</span><del>-    case WTFLogLevel::Warning:
</del><ins>+    case WTFLogLevelWarning:
</ins><span class="cx">         return rtc::LS_WARNING;
</span><del>-    case WTFLogLevel::Info:
</del><ins>+    case WTFLogLevelInfo:
</ins><span class="cx">         return rtc::LS_INFO;
</span><del>-    case WTFLogLevel::Debug:
</del><ins>+    case WTFLogLevelDebug:
</ins><span class="cx">         return rtc::LS_VERBOSE;
</span><span class="cx">     }
</span><span class="cx"> #else
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx">     return rtc::LS_NONE;
</span><span class="cx"> #endif
</span><span class="cx"> #else
</span><del>-    return (LogWebRTC.state != WTFLogChannelState::On) ? rtc::LS_WARNING : rtc::LS_INFO;
</del><ins>+    return (LogWebRTC.state != WTFLogChannelOn) ? rtc::LS_WARNING : rtc::LS_INFO;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm    2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm       2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -745,7 +745,7 @@
</span><span class="cx">     bool willChange = [[change valueForKey:NSKeyValueChangeNotificationIsPriorKey] boolValue];
</span><span class="cx"> 
</span><span class="cx"> #if !RELEASE_LOG_DISABLED
</span><del>-    if (m_callback->loggerPtr() && m_callback->logger().willLog(m_callback->logChannel(), WTFLogLevel::Debug)) {
</del><ins>+    if (m_callback->loggerPtr() && m_callback->logger().willLog(m_callback->logChannel(), WTFLogLevelDebug)) {
</ins><span class="cx">         auto identifier = Logger::LogSiteIdentifier("AVVideoCaptureSource", "observeValueForKeyPath", m_callback->logIdentifier());
</span><span class="cx"> 
</span><span class="cx">         RetainPtr<NSString> valueString = adoptNS([[NSString alloc] initWithFormat:@"%@", newValue]);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp        2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp   2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> void SoupNetworkSession::setupLogger()
</span><span class="cx"> {
</span><span class="cx"> #if !LOG_DISABLED
</span><del>-    if (LogNetwork.state != WTFLogChannelState::On || soup_session_get_feature(m_soupSession.get(), SOUP_TYPE_LOGGER))
</del><ins>+    if (LogNetwork.state != WTFLogChannelOn || soup_session_get_feature(m_soupSession.get(), SOUP_TYPE_LOGGER))
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     GRefPtr<SoupLogger> logger = adoptGRef(soup_logger_new(SOUP_LOGGER_LOG_BODY, -1));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp    2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> static inline bool compositingLogEnabled()
</span><span class="cx"> {
</span><del>-    return LogCompositing.state == WTFLogChannelState::On;
</del><ins>+    return LogCompositing.state == WTFLogChannelOn;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebKit/ChangeLog       2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-03-19  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, rolling out r243132.
+
+        Broke GTK build
+
+        Reverted changeset:
+
+        "Make WTFLogChannelState and WTFLogLevel enum classes"
+        https://bugs.webkit.org/show_bug.cgi?id=195904
+        https://trac.webkit.org/changeset/243132
+
</ins><span class="cx"> 2019-03-19  Antti Koivisto  <antti@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Layer with no backing store should still hit-test over a scroller
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp  2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp     2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> static void logSpeculativeLoadingDiagnosticMessage(NetworkProcess& networkProcess, const GlobalFrameID& frameID, const String& message)
</span><span class="cx"> {
</span><span class="cx"> #if !LOG_DISABLED
</span><del>-    if (WebKit2LogNetworkCacheSpeculativePreloading.state == WTFLogChannelState::On)
</del><ins>+    if (WebKit2LogNetworkCacheSpeculativePreloading.state == WTFLogChannelOn)
</ins><span class="cx">         allSpeculativeLoadingDiagnosticMessages().add(message);
</span><span class="cx"> #endif
</span><span class="cx">     networkProcess.logDiagnosticMessage(frameID.first, WebCore::DiagnosticLoggingKeys::networkCacheKey(), message, WebCore::ShouldSample::Yes);
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcesswebrtcNetworkRTCProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp 2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp    2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> #if defined(NDEBUG)
</span><span class="cx">     rtc::LogMessage::LogToDebug(rtc::LS_NONE);
</span><span class="cx"> #else
</span><del>-    if (WebKit2LogWebRTC.state != WTFLogChannelState::On)
</del><ins>+    if (WebKit2LogWebRTC.state != WTFLogChannelOn)
</ins><span class="cx">         rtc::LogMessage::LogToDebug(rtc::LS_WARNING);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Tools/ChangeLog       2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-03-19  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, rolling out r243132.
+
+        Broke GTK build
+
+        Reverted changeset:
+
+        "Make WTFLogChannelState and WTFLogLevel enum classes"
+        https://bugs.webkit.org/show_bug.cgi?id=195904
+        https://trac.webkit.org/changeset/243132
+
</ins><span class="cx"> 2019-03-19  Zan Dobersek  <zdobersek@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed follow-up to r243073, fixing WPE MiniBrowser launching.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/Logging.cpp (243134 => 243135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/Logging.cpp      2019-03-19 11:07:42 UTC (rev 243134)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/Logging.cpp 2019-03-19 13:25:16 UTC (rev 243135)
</span><span class="lines">@@ -72,10 +72,10 @@
</span><span class="cx">         m_stderr = fdopen(m_descriptors[0], "r");
</span><span class="cx"> 
</span><span class="cx">         WTFInitializeLogChannelStatesFromString(testLogChannels, logChannelCount, "all");
</span><del>-        WTFSetLogChannelLevel(&TestChannel1, WTFLogLevel::Error);
-        WTFSetLogChannelLevel(&TestChannel2, WTFLogLevel::Error);
-        WTFSetLogChannelLevel(&TestChannel3, WTFLogLevel::Error);
-        WTFSetLogChannelLevel(&TestChannel4, WTFLogLevel::Error);
</del><ins>+        WTFSetLogChannelLevel(&TestChannel1, WTFLogLevelError);
+        WTFSetLogChannelLevel(&TestChannel2, WTFLogLevelError);
+        WTFSetLogChannelLevel(&TestChannel3, WTFLogLevelError);
+        WTFSetLogChannelLevel(&TestChannel4, WTFLogLevelError);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     void TearDown() override
</span><span class="lines">@@ -110,86 +110,86 @@
</span><span class="cx"> 
</span><span class="cx"> TEST_F(LoggingTest, Initialization)
</span><span class="cx"> {
</span><del>-    EXPECT_EQ(TestChannel1.state, WTFLogChannelState::On);
-    EXPECT_EQ(TestChannel2.state, WTFLogChannelState::On);
-    EXPECT_EQ(TestChannel3.state, WTFLogChannelState::On);
-    EXPECT_EQ(TestChannel4.state, WTFLogChannelState::On);
</del><ins>+    EXPECT_EQ(TestChannel1.state, WTFLogChannelOn);
+    EXPECT_EQ(TestChannel2.state, WTFLogChannelOn);
+    EXPECT_EQ(TestChannel3.state, WTFLogChannelOn);
+    EXPECT_EQ(TestChannel4.state, WTFLogChannelOn);
</ins><span class="cx"> 
</span><del>-    EXPECT_EQ(TestChannel1.level, WTFLogLevel::Error);
-    EXPECT_EQ(TestChannel2.level, WTFLogLevel::Error);
-    EXPECT_EQ(TestChannel3.level, WTFLogLevel::Error);
-    EXPECT_EQ(TestChannel4.level, WTFLogLevel::Error);
</del><ins>+    EXPECT_EQ(TestChannel1.level, WTFLogLevelError);
+    EXPECT_EQ(TestChannel2.level, WTFLogLevelError);
+    EXPECT_EQ(TestChannel3.level, WTFLogLevelError);
+    EXPECT_EQ(TestChannel4.level, WTFLogLevelError);
</ins><span class="cx"> 
</span><del>-    TestChannel1.state = WTFLogChannelState::Off;
</del><ins>+    TestChannel1.state = WTFLogChannelOff;
</ins><span class="cx">     WTFInitializeLogChannelStatesFromString(testLogChannels, logChannelCount, "Channel1");
</span><del>-    EXPECT_EQ(TestChannel1.level, WTFLogLevel::Error);
-    EXPECT_EQ(TestChannel1.state, WTFLogChannelState::On);
</del><ins>+    EXPECT_EQ(TestChannel1.level, WTFLogLevelError);
+    EXPECT_EQ(TestChannel1.state, WTFLogChannelOn);
</ins><span class="cx"> 
</span><del>-    TestChannel1.state = WTFLogChannelState::Off;
</del><ins>+    TestChannel1.state = WTFLogChannelOff;
</ins><span class="cx">     WTFInitializeLogChannelStatesFromString(testLogChannels, logChannelCount, "Channel1=foo");
</span><del>-    EXPECT_EQ(TestChannel1.level, WTFLogLevel::Error);
</del><ins>+    EXPECT_EQ(TestChannel1.level, WTFLogLevelError);
</ins><span class="cx"> #if TEST_OUTPUT
</span><span class="cx">     EXPECT_TRUE(output().contains("Unknown logging level: foo", false));
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     WTFInitializeLogChannelStatesFromString(testLogChannels, logChannelCount, "Channel1=warning");
</span><del>-    EXPECT_EQ(TestChannel1.level, WTFLogLevel::Warning);
-    EXPECT_EQ(TestChannel2.level, WTFLogLevel::Error);
-    EXPECT_EQ(TestChannel3.level, WTFLogLevel::Error);
-    EXPECT_EQ(TestChannel4.level, WTFLogLevel::Error);
</del><ins>+    EXPECT_EQ(TestChannel1.level, WTFLogLevelWarning);
+    EXPECT_EQ(TestChannel2.level, WTFLogLevelError);
+    EXPECT_EQ(TestChannel3.level, WTFLogLevelError);
+    EXPECT_EQ(TestChannel4.level, WTFLogLevelError);
</ins><span class="cx"> 
</span><span class="cx">     WTFInitializeLogChannelStatesFromString(testLogChannels, logChannelCount, "Channel4=   debug, Channel3 = info,Channel2=error");
</span><del>-    EXPECT_EQ(TestChannel1.level, WTFLogLevel::Warning);
-    EXPECT_EQ(TestChannel2.level, WTFLogLevel::Error);
-    EXPECT_EQ(TestChannel3.level, WTFLogLevel::Info);
-    EXPECT_EQ(TestChannel4.level, WTFLogLevel::Debug);
</del><ins>+    EXPECT_EQ(TestChannel1.level, WTFLogLevelWarning);
+    EXPECT_EQ(TestChannel2.level, WTFLogLevelError);
+    EXPECT_EQ(TestChannel3.level, WTFLogLevelInfo);
+    EXPECT_EQ(TestChannel4.level, WTFLogLevelDebug);
</ins><span class="cx"> 
</span><span class="cx">     WTFInitializeLogChannelStatesFromString(testLogChannels, logChannelCount, "-all");
</span><del>-    EXPECT_EQ(TestChannel1.state, WTFLogChannelState::Off);
-    EXPECT_EQ(TestChannel2.state, WTFLogChannelState::Off);
-    EXPECT_EQ(TestChannel3.state, WTFLogChannelState::Off);
-    EXPECT_EQ(TestChannel4.state, WTFLogChannelState::Off);
</del><ins>+    EXPECT_EQ(TestChannel1.state, WTFLogChannelOff);
+    EXPECT_EQ(TestChannel2.state, WTFLogChannelOff);
+    EXPECT_EQ(TestChannel3.state, WTFLogChannelOff);
+    EXPECT_EQ(TestChannel4.state, WTFLogChannelOff);
</ins><span class="cx"> 
</span><span class="cx">     WTFInitializeLogChannelStatesFromString(testLogChannels, logChannelCount, "all");
</span><del>-    EXPECT_EQ(TestChannel1.state, WTFLogChannelState::On);
-    EXPECT_EQ(TestChannel2.state, WTFLogChannelState::On);
-    EXPECT_EQ(TestChannel3.state, WTFLogChannelState::On);
-    EXPECT_EQ(TestChannel4.state, WTFLogChannelState::On);
</del><ins>+    EXPECT_EQ(TestChannel1.state, WTFLogChannelOn);
+    EXPECT_EQ(TestChannel2.state, WTFLogChannelOn);
+    EXPECT_EQ(TestChannel3.state, WTFLogChannelOn);
+    EXPECT_EQ(TestChannel4.state, WTFLogChannelOn);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST_F(LoggingTest, WTFWillLogWithLevel)
</span><span class="cx"> {
</span><del>-    EXPECT_EQ(TestChannel1.state, WTFLogChannelState::On);
-    EXPECT_EQ(TestChannel2.state, WTFLogChannelState::On);
-    EXPECT_EQ(TestChannel3.state, WTFLogChannelState::On);
-    EXPECT_EQ(TestChannel4.state, WTFLogChannelState::On);
</del><ins>+    EXPECT_EQ(TestChannel1.state, WTFLogChannelOn);
+    EXPECT_EQ(TestChannel2.state, WTFLogChannelOn);
+    EXPECT_EQ(TestChannel3.state, WTFLogChannelOn);
+    EXPECT_EQ(TestChannel4.state, WTFLogChannelOn);
</ins><span class="cx"> 
</span><del>-    EXPECT_EQ(TestChannel1.level, WTFLogLevel::Error);
-    EXPECT_EQ(TestChannel2.level, WTFLogLevel::Error);
-    EXPECT_EQ(TestChannel3.level, WTFLogLevel::Error);
-    EXPECT_EQ(TestChannel4.level, WTFLogLevel::Error);
</del><ins>+    EXPECT_EQ(TestChannel1.level, WTFLogLevelError);
+    EXPECT_EQ(TestChannel2.level, WTFLogLevelError);
+    EXPECT_EQ(TestChannel3.level, WTFLogLevelError);
+    EXPECT_EQ(TestChannel4.level, WTFLogLevelError);
</ins><span class="cx"> 
</span><del>-    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevel::Error));
-    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel2, WTFLogLevel::Error));
-    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel3, WTFLogLevel::Error));
-    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel4, WTFLogLevel::Error));
</del><ins>+    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevelError));
+    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel2, WTFLogLevelError));
+    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel3, WTFLogLevelError));
+    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel4, WTFLogLevelError));
</ins><span class="cx"> 
</span><del>-    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevel::Info));
-    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel2, WTFLogLevel::Info));
-    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel3, WTFLogLevel::Info));
-    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel4, WTFLogLevel::Info));
</del><ins>+    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevelInfo));
+    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel2, WTFLogLevelInfo));
+    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel3, WTFLogLevelInfo));
+    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel4, WTFLogLevelInfo));
</ins><span class="cx"> 
</span><del>-    TestChannel1.state = WTFLogChannelState::Off;
-    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevel::Error));
-    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevel::Info));
</del><ins>+    TestChannel1.state = WTFLogChannelOff;
+    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevelError));
+    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevelInfo));
</ins><span class="cx"> 
</span><del>-    TestChannel1.state = WTFLogChannelState::On;
-    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevel::Error));
-    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevel::Info));
</del><ins>+    TestChannel1.state = WTFLogChannelOn;
+    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevelError));
+    EXPECT_FALSE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevelInfo));
</ins><span class="cx"> 
</span><del>-    TestChannel1.level = WTFLogLevel::Info;
-    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevel::Error));
-    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevel::Info));
</del><ins>+    TestChannel1.level = WTFLogLevelInfo;
+    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevelError));
+    EXPECT_TRUE(WTFWillLogWithLevel(&TestChannel1, WTFLogLevelInfo));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if TEST_OUTPUT
</span><span class="lines">@@ -201,21 +201,21 @@
</span><span class="cx"> 
</span><span class="cx"> TEST_F(LoggingTest, LOG_WITH_LEVEL)
</span><span class="cx"> {
</span><del>-    LOG_WITH_LEVEL(Channel1, WTFLogLevel::Error, "Go and boil your bottoms, you sons of a silly person.");
</del><ins>+    LOG_WITH_LEVEL(Channel1, WTFLogLevelError, "Go and boil your bottoms, you sons of a silly person.");
</ins><span class="cx">     EXPECT_TRUE(output().contains("sons of a silly person.", false));
</span><span class="cx"> 
</span><del>-    LOG_WITH_LEVEL(Channel1, WTFLogLevel::Warning, "You don't frighten us, English pig dogs.");
</del><ins>+    LOG_WITH_LEVEL(Channel1, WTFLogLevelWarning, "You don't frighten us, English pig dogs.");
</ins><span class="cx">     EXPECT_EQ(0u, output().length());
</span><span class="cx"> 
</span><del>-    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevel::Info);
-    LOG_WITH_LEVEL(Channel1, WTFLogLevel::Warning, "I'm French. Why do you think I have this outrageous accent, you silly king?");
</del><ins>+    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevelInfo);
+    LOG_WITH_LEVEL(Channel1, WTFLogLevelWarning, "I'm French. Why do you think I have this outrageous accent, you silly king?");
</ins><span class="cx">     EXPECT_TRUE(output().contains("outrageous accent", false));
</span><span class="cx"> 
</span><del>-    LOG_WITH_LEVEL(Channel1, WTFLogLevel::Debug, "You don't frighten us with your silly knees-bent running around advancing behavior!");
</del><ins>+    LOG_WITH_LEVEL(Channel1, WTFLogLevelDebug, "You don't frighten us with your silly knees-bent running around advancing behavior!");
</ins><span class="cx">     EXPECT_EQ(0u, output().length());
</span><span class="cx"> 
</span><del>-    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevel::Debug);
-    LOG_WITH_LEVEL(Channel1, WTFLogLevel::Debug, "Go and tell your master that we have been charged by God with a sacred quest.");
</del><ins>+    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevelDebug);
+    LOG_WITH_LEVEL(Channel1, WTFLogLevelDebug, "Go and tell your master that we have been charged by God with a sacred quest.");
</ins><span class="cx">     EXPECT_TRUE(output().contains("sacred quest", false));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -238,21 +238,21 @@
</span><span class="cx"> 
</span><span class="cx"> TEST_F(LoggingTest, RELEASE_LOG_WITH_LEVEL)
</span><span class="cx"> {
</span><del>-    RELEASE_LOG_WITH_LEVEL(Channel1, WTFLogLevel::Error, "You don't frighten us, English pig dogs.");
</del><ins>+    RELEASE_LOG_WITH_LEVEL(Channel1, WTFLogLevelError, "You don't frighten us, English pig dogs.");
</ins><span class="cx">     EXPECT_TRUE(output().contains("pig dogs.", false));
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_WITH_LEVEL(Channel1, WTFLogLevel::Warning, "Go and boil your bottoms, you sons of a silly person.");
</del><ins>+    RELEASE_LOG_WITH_LEVEL(Channel1, WTFLogLevelWarning, "Go and boil your bottoms, you sons of a silly person.");
</ins><span class="cx">     EXPECT_EQ(0u, output().length());
</span><span class="cx"> 
</span><del>-    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevel::Info);
-    RELEASE_LOG_WITH_LEVEL(Channel1, WTFLogLevel::Warning, "I'm French. Why do you think I have this outrageous accent, you silly king?");
</del><ins>+    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevelInfo);
+    RELEASE_LOG_WITH_LEVEL(Channel1, WTFLogLevelWarning, "I'm French. Why do you think I have this outrageous accent, you silly king?");
</ins><span class="cx">     EXPECT_TRUE(output().contains("outrageous accent", false));
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_WITH_LEVEL(Channel1, WTFLogLevel::Debug, "You don't frighten us with your silly knees-bent running around advancing behavior!");
</del><ins>+    RELEASE_LOG_WITH_LEVEL(Channel1, WTFLogLevelDebug, "You don't frighten us with your silly knees-bent running around advancing behavior!");
</ins><span class="cx">     EXPECT_EQ(0u, output().length());
</span><span class="cx"> 
</span><del>-    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevel::Debug);
-    RELEASE_LOG_WITH_LEVEL(Channel1, WTFLogLevel::Debug, "Go and tell your master that we have been charged by God with a sacred quest.");
</del><ins>+    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevelDebug);
+    RELEASE_LOG_WITH_LEVEL(Channel1, WTFLogLevelDebug, "Go and tell your master that we have been charged by God with a sacred quest.");
</ins><span class="cx">     EXPECT_TRUE(output().contains("sacred quest", false));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -259,14 +259,14 @@
</span><span class="cx"> TEST_F(LoggingTest, RELEASE_LOG_WITH_LEVEL_IF)
</span><span class="cx"> {
</span><span class="cx">     bool enabled = true;
</span><del>-    RELEASE_LOG_WITH_LEVEL_IF(enabled, Channel1, WTFLogLevel::Error, "Is there someone else up there that we can talk to?");
</del><ins>+    RELEASE_LOG_WITH_LEVEL_IF(enabled, Channel1, WTFLogLevelError, "Is there someone else up there that we can talk to?");
</ins><span class="cx">     EXPECT_TRUE(output().contains("someone else", false));
</span><span class="cx"> 
</span><del>-    RELEASE_LOG_WITH_LEVEL_IF(enabled, Channel1, WTFLogLevel::Debug, "No, now go away");
</del><ins>+    RELEASE_LOG_WITH_LEVEL_IF(enabled, Channel1, WTFLogLevelDebug, "No, now go away");
</ins><span class="cx">     EXPECT_EQ(0u, output().length());
</span><span class="cx"> 
</span><span class="cx">     enabled = false;
</span><del>-    RELEASE_LOG_WITH_LEVEL_IF(enabled, Channel1, WTFLogLevel::Warning, "or I shall taunt you a second time! %i", 12);
</del><ins>+    RELEASE_LOG_WITH_LEVEL_IF(enabled, Channel1, WTFLogLevelWarning, "or I shall taunt you a second time! %i", 12);
</ins><span class="cx">     EXPECT_EQ(0u, output().length());
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -275,8 +275,8 @@
</span><span class="cx">     Ref<Logger> logger = Logger::create(this);
</span><span class="cx">     EXPECT_TRUE(logger->enabled());
</span><span class="cx"> 
</span><del>-    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevel::Error);
-    EXPECT_TRUE(logger->willLog(TestChannel1, WTFLogLevel::Error));
</del><ins>+    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevelError);
+    EXPECT_TRUE(logger->willLog(TestChannel1, WTFLogLevelError));
</ins><span class="cx">     logger->error(TestChannel1, "You're using coconuts!");
</span><span class="cx">     EXPECT_TRUE(output().contains("You're using coconuts!", false));
</span><span class="cx">     logger->warning(TestChannel1, "You're using coconuts!");
</span><span class="lines">@@ -305,15 +305,15 @@
</span><span class="cx">     logger->error(TestChannel1, "You've got ", 2, " empty halves of ", "coconuts!");
</span><span class="cx">     EXPECT_TRUE(output().contains("You've got 2 empty halves of coconuts!", false));
</span><span class="cx"> 
</span><del>-    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevel::Error);
</del><ins>+    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevelError);
</ins><span class="cx">     logger->logAlways(TestChannel1, "I shall taunt you a second time!");
</span><span class="cx">     EXPECT_TRUE(output().contains("I shall taunt you a second time!", false));
</span><span class="cx"> 
</span><span class="cx">     logger->setEnabled(this, false);
</span><del>-    EXPECT_FALSE(logger->willLog(TestChannel1, WTFLogLevel::Error));
-    EXPECT_FALSE(logger->willLog(TestChannel1, WTFLogLevel::Warning));
-    EXPECT_FALSE(logger->willLog(TestChannel1, WTFLogLevel::Info));
-    EXPECT_FALSE(logger->willLog(TestChannel1, WTFLogLevel::Debug));
</del><ins>+    EXPECT_FALSE(logger->willLog(TestChannel1, WTFLogLevelError));
+    EXPECT_FALSE(logger->willLog(TestChannel1, WTFLogLevelWarning));
+    EXPECT_FALSE(logger->willLog(TestChannel1, WTFLogLevelInfo));
+    EXPECT_FALSE(logger->willLog(TestChannel1, WTFLogLevelDebug));
</ins><span class="cx">     EXPECT_FALSE(logger->enabled());
</span><span class="cx">     logger->logAlways(TestChannel1, "You've got two empty halves of coconuts");
</span><span class="cx">     EXPECT_EQ(0u, output().length());
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx">     EXPECT_TRUE(result.contains(signature, false));
</span><span class="cx">     EXPECT_TRUE(result.contains("to the show that never", false));
</span><span class="cx"> 
</span><del>-    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevel::Warning);
</del><ins>+    WTFSetLogChannelLevel(&TestChannel1, WTFLogLevelWarning);
</ins><span class="cx"> 
</span><span class="cx">     ERROR_LOG(LOGIDENTIFIER, "We're so glad you could attend");
</span><span class="cx">     EXPECT_TRUE(output().contains("We're so glad you could attend", false));
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> 
</span><span class="cx">     StringBuilder m_logBuffer;
</span><span class="cx">     WTFLogChannel m_lastChannel;
</span><del>-    WTFLogLevel m_lastLevel { WTFLogLevel::Error };
</del><ins>+    WTFLogLevel m_lastLevel { WTFLogLevelError };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> #if !RELEASE_LOG_DISABLED
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx">     EXPECT_TRUE(this->output().contains("testing 1, 2, 3", false));
</span><span class="cx">     EXPECT_TRUE(observer.log().contains("testing 1, 2, 3", false));
</span><span class="cx">     EXPECT_STREQ(observer.channel().name, logChannel().name);
</span><del>-    EXPECT_EQ(static_cast<int>(WTFLogLevel::Always), static_cast<int>(observer.level()));
</del><ins>+    EXPECT_EQ(static_cast<int>(WTFLogLevelAlways), static_cast<int>(observer.level()));
</ins><span class="cx"> 
</span><span class="cx">     logger().removeObserver(observer);
</span><span class="cx">     ALWAYS_LOG("testing ", 1, ", ", 2, ", 3");
</span></span></pre>
</div>
</div>

</body>
</html>