Changeset 225663 in webkit


Ignore:
Timestamp:
Dec 7, 2017 5:53:31 PM (6 years ago)
Author:
eric.carlson@apple.com
Message:

Simplify log channel configuration UI
​https://bugs.webkit.org/show_bug.cgi?id=180527
<rdar://problem/35908382>

Reviewed by Joseph Pecoraro.

Source/JavaScriptCore:

  • inspector/protocol/Console.json:

Source/WebCore:

No new tests, updated existing test.

  • inspector/agents/WebConsoleAgent.cpp:

(WebCore::WebConsoleAgent::getLoggingChannels):
(WebCore::channelConfigurationForString):

Source/WebInspectorUI:

  • Localizations/en.lproj/localizedStrings.js:
  • UserInterface/Models/LoggingChannel.js:
  • UserInterface/Views/SettingsTabContentView.js:

(WI.SettingsTabContentView.prototype._createGeneralSettingsView):

LayoutTests:

  • inspector/console/webcore-logging.html: Updated test for new results.
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r225656 r225663  
     12017-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/console/webcore-logging.html: Updated test for new results.
     10
    1112017-12-07  Oleksandr Skachkov  <gskachkov@gmail.com>
    212

  • trunk/LayoutTests/inspector/console/webcore-logging.html

    r223957 r225663  
    127127            InspectorTest.expectThat(channel.level === WI.LoggingChannel.Level.Off, "Media logging disabled.");
    128128
    129             ConsoleAgent.setLoggingChannelLevel(channel.source, WI.LoggingChannel.Level.Log)
     129            ConsoleAgent.setLoggingChannelLevel(channel.source, WI.LoggingChannel.Level.Basic)
    130130            ConsoleAgent.getLoggingChannels((error, channels) => {
    131131                if (error) {
    … …  
    135135           
    136136                let mediaChannel = channels.find(channel => channel.source === WI.ConsoleMessage.MessageSource.Media);
    137                 InspectorTest.expectThat(mediaChannel.level === WI.LoggingChannel.Level.Log, "Media logging has been enabled.");
     137                InspectorTest.expectThat(mediaChannel.level === WI.LoggingChannel.Level.Basic, "Media logging has been enabled.");
    138138
    139139                let logListener = WI.logManager.addEventListener(WI.LogManager.Event.MessageAdded, (event) => {

  • trunk/Source/JavaScriptCore/ChangeLog

    r225659 r225663  
     12017-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
    1112017-12-07  Mark Lam  <mark.lam@apple.com>
    212

  • trunk/Source/JavaScriptCore/inspector/protocol/Console.json

    r225643 r225663  
    1313            "id": "ChannelLevel",
    1414            "type": "string",
    15             "enum": ["off", "log", "error", "warning", "info", "debug"],
     15            "enum": ["off", "basic", "verbose"],
    1616            "description": "Level of logging."
    1717        },

  • trunk/Source/WebCore/ChangeLog

    r225662 r225663  
     12017-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, updated existing test.
     10
     11        * inspector/agents/WebConsoleAgent.cpp:
     12        (WebCore::WebConsoleAgent::getLoggingChannels):
     13        (WebCore::channelConfigurationForString):
     14
    1152017-12-07  Yusuke Suzuki  <utatane.tea@gmail.com>
    216

  • trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp

    r225643 r225663  
    6767            return;
    6868
    69         Inspector::Protocol::Console::ChannelLevel level = Inspector::Protocol::Console::ChannelLevel::Off;
     69        auto level = Inspector::Protocol::Console::ChannelLevel::Off;
    7070        if (logChannel->state != WTFLogChannelOff) {
    7171            switch (logChannel->level) {
    7272            case WTFLogLevelAlways:
    73                 level = Inspector::Protocol::Console::ChannelLevel::Log;
    74                 break;
    7573            case WTFLogLevelError:
    76                 level = Inspector::Protocol::Console::ChannelLevel::Error;
    77                 break;
    7874            case WTFLogLevelWarning:
    79                 level = Inspector::Protocol::Console::ChannelLevel::Warning;
     75                level = Inspector::Protocol::Console::ChannelLevel::Basic;
    8076                break;
    8177            case WTFLogLevelInfo:
    82                 level = Inspector::Protocol::Console::ChannelLevel::Info;
    83                 break;
    8478            case WTFLogLevelDebug:
    85                 level = Inspector::Protocol::Console::ChannelLevel::Debug;
     79                level = Inspector::Protocol::Console::ChannelLevel::Verbose;
    8680                break;
    8781            }
    … …  
    106100    } else {
    107101        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"))
    113103            level = WTFLogLevelWarning;
    114         else if (equalIgnoringASCIICase(levelString, "info"))
    115             level = WTFLogLevelInfo;
    116         else if (equalIgnoringASCIICase(levelString, "debug"))
     104        else if (equalIgnoringASCIICase(levelString, "verbose"))
    117105            level = WTFLogLevelDebug;
    118106        else

  • trunk/Source/WebInspectorUI/ChangeLog

    r225643 r225663  
     12017-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
    1142017-12-07  Matt Lewis  <jlewis3@apple.com>
    215

  • trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

    r225643 r225663  
    129129localizedStrings["Background"] = "Background";
    130130localizedStrings["Backtrace"] = "Backtrace";
     131localizedStrings["Basic"] = "Basic";
    131132localizedStrings["Basis"] = "Basis";
    132133localizedStrings["Beacon"] = "Beacon";
    … …  
    275276localizedStrings["Databases"] = "Databases";
    276277localizedStrings["Date"] = "Date";
    277 localizedStrings["Debug"] = "Debug";
    278278localizedStrings["Debug: "] = "Debug: ";
    279279localizedStrings["Debugger"] = "Debugger";
    … …  
    499499localizedStrings["Index Key \u2014 %s"] = "Index Key \u2014 %s";
    500500localizedStrings["Indexed Databases"] = "Indexed Databases";
    501 localizedStrings["Info"] = "Info";
    502501localizedStrings["Info: "] = "Info: ";
    503502localizedStrings["Infos"] = "Infos";
    … …  
    557556localizedStrings["Located at %s"] = "Located at %s";
    558557localizedStrings["Location"] = "Location";
    559 localizedStrings["Log"] = "Log";
    560558localizedStrings["Log Canvas Context"] = "Log Canvas Context";
    561559localizedStrings["Log Element"] = "Log Element";
    … …  
    10081006localizedStrings["Variables"] = "Variables";
    10091007localizedStrings["Variants"] = "Variants";
     1008localizedStrings["Verbose"] = "Verbose";
    10101009localizedStrings["Version"] = "Version";
    10111010localizedStrings["Vertex"] = "Vertex";
    … …  
    10201019localizedStrings["Waiting for canvas contexts created by script or CSS."] = "Waiting for canvas contexts created by script or CSS.";
    10211020localizedStrings["Waiting for frames…"] = "Waiting for frames…";
    1022 localizedStrings["Warning"] = "Warning";
    10231021localizedStrings["Warning: "] = "Warning: ";
    10241022localizedStrings["Warnings"] = "Warnings";

  • trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js

    r225643 r225663  
    5353WI.LoggingChannel.Level = {
    5454    Off: "off",
    55     Log: "log",
    56     Error: "error",
    57     Warning: "warning",
    58     Info: "info",
    59     Debug: "debug",
     55    Basic: "basic",
     56    Verbose: "verbose",
    6057};

  • trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js

    r225643 r225663  
    218218            const logLevels = [
    219219                [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")],
    225222            ];
    226223            const editorLabels = {
Note: See TracChangeset for help on using the changeset viewer.