Diff
Modified: trunk/LayoutTests/ChangeLog (225662 => 225663)
--- trunk/LayoutTests/ChangeLog 2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/LayoutTests/ChangeLog 2017-12-08 01:53:31 UTC (rev 225663)
@@ -1,3 +1,13 @@
+2017-12-07 Eric Carlson <eric.carl...@apple.com>
+
+ Simplify log channel configuration UI
+ https://bugs.webkit.org/show_bug.cgi?id=180527
+ <rdar://problem/35908382>
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/console/webcore-logging.html: Updated test for new results.
+
2017-12-07 Oleksandr Skachkov <gskach...@gmail.com>
WebAssembly: sending module to iframe fails
Modified: trunk/LayoutTests/inspector/console/webcore-logging.html (225662 => 225663)
--- trunk/LayoutTests/inspector/console/webcore-logging.html 2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/LayoutTests/inspector/console/webcore-logging.html 2017-12-08 01:53:31 UTC (rev 225663)
@@ -126,7 +126,7 @@
let channel = WI.logManager.customLoggingChannels.find(channel => channel.source === WI.ConsoleMessage.MessageSource.Media);
InspectorTest.expectThat(channel.level === WI.LoggingChannel.Level.Off, "Media logging disabled.");
- ConsoleAgent.setLoggingChannelLevel(channel.source, WI.LoggingChannel.Level.Log)
+ ConsoleAgent.setLoggingChannelLevel(channel.source, WI.LoggingChannel.Level.Basic)
ConsoleAgent.getLoggingChannels((error, channels) => {
if (error) {
InspectorTest.fail(`ConsoleAgent.getLoggingChannels() failed with error ${error}`);
@@ -134,7 +134,7 @@
}
let mediaChannel = channels.find(channel => channel.source === WI.ConsoleMessage.MessageSource.Media);
- InspectorTest.expectThat(mediaChannel.level === WI.LoggingChannel.Level.Log, "Media logging has been enabled.");
+ InspectorTest.expectThat(mediaChannel.level === WI.LoggingChannel.Level.Basic, "Media logging has been enabled.");
let logListener = WI.logManager.addEventListener(WI.LogManager.Event.MessageAdded, (event) => {
let message = event.data.message;
Modified: trunk/Source/_javascript_Core/ChangeLog (225662 => 225663)
--- trunk/Source/_javascript_Core/ChangeLog 2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-12-08 01:53:31 UTC (rev 225663)
@@ -1,3 +1,13 @@
+2017-12-07 Eric Carlson <eric.carl...@apple.com>
+
+ Simplify log channel configuration UI
+ https://bugs.webkit.org/show_bug.cgi?id=180527
+ <rdar://problem/35908382>
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/protocol/Console.json:
+
2017-12-07 Mark Lam <mark....@apple.com>
Apply poisoning to some native code pointers.
Modified: trunk/Source/_javascript_Core/inspector/protocol/Console.json (225662 => 225663)
--- trunk/Source/_javascript_Core/inspector/protocol/Console.json 2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/Source/_javascript_Core/inspector/protocol/Console.json 2017-12-08 01:53:31 UTC (rev 225663)
@@ -12,7 +12,7 @@
{
"id": "ChannelLevel",
"type": "string",
- "enum": ["off", "log", "error", "warning", "info", "debug"],
+ "enum": ["off", "basic", "verbose"],
"description": "Level of logging."
},
{
Modified: trunk/Source/WebCore/ChangeLog (225662 => 225663)
--- trunk/Source/WebCore/ChangeLog 2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/Source/WebCore/ChangeLog 2017-12-08 01:53:31 UTC (rev 225663)
@@ -1,3 +1,17 @@
+2017-12-07 Eric Carlson <eric.carl...@apple.com>
+
+ Simplify log channel configuration UI
+ https://bugs.webkit.org/show_bug.cgi?id=180527
+ <rdar://problem/35908382>
+
+ Reviewed by Joseph Pecoraro.
+
+ No new tests, updated existing test.
+
+ * inspector/agents/WebConsoleAgent.cpp:
+ (WebCore::WebConsoleAgent::getLoggingChannels):
+ (WebCore::channelConfigurationForString):
+
2017-12-07 Yusuke Suzuki <utatane....@gmail.com>
Use StaticLock instead of NeverDestroyed<Lock>
Modified: trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp (225662 => 225663)
--- trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp 2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp 2017-12-08 01:53:31 UTC (rev 225663)
@@ -66,23 +66,17 @@
if (!logChannel)
return;
- Inspector::Protocol::Console::ChannelLevel level = Inspector::Protocol::Console::ChannelLevel::Off;
+ auto 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::Warning;
+ level = Inspector::Protocol::Console::ChannelLevel::Basic;
break;
case WTFLogLevelInfo:
- level = Inspector::Protocol::Console::ChannelLevel::Info;
- break;
case WTFLogLevelDebug:
- level = Inspector::Protocol::Console::ChannelLevel::Debug;
+ level = Inspector::Protocol::Console::ChannelLevel::Verbose;
break;
}
}
@@ -105,15 +99,9 @@
level = WTFLogLevelError;
} else {
state = WTFLogChannelOn;
- if (equalIgnoringASCIICase(levelString, "log"))
- level = WTFLogLevelAlways;
- else if (equalIgnoringASCIICase(levelString, "error"))
- level = WTFLogLevelError;
- else if (equalIgnoringASCIICase(levelString, "warning"))
+ if (equalIgnoringASCIICase(levelString, "basic"))
level = WTFLogLevelWarning;
- else if (equalIgnoringASCIICase(levelString, "info"))
- level = WTFLogLevelInfo;
- else if (equalIgnoringASCIICase(levelString, "debug"))
+ else if (equalIgnoringASCIICase(levelString, "verbose"))
level = WTFLogLevelDebug;
else
return std::nullopt;
Modified: trunk/Source/WebInspectorUI/ChangeLog (225662 => 225663)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-12-08 01:53:31 UTC (rev 225663)
@@ -1,3 +1,16 @@
+2017-12-07 Eric Carlson <eric.carl...@apple.com>
+
+ Simplify log channel configuration UI
+ https://bugs.webkit.org/show_bug.cgi?id=180527
+ <rdar://problem/35908382>
+
+ Reviewed by Joseph Pecoraro.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Models/LoggingChannel.js:
+ * UserInterface/Views/SettingsTabContentView.js:
+ (WI.SettingsTabContentView.prototype._createGeneralSettingsView):
+
2017-12-07 Matt Lewis <jlew...@apple.com>
Unreviewed, rolling out r225634.
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (225662 => 225663)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-12-08 01:53:31 UTC (rev 225663)
@@ -128,6 +128,7 @@
localizedStrings["Back (%s)"] = "Back (%s)";
localizedStrings["Background"] = "Background";
localizedStrings["Backtrace"] = "Backtrace";
+localizedStrings["Basic"] = "Basic";
localizedStrings["Basis"] = "Basis";
localizedStrings["Beacon"] = "Beacon";
localizedStrings["Beacons"] = "Beacons";
@@ -274,7 +275,6 @@
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,7 +498,6 @@
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";
@@ -556,7 +555,6 @@
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";
@@ -1007,6 +1005,7 @@
localizedStrings["Value"] = "Value";
localizedStrings["Variables"] = "Variables";
localizedStrings["Variants"] = "Variants";
+localizedStrings["Verbose"] = "Verbose";
localizedStrings["Version"] = "Version";
localizedStrings["Vertex"] = "Vertex";
localizedStrings["Vertex Shader"] = "Vertex Shader";
@@ -1019,7 +1018,6 @@
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 (225662 => 225663)
--- trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js 2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js 2017-12-08 01:53:31 UTC (rev 225663)
@@ -52,9 +52,6 @@
WI.LoggingChannel.Level = {
Off: "off",
- Log: "log",
- Error: "error",
- Warning: "warning",
- Info: "info",
- Debug: "debug",
+ Basic: "basic",
+ Verbose: "verbose",
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js (225662 => 225663)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2017-12-08 01:53:31 UTC (rev 225663)
@@ -217,11 +217,8 @@
if (WI.LogManager.supportsLogChannels()) {
const logLevels = [
[WI.LoggingChannel.Level.Off, WI.UIString("Off")],
- [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")],
+ [WI.LoggingChannel.Level.Basic, WI.UIString("Basic")],
+ [WI.LoggingChannel.Level.Verbose, WI.UIString("Verbose")],
];
const editorLabels = {
media: WI.UIString("Media Logging:"),
