Skip to content
Permalink
Browse files
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

Canonical link: https://commits.webkit.org/196463@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@225643 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
rancored-mongoose committed Dec 7, 2017
1 parent 6684fac commit 06f5abf53e1c9e6c8f89823d9c5cd87e2693d7fa
@@ -1,3 +1,15 @@
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

2017-12-07 Eric Carlson <eric.carlson@apple.com>

Simplify log channel configuration UI
@@ -12,7 +12,7 @@
{
"id": "ChannelLevel",
"type": "string",
"enum": ["off", "basic", "verbose"],
"enum": ["off", "log", "error", "warning", "info", "debug"],
"description": "Level of logging."
},
{
@@ -1,3 +1,15 @@
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

2017-12-07 Jer Noble <jer.noble@apple.com>

[EME] Support the 'encrypted' event for FPS encrypted streams
@@ -66,17 +66,23 @@ void WebConsoleAgent::getLoggingChannels(ErrorString&, RefPtr<JSON::ArrayOf<Insp
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 @@ static std::optional<std::pair<WTFLogChannelState, WTFLogLevel>> channelConfigur
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;
@@ -1,3 +1,15 @@
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

2017-12-07 Eric Carlson <eric.carlson@apple.com>

Simplify log channel configuration UI
@@ -128,7 +128,6 @@ localizedStrings["Average Time"] = "Average Time";
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"] = "Database";
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["Indent width:"] = "Indent width:";
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 Storage"] = "Local Storage";
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["Using previous selector “%s”"] = "Using previous selector
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["Visible"] = "Visible";
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";
@@ -52,6 +52,9 @@ WI.LoggingChannel = class LoggingChannel

WI.LoggingChannel.Level = {
Off: "off",
Basic: "basic",
Verbose: "verbose",
Log: "log",
Error: "error",
Warning: "warning",
Info: "info",
Debug: "debug",
};
@@ -217,8 +217,11 @@ WI.SettingsTabContentView = class SettingsTabContentView extends WI.TabContentVi
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:"),

0 comments on commit 06f5abf

Please sign in to comment.