Changeset 225634 in webkit
- Timestamp:
- Dec 7, 2017 11:06:17 AM (6 years ago)
- Location:
- trunk/Source
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r225632 r225634 1 2017-12-07 Eric Carlson <eric.carlson@apple.com> 2 3 Simplify log channel configuration UI 4 https://bugs.webkit.org/show_bug.cgi?id=180527 5 <rdar://problem/35908382> 6 7 Reviewed by Joseph Pecoraro. 8 9 * inspector/protocol/Console.json: 10 1 11 2017-12-07 Mark Lam <mark.lam@apple.com> 2 12 -
trunk/Source/JavaScriptCore/inspector/protocol/Console.json
r223929 r225634 13 13 "id": "ChannelLevel", 14 14 "type": "string", 15 "enum": ["off", " log", "error", "warning", "info", "debug"],15 "enum": ["off", "basic", "verbose"], 16 16 "description": "Level of logging." 17 17 }, -
trunk/Source/WebCore/ChangeLog
r225633 r225634 1 2017-12-07 Eric Carlson <eric.carlson@apple.com> 2 3 Simplify log channel configuration UI 4 https://bugs.webkit.org/show_bug.cgi?id=180527 5 <rdar://problem/35908382> 6 7 Reviewed by Joseph Pecoraro. 8 9 No new tests -- no change in functionality. 10 11 * inspector/agents/WebConsoleAgent.cpp: 12 (WebCore::WebConsoleAgent::getLoggingChannels): 13 (WebCore::channelConfigurationForString): 14 1 15 2017-12-07 Joseph Pecoraro <pecoraro@apple.com> 2 16 -
trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp
r225425 r225634 67 67 return; 68 68 69 Inspector::Protocol::Console::ChannelLevellevel = Inspector::Protocol::Console::ChannelLevel::Off;69 auto level = Inspector::Protocol::Console::ChannelLevel::Off; 70 70 if (logChannel->state != WTFLogChannelOff) { 71 71 switch (logChannel->level) { 72 72 case WTFLogLevelAlways: 73 level = Inspector::Protocol::Console::ChannelLevel::Log;74 break;75 73 case WTFLogLevelError: 76 level = Inspector::Protocol::Console::ChannelLevel::Error;77 break;78 74 case WTFLogLevelWarning: 79 level = Inspector::Protocol::Console::ChannelLevel:: Warning;75 level = Inspector::Protocol::Console::ChannelLevel::Basic; 80 76 break; 81 77 case WTFLogLevelInfo: 82 level = Inspector::Protocol::Console::ChannelLevel::Info;83 break;84 78 case WTFLogLevelDebug: 85 level = Inspector::Protocol::Console::ChannelLevel:: Debug;79 level = Inspector::Protocol::Console::ChannelLevel::Verbose; 86 80 break; 87 81 } … … 106 100 } else { 107 101 state = WTFLogChannelOn; 108 if (equalIgnoringASCIICase(levelString, "log")) 109 level = WTFLogLevelAlways; 110 else if (equalIgnoringASCIICase(levelString, "error")) 111 level = WTFLogLevelError; 112 else if (equalIgnoringASCIICase(levelString, "warning")) 102 if (equalIgnoringASCIICase(levelString, "basic")) 113 103 level = WTFLogLevelWarning; 114 else if (equalIgnoringASCIICase(levelString, "info")) 115 level = WTFLogLevelInfo; 116 else if (equalIgnoringASCIICase(levelString, "debug")) 104 else if (equalIgnoringASCIICase(levelString, "verbose")) 117 105 level = WTFLogLevelDebug; 118 106 else -
trunk/Source/WebInspectorUI/ChangeLog
r225602 r225634 1 2017-12-07 Eric Carlson <eric.carlson@apple.com> 2 3 Simplify log channel configuration UI 4 https://bugs.webkit.org/show_bug.cgi?id=180527 5 <rdar://problem/35908382> 6 7 Reviewed by Joseph Pecoraro. 8 9 * Localizations/en.lproj/localizedStrings.js: 10 * UserInterface/Models/LoggingChannel.js: 11 * UserInterface/Views/SettingsTabContentView.js: 12 (WI.SettingsTabContentView.prototype._createGeneralSettingsView): 13 1 14 2017-12-06 Devin Rousso <webkit@devinrousso.com> 2 15 -
trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
r225587 r225634 129 129 localizedStrings["Background"] = "Background"; 130 130 localizedStrings["Backtrace"] = "Backtrace"; 131 localizedStrings["Basic"] = "Basic"; 131 132 localizedStrings["Basis"] = "Basis"; 132 133 localizedStrings["Beacon"] = "Beacon"; … … 275 276 localizedStrings["Databases"] = "Databases"; 276 277 localizedStrings["Date"] = "Date"; 277 localizedStrings["Debug"] = "Debug";278 278 localizedStrings["Debug: "] = "Debug: "; 279 279 localizedStrings["Debugger"] = "Debugger"; … … 499 499 localizedStrings["Index Key \u2014 %s"] = "Index Key \u2014 %s"; 500 500 localizedStrings["Indexed Databases"] = "Indexed Databases"; 501 localizedStrings["Info"] = "Info";502 501 localizedStrings["Info: "] = "Info: "; 503 502 localizedStrings["Infos"] = "Infos"; … … 557 556 localizedStrings["Located at %s"] = "Located at %s"; 558 557 localizedStrings["Location"] = "Location"; 559 localizedStrings["Log"] = "Log";560 558 localizedStrings["Log Canvas Context"] = "Log Canvas Context"; 561 559 localizedStrings["Log Element"] = "Log Element"; … … 1008 1006 localizedStrings["Variables"] = "Variables"; 1009 1007 localizedStrings["Variants"] = "Variants"; 1008 localizedStrings["Verbose"] = "Verbose"; 1010 1009 localizedStrings["Version"] = "Version"; 1011 1010 localizedStrings["Vertex"] = "Vertex"; … … 1020 1019 localizedStrings["Waiting for canvas contexts created by script or CSS."] = "Waiting for canvas contexts created by script or CSS."; 1021 1020 localizedStrings["Waiting for frames…"] = "Waiting for frames…"; 1022 localizedStrings["Warning"] = "Warning";1023 1021 localizedStrings["Warning: "] = "Warning: "; 1024 1022 localizedStrings["Warnings"] = "Warnings"; -
trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js
r223929 r225634 53 53 WI.LoggingChannel.Level = { 54 54 Off: "off", 55 Log: "log", 56 Error: "error", 57 Warning: "warning", 58 Info: "info", 59 Debug: "debug", 55 Basic: "basic", 56 Verbose: "verbose", 60 57 }; -
trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
r225547 r225634 218 218 const logLevels = [ 219 219 [WI.LoggingChannel.Level.Off, WI.UIString("Off")], 220 [WI.LoggingChannel.Level.Log, WI.UIString("Log")], 221 [WI.LoggingChannel.Level.Error, WI.UIString("Error")], 222 [WI.LoggingChannel.Level.Warning, WI.UIString("Warning")], 223 [WI.LoggingChannel.Level.Info, WI.UIString("Info")], 224 [WI.LoggingChannel.Level.Debug, WI.UIString("Debug")], 220 [WI.LoggingChannel.Level.Basic, WI.UIString("Basic")], 221 [WI.LoggingChannel.Level.Verbose, WI.UIString("Verbose")], 225 222 ]; 226 223 const editorLabels = {
Note: See TracChangeset
for help on using the changeset viewer.