Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (225642 => 225643)
--- trunk/Source/_javascript_Core/ChangeLog 2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-12-07 21:28:19 UTC (rev 225643)
@@ -1,3 +1,15 @@
+2017-12-07 Matt Lewis <[email protected]>
+
+ 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
+
2017-12-07 Eric Carlson <[email protected]>
Simplify log channel configuration UI
Modified: trunk/Source/_javascript_Core/inspector/protocol/Console.json (225642 => 225643)
--- trunk/Source/_javascript_Core/inspector/protocol/Console.json 2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/_javascript_Core/inspector/protocol/Console.json 2017-12-07 21:28:19 UTC (rev 225643)
@@ -12,7 +12,7 @@
{
"id": "ChannelLevel",
"type": "string",
- "enum": ["off", "basic", "verbose"],
+ "enum": ["off", "log", "error", "warning", "info", "debug"],
"description": "Level of logging."
},
{
Modified: trunk/Source/WebCore/ChangeLog (225642 => 225643)
--- 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)
@@ -1,3 +1,15 @@
+2017-12-07 Matt Lewis <[email protected]>
+
+ 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
+
2017-12-07 Jer Noble <[email protected]>
[EME] Support the 'encrypted' event for FPS encrypted streams
Modified: trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp (225642 => 225643)
--- 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)
@@ -66,17 +66,23 @@
if (!logChannel)
return;
- auto level = Inspector::Protocol::Console::ChannelLevel::Off;
+ Inspector::Protocol::Console::ChannelLevel level = Inspector::Protocol::Console::ChannelLevel::Off;
if (logChannel->state != WTFLogChannelOff) {
switch (logChannel->level) {
case WTFLogLevelAlways:
+ level = Inspector::Protocol::Console::ChannelLevel::Log;
+ break;
case WTFLogLevelError:
+ level = Inspector::Protocol::Console::ChannelLevel::Error;
+ break;
case WTFLogLevelWarning:
- level = Inspector::Protocol::Console::ChannelLevel::Basic;
+ level = Inspector::Protocol::Console::ChannelLevel::Warning;
break;
case WTFLogLevelInfo:
+ level = Inspector::Protocol::Console::ChannelLevel::Info;
+ break;
case WTFLogLevelDebug:
- level = Inspector::Protocol::Console::ChannelLevel::Verbose;
+ level = Inspector::Protocol::Console::ChannelLevel::Debug;
break;
}
}
@@ -99,9 +105,15 @@
level = WTFLogLevelError;
} else {
state = WTFLogChannelOn;
- if (equalIgnoringASCIICase(levelString, "basic"))
+ if (equalIgnoringASCIICase(levelString, "log"))
+ level = WTFLogLevelAlways;
+ else if (equalIgnoringASCIICase(levelString, "error"))
+ level = WTFLogLevelError;
+ else if (equalIgnoringASCIICase(levelString, "warning"))
level = WTFLogLevelWarning;
- else if (equalIgnoringASCIICase(levelString, "verbose"))
+ else if (equalIgnoringASCIICase(levelString, "info"))
+ level = WTFLogLevelInfo;
+ else if (equalIgnoringASCIICase(levelString, "debug"))
level = WTFLogLevelDebug;
else
return std::nullopt;
Modified: trunk/Source/WebInspectorUI/ChangeLog (225642 => 225643)
--- 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)
@@ -1,3 +1,15 @@
+2017-12-07 Matt Lewis <[email protected]>
+
+ 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
+
2017-12-07 Eric Carlson <[email protected]>
Simplify log channel configuration UI
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (225642 => 225643)
--- 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)
@@ -128,7 +128,6 @@
localizedStrings["Back (%s)"] = "Back (%s)";
localizedStrings["Background"] = "Background";
localizedStrings["Backtrace"] = "Backtrace";
-localizedStrings["Basic"] = "Basic";
localizedStrings["Basis"] = "Basis";
localizedStrings["Beacon"] = "Beacon";
localizedStrings["Beacons"] = "Beacons";
@@ -275,6 +274,7 @@
localizedStrings["Database no longer has expected version."] = "Database no longer has expected version.";
localizedStrings["Databases"] = "Databases";
localizedStrings["Date"] = "Date";
+localizedStrings["Debug"] = "Debug";
localizedStrings["Debug: "] = "Debug: ";
localizedStrings["Debugger"] = "Debugger";
localizedStrings["Debugger Paused"] = "Debugger Paused";
@@ -498,6 +498,7 @@
localizedStrings["Index"] = "Index";
localizedStrings["Index Key \u2014 %s"] = "Index Key \u2014 %s";
localizedStrings["Indexed Databases"] = "Indexed Databases";
+localizedStrings["Info"] = "Info";
localizedStrings["Info: "] = "Info: ";
localizedStrings["Infos"] = "Infos";
localizedStrings["Inherited From"] = "Inherited From";
@@ -555,6 +556,7 @@
localizedStrings["Local Variables"] = "Local Variables";
localizedStrings["Located at %s"] = "Located at %s";
localizedStrings["Location"] = "Location";
+localizedStrings["Log"] = "Log";
localizedStrings["Log Canvas Context"] = "Log Canvas Context";
localizedStrings["Log Element"] = "Log Element";
localizedStrings["Log Frame Text"] = "Log Frame Text";
@@ -1005,7 +1007,6 @@
localizedStrings["Value"] = "Value";
localizedStrings["Variables"] = "Variables";
localizedStrings["Variants"] = "Variants";
-localizedStrings["Verbose"] = "Verbose";
localizedStrings["Version"] = "Version";
localizedStrings["Vertex"] = "Vertex";
localizedStrings["Vertex Shader"] = "Vertex Shader";
@@ -1018,6 +1019,7 @@
localizedStrings["Waiting"] = "Waiting";
localizedStrings["Waiting for canvas contexts created by script or CSS."] = "Waiting for canvas contexts created by script or CSS.";
localizedStrings["Waiting for frames…"] = "Waiting for frames…";
+localizedStrings["Warning"] = "Warning";
localizedStrings["Warning: "] = "Warning: ";
localizedStrings["Warnings"] = "Warnings";
localizedStrings["Watch Expressions"] = "Watch Expressions";
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js (225642 => 225643)
--- 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)
@@ -52,6 +52,9 @@
WI.LoggingChannel.Level = {
Off: "off",
- Basic: "basic",
- Verbose: "verbose",
+ Log: "log",
+ Error: "error",
+ Warning: "warning",
+ Info: "info",
+ Debug: "debug",
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js (225642 => 225643)
--- 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)
@@ -217,8 +217,11 @@
if (WI.LogManager.supportsLogChannels()) {
const logLevels = [
[WI.LoggingChannel.Level.Off, WI.UIString("Off")],
- [WI.LoggingChannel.Level.Basic, WI.UIString("Basic")],
- [WI.LoggingChannel.Level.Verbose, WI.UIString("Verbose")],
+ [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")],
];
const editorLabels = {
media: WI.UIString("Media Logging:"),
