Changeset 89912 in webkit


Ignore:
Timestamp:
Jun 28, 2011 2:28:20 AM (13 years ago)
Author:
yurys@chromium.org
Message:

2011-06-28 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: console.group messages should never be coalesced
​https://bugs.webkit.org/show_bug.cgi?id=63521

  • inspector/console/console-nested-group-expected.txt:
  • inspector/console/console-nested-group.html:

2011-06-28 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: console.group messages should never be coalesced
​https://bugs.webkit.org/show_bug.cgi?id=63521

  • inspector/InspectorConsoleAgent.cpp: (WebCore::isGroupMessage): (WebCore::InspectorConsoleAgent::addConsoleMessage):
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r89909 r89912  
     12011-06-28  Yury Semikhatsky  <yurys@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Web Inspector: console.group messages should never be coalesced
     6        https://bugs.webkit.org/show_bug.cgi?id=63521
     7
     8        * inspector/console/console-nested-group-expected.txt:
     9        * inspector/console/console-nested-group.html:
     10
    1112011-06-28  Pavel Feldman  <pfeldman@google.com>
    212

  • trunk/LayoutTests/inspector/console/console-nested-group-expected.txt

    r81129 r89912  
    11CONSOLE MESSAGE: line 11: Message inside inner group
    22CONSOLE MESSAGE: line 14: Message that must not be in any group
    3 Tests that console.groupEnd messages won't be coalesced. Bug 56114
     3CONSOLE MESSAGE: line 21: Message inside third group
     4Tests that console.group/groupEnd messages won't be coalesced. Bug 56114. Bug 63521.
    45
    56console-nested-group.html:9outer group console-message console-log-level console-group-title
    … …  
    910 console-message console-log-level
    1011console-nested-group.html:14Message that must not be in any group console-message console-log-level
     12console-nested-group.html:19One of several groups which shouldn't be coalesced. console-message console-log-level console-group-title
     13console-nested-group.html:19One of several groups which shouldn't be coalesced. console-message console-log-level console-group-title
     14console-nested-group.html:19One of several groups which shouldn't be coalesced. console-message console-log-level console-group-title
     15console-nested-group.html:21Message inside third group console-message console-log-level
     16 console-message console-log-level
     17 console-message console-log-level
     18 console-message console-log-level
    1119

  • trunk/LayoutTests/inspector/console/console-nested-group.html

    r82713 r89912  
    1414    console.log("Message that must not be in any group");
    1515
     16
     17    var groupCount = 3;
     18    for (var i = 0; i < groupCount; i++) {
     19        console.group("One of several groups which shouldn't be coalesced.");
     20    }
     21    console.log("Message inside third group");
     22    for (var i = 0; i < groupCount; i++) {
     23        console.groupEnd();
     24    }
     25
    1626    runTest();
    1727}
    … …  
    2737<body onload="onload()">
    2838<p>
    29 Tests that console.groupEnd messages won't be coalesced. <a href="https://bugs.webkit.org/show_bug.cgi?id=56114">Bug 56114</a>
     39Tests that console.group/groupEnd messages won't be coalesced. <a href="https://bugs.webkit.org/show_bug.cgi?id=56114">Bug 56114.</a>
     40<a href="https://bugs.webkit.org/show_bug.cgi?id=63521">Bug 63521.</a>
     41
    3042</p>
    3143

  • trunk/Source/WebCore/ChangeLog

    r89911 r89912  
     12011-06-28  Yury Semikhatsky  <yurys@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Web Inspector: console.group messages should never be coalesced
     6        https://bugs.webkit.org/show_bug.cgi?id=63521
     7
     8        * inspector/InspectorConsoleAgent.cpp:
     9        (WebCore::isGroupMessage):
     10        (WebCore::InspectorConsoleAgent::addConsoleMessage):
     11
    1122011-06-28  Yury Semikhatsky  <yurys@chromium.org>
    213

  • trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp

    r89456 r89912  
    255255}
    256256
     257static bool isGroupMessage(MessageType type)
     258{
     259    return type == StartGroupMessageType
     260        || type ==  StartGroupCollapsedMessageType
     261        || type == EndGroupMessageType;
     262}
     263
    257264void InspectorConsoleAgent::addConsoleMessage(PassOwnPtr<ConsoleMessage> consoleMessage)
    258265{
    … …  
    260267    ASSERT_ARG(consoleMessage, consoleMessage);
    261268
    262     if (m_previousMessage && m_previousMessage->type() != EndGroupMessageType && m_previousMessage->isEqual(consoleMessage.get())) {
     269    if (m_previousMessage && !isGroupMessage(m_previousMessage->type()) && m_previousMessage->isEqual(consoleMessage.get())) {
    263270        m_previousMessage->incrementCount();
    264271        if (m_inspectorState->getBoolean(ConsoleAgentState::consoleMessagesEnabled) && m_frontend)
Note: See TracChangeset for help on using the changeset viewer.