Title: [101163] trunk/Source/WebCore
- Revision
- 101163
- Author
- yu...@chromium.org
- Date
- 2011-11-25 04:12:21 -0800 (Fri, 25 Nov 2011)
Log Message
Web Inspector: don't send Console.messagesCleared on front-end connection if console agent is not enabled
https://bugs.webkit.org/show_bug.cgi?id=73122
Console agent should stay silent if it is not enabled.
Reviewed by Pavel Feldman.
* inspector/InspectorConsoleAgent.cpp:
(WebCore::InspectorConsoleAgent::clearMessages):
(WebCore::InspectorConsoleAgent::addConsoleMessage):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101162 => 101163)
--- trunk/Source/WebCore/ChangeLog 2011-11-25 11:39:27 UTC (rev 101162)
+++ trunk/Source/WebCore/ChangeLog 2011-11-25 12:12:21 UTC (rev 101163)
@@ -1,3 +1,16 @@
+2011-11-25 Yury Semikhatsky <yu...@chromium.org>
+
+ Web Inspector: don't send Console.messagesCleared on front-end connection if console agent is not enabled
+ https://bugs.webkit.org/show_bug.cgi?id=73122
+
+ Console agent should stay silent if it is not enabled.
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/InspectorConsoleAgent.cpp:
+ (WebCore::InspectorConsoleAgent::clearMessages):
+ (WebCore::InspectorConsoleAgent::addConsoleMessage):
+
2011-11-25 Wei Charles <charles....@torchmobile.com.cn>
Upstream the QNX/RIM specific HistoryItemViewState
Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp (101162 => 101163)
--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2011-11-25 11:39:27 UTC (rev 101162)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2011-11-25 12:12:21 UTC (rev 101163)
@@ -100,7 +100,7 @@
m_expiredConsoleMessageCount = 0;
m_previousMessage = 0;
m_injectedScriptManager->releaseObjectGroup("console");
- if (m_frontend)
+ if (m_frontend && m_inspectorState->getBoolean(ConsoleAgentState::consoleMessagesEnabled))
m_frontend->messagesCleared();
}
@@ -265,12 +265,12 @@
if (m_previousMessage && !isGroupMessage(m_previousMessage->type()) && m_previousMessage->isEqual(consoleMessage.get())) {
m_previousMessage->incrementCount();
- if (m_inspectorState->getBoolean(ConsoleAgentState::consoleMessagesEnabled) && m_frontend)
+ if (m_frontend && m_inspectorState->getBoolean(ConsoleAgentState::consoleMessagesEnabled))
m_previousMessage->updateRepeatCountInConsole(m_frontend);
} else {
m_previousMessage = consoleMessage.get();
m_consoleMessages.append(consoleMessage);
- if (m_inspectorState->getBoolean(ConsoleAgentState::consoleMessagesEnabled) && m_frontend)
+ if (m_frontend && m_inspectorState->getBoolean(ConsoleAgentState::consoleMessagesEnabled))
m_previousMessage->addToFrontend(m_frontend, m_injectedScriptManager);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
