<!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>[225643] 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/225643">225643</a></dd>
<dt>Author</dt> <dd>jlewis3@apple.com</dd>
<dt>Date</dt> <dd>2017-12-07 13:28:19 -0800 (Thu, 07 Dec 2017)</dd>
</dl>

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

This caused layout tests to time out.

Reverted changeset:

"Simplify log channel configuration UI"
https://bugs.webkit.org/show_bug.cgi?id=180527
https://trac.webkit.org/changeset/225634</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolConsolejson">trunk/Source/JavaScriptCore/inspector/protocol/Console.json</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectoragentsWebConsoleAgentcpp">trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsLoggingChanneljs">trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSettingsTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (225642 => 225643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/JavaScriptCore/ChangeLog       2017-12-07 21:28:19 UTC (rev 225643)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-12-07  Matt Lewis  <jlewis3@apple.com>
+
+        Unreviewed, rolling out r225634.
+
+        This caused layout tests to time out.
+
+        Reverted changeset:
+
+        "Simplify log channel configuration UI"
+        https://bugs.webkit.org/show_bug.cgi?id=180527
+        https://trac.webkit.org/changeset/225634
+
</ins><span class="cx"> 2017-12-07  Eric Carlson  <eric.carlson@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Simplify log channel configuration UI
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolConsolejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Console.json (225642 => 225643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Console.json      2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Console.json 2017-12-07 21:28:19 UTC (rev 225643)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">         {
</span><span class="cx">             "id": "ChannelLevel",
</span><span class="cx">             "type": "string",
</span><del>-            "enum": ["off", "basic", "verbose"],
</del><ins>+            "enum": ["off", "log", "error", "warning", "info", "debug"],
</ins><span class="cx">             "description": "Level of logging."
</span><span class="cx">         },
</span><span class="cx">         {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (225642 => 225643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/WebCore/ChangeLog      2017-12-07 21:28:19 UTC (rev 225643)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-12-07  Matt Lewis  <jlewis3@apple.com>
+
+        Unreviewed, rolling out r225634.
+
+        This caused layout tests to time out.
+
+        Reverted changeset:
+
+        "Simplify log channel configuration UI"
+        https://bugs.webkit.org/show_bug.cgi?id=180527
+        https://trac.webkit.org/changeset/225634
+
</ins><span class="cx"> 2017-12-07  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [EME] Support the 'encrypted' event for FPS encrypted streams
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectoragentsWebConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp (225642 => 225643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp        2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp   2017-12-07 21:28:19 UTC (rev 225643)
</span><span class="lines">@@ -66,17 +66,23 @@
</span><span class="cx">         if (!logChannel)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        auto level = Inspector::Protocol::Console::ChannelLevel::Off;
</del><ins>+        Inspector::Protocol::Console::ChannelLevel level = Inspector::Protocol::Console::ChannelLevel::Off;
</ins><span class="cx">         if (logChannel->state != WTFLogChannelOff) {
</span><span class="cx">             switch (logChannel->level) {
</span><span class="cx">             case WTFLogLevelAlways:
</span><ins>+                level = Inspector::Protocol::Console::ChannelLevel::Log;
+                break;
</ins><span class="cx">             case WTFLogLevelError:
</span><ins>+                level = Inspector::Protocol::Console::ChannelLevel::Error;
+                break;
</ins><span class="cx">             case WTFLogLevelWarning:
</span><del>-                level = Inspector::Protocol::Console::ChannelLevel::Basic;
</del><ins>+                level = Inspector::Protocol::Console::ChannelLevel::Warning;
</ins><span class="cx">                 break;
</span><span class="cx">             case WTFLogLevelInfo:
</span><ins>+                level = Inspector::Protocol::Console::ChannelLevel::Info;
+                break;
</ins><span class="cx">             case WTFLogLevelDebug:
</span><del>-                level = Inspector::Protocol::Console::ChannelLevel::Verbose;
</del><ins>+                level = Inspector::Protocol::Console::ChannelLevel::Debug;
</ins><span class="cx">                 break;
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="lines">@@ -99,9 +105,15 @@
</span><span class="cx">         level = WTFLogLevelError;
</span><span class="cx">     } else {
</span><span class="cx">         state = WTFLogChannelOn;
</span><del>-        if (equalIgnoringASCIICase(levelString, "basic"))
</del><ins>+        if (equalIgnoringASCIICase(levelString, "log"))
+            level = WTFLogLevelAlways;
+        else if (equalIgnoringASCIICase(levelString, "error"))
+            level = WTFLogLevelError;
+        else if (equalIgnoringASCIICase(levelString, "warning"))
</ins><span class="cx">             level = WTFLogLevelWarning;
</span><del>-        else if (equalIgnoringASCIICase(levelString, "verbose"))
</del><ins>+        else if (equalIgnoringASCIICase(levelString, "info"))
+            level = WTFLogLevelInfo;
+        else if (equalIgnoringASCIICase(levelString, "debug"))
</ins><span class="cx">             level = WTFLogLevelDebug;
</span><span class="cx">         else
</span><span class="cx">             return std::nullopt;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (225642 => 225643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/WebInspectorUI/ChangeLog       2017-12-07 21:28:19 UTC (rev 225643)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-12-07  Matt Lewis  <jlewis3@apple.com>
+
+        Unreviewed, rolling out r225634.
+
+        This caused layout tests to time out.
+
+        Reverted changeset:
+
+        "Simplify log channel configuration UI"
+        https://bugs.webkit.org/show_bug.cgi?id=180527
+        https://trac.webkit.org/changeset/225634
+
</ins><span class="cx"> 2017-12-07  Eric Carlson  <eric.carlson@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Simplify log channel configuration UI
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (225642 => 225643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js   2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js      2017-12-07 21:28:19 UTC (rev 225643)
</span><span class="lines">@@ -128,7 +128,6 @@
</span><span class="cx"> localizedStrings["Back (%s)"] = "Back (%s)";
</span><span class="cx"> localizedStrings["Background"] = "Background";
</span><span class="cx"> localizedStrings["Backtrace"] = "Backtrace";
</span><del>-localizedStrings["Basic"] = "Basic";
</del><span class="cx"> localizedStrings["Basis"] = "Basis";
</span><span class="cx"> localizedStrings["Beacon"] = "Beacon";
</span><span class="cx"> localizedStrings["Beacons"] = "Beacons";
</span><span class="lines">@@ -275,6 +274,7 @@
</span><span class="cx"> localizedStrings["Database no longer has expected version."] = "Database no longer has expected version.";
</span><span class="cx"> localizedStrings["Databases"] = "Databases";
</span><span class="cx"> localizedStrings["Date"] = "Date";
</span><ins>+localizedStrings["Debug"] = "Debug";
</ins><span class="cx"> localizedStrings["Debug: "] = "Debug: ";
</span><span class="cx"> localizedStrings["Debugger"] = "Debugger";
</span><span class="cx"> localizedStrings["Debugger Paused"] = "Debugger Paused";
</span><span class="lines">@@ -498,6 +498,7 @@
</span><span class="cx"> localizedStrings["Index"] = "Index";
</span><span class="cx"> localizedStrings["Index Key \u2014 %s"] = "Index Key \u2014 %s";
</span><span class="cx"> localizedStrings["Indexed Databases"] = "Indexed Databases";
</span><ins>+localizedStrings["Info"] = "Info";
</ins><span class="cx"> localizedStrings["Info: "] = "Info: ";
</span><span class="cx"> localizedStrings["Infos"] = "Infos";
</span><span class="cx"> localizedStrings["Inherited From"] = "Inherited From";
</span><span class="lines">@@ -555,6 +556,7 @@
</span><span class="cx"> localizedStrings["Local Variables"] = "Local Variables";
</span><span class="cx"> localizedStrings["Located at %s"] = "Located at %s";
</span><span class="cx"> localizedStrings["Location"] = "Location";
</span><ins>+localizedStrings["Log"] = "Log";
</ins><span class="cx"> localizedStrings["Log Canvas Context"] = "Log Canvas Context";
</span><span class="cx"> localizedStrings["Log Element"] = "Log Element";
</span><span class="cx"> localizedStrings["Log Frame Text"] = "Log Frame Text";
</span><span class="lines">@@ -1005,7 +1007,6 @@
</span><span class="cx"> localizedStrings["Value"] = "Value";
</span><span class="cx"> localizedStrings["Variables"] = "Variables";
</span><span class="cx"> localizedStrings["Variants"] = "Variants";
</span><del>-localizedStrings["Verbose"] = "Verbose";
</del><span class="cx"> localizedStrings["Version"] = "Version";
</span><span class="cx"> localizedStrings["Vertex"] = "Vertex";
</span><span class="cx"> localizedStrings["Vertex Shader"] = "Vertex Shader";
</span><span class="lines">@@ -1018,6 +1019,7 @@
</span><span class="cx"> localizedStrings["Waiting"] = "Waiting";
</span><span class="cx"> localizedStrings["Waiting for canvas contexts created by script or CSS."] = "Waiting for canvas contexts created by script or CSS.";
</span><span class="cx"> localizedStrings["Waiting for frames…"] = "Waiting for frames…";
</span><ins>+localizedStrings["Warning"] = "Warning";
</ins><span class="cx"> localizedStrings["Warning: "] = "Warning: ";
</span><span class="cx"> localizedStrings["Warnings"] = "Warnings";
</span><span class="cx"> localizedStrings["Watch Expressions"] = "Watch Expressions";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsLoggingChanneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js (225642 => 225643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js       2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js  2017-12-07 21:28:19 UTC (rev 225643)
</span><span class="lines">@@ -52,6 +52,9 @@
</span><span class="cx"> 
</span><span class="cx"> WI.LoggingChannel.Level = {
</span><span class="cx">     Off: "off",
</span><del>-    Basic: "basic",
-    Verbose: "verbose",
</del><ins>+    Log: "log",
+    Error: "error",
+    Warning: "warning",
+    Info: "info",
+    Debug: "debug",
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSettingsTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js (225642 => 225643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js        2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js   2017-12-07 21:28:19 UTC (rev 225643)
</span><span class="lines">@@ -217,8 +217,11 @@
</span><span class="cx">         if (WI.LogManager.supportsLogChannels()) {
</span><span class="cx">             const logLevels = [
</span><span class="cx">                 [WI.LoggingChannel.Level.Off, WI.UIString("Off")],
</span><del>-                [WI.LoggingChannel.Level.Basic, WI.UIString("Basic")],
-                [WI.LoggingChannel.Level.Verbose, WI.UIString("Verbose")],
</del><ins>+                [WI.LoggingChannel.Level.Log, WI.UIString("Log")],
+                [WI.LoggingChannel.Level.Error, WI.UIString("Error")],
+                [WI.LoggingChannel.Level.Warning, WI.UIString("Warning")],
+                [WI.LoggingChannel.Level.Info, WI.UIString("Info")],
+                [WI.LoggingChannel.Level.Debug, WI.UIString("Debug")],
</ins><span class="cx">             ];
</span><span class="cx">             const editorLabels = {
</span><span class="cx">                 media: WI.UIString("Media Logging:"),
</span></span></pre>
</div>
</div>

</body>
</html>