Title: [227019] branches/safari-605-branch/Source/_javascript_Core
- Revision
- 227019
- Author
- [email protected]
- Date
- 2018-01-16 21:03:47 -0800 (Tue, 16 Jan 2018)
Log Message
Cherry-pick r226895. rdar://problem/36568085
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/_javascript_Core/ChangeLog (227018 => 227019)
--- branches/safari-605-branch/Source/_javascript_Core/ChangeLog 2018-01-17 05:03:45 UTC (rev 227018)
+++ branches/safari-605-branch/Source/_javascript_Core/ChangeLog 2018-01-17 05:03:47 UTC (rev 227019)
@@ -1,5 +1,28 @@
2018-01-16 Jason Marcell <[email protected]>
+ Cherry-pick r226895. rdar://problem/36568085
+
+ 2018-01-12 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Remove unnecessary raw pointer in InspectorConsoleAgent
+ https://bugs.webkit.org/show_bug.cgi?id=181579
+ <rdar://problem/36193759>
+
+ Reviewed by Brian Burg.
+
+ * inspector/agents/InspectorConsoleAgent.h:
+ * inspector/agents/InspectorConsoleAgent.cpp:
+ (Inspector::InspectorConsoleAgent::clearMessages):
+ (Inspector::InspectorConsoleAgent::addConsoleMessage):
+ Switch from a raw pointer to m_consoleMessages.last().
+ Also move the expiration check into the if block since it can only
+ happen inside here when the number of console messages changes.
+
+ (Inspector::InspectorConsoleAgent::discardValues):
+ Also clear the expired message count when messages are cleared.
+
+2018-01-16 Jason Marcell <[email protected]>
+
Cherry-pick r226881. rdar://problem/36567948
2018-01-12 Saam Barati <[email protected]>
Modified: branches/safari-605-branch/Source/_javascript_Core/inspector/agents/InspectorConsoleAgent.cpp (227018 => 227019)
--- branches/safari-605-branch/Source/_javascript_Core/inspector/agents/InspectorConsoleAgent.cpp 2018-01-17 05:03:45 UTC (rev 227018)
+++ branches/safari-605-branch/Source/_javascript_Core/inspector/agents/InspectorConsoleAgent.cpp 2018-01-17 05:03:47 UTC (rev 227019)
@@ -69,6 +69,7 @@
void InspectorConsoleAgent::discardValues()
{
m_consoleMessages.clear();
+ m_expiredConsoleMessageCount = 0;
}
void InspectorConsoleAgent::enable(ErrorString&)
@@ -102,7 +103,6 @@
{
m_consoleMessages.clear();
m_expiredConsoleMessageCount = 0;
- m_previousMessage = nullptr;
m_injectedScriptManager.releaseObjectGroup(ASCIILiteral("console"));
@@ -220,20 +220,22 @@
ASSERT(m_injectedScriptManager.inspectorEnvironment().developerExtrasEnabled());
ASSERT_ARG(consoleMessage, consoleMessage);
- if (m_previousMessage && !isGroupMessage(m_previousMessage->type()) && m_previousMessage->isEqual(consoleMessage.get())) {
- m_previousMessage->incrementCount();
+ ConsoleMessage* previousMessage = m_consoleMessages.isEmpty() ? nullptr : m_consoleMessages.last().get();
+
+ if (previousMessage && !isGroupMessage(previousMessage->type()) && previousMessage->isEqual(consoleMessage.get())) {
+ previousMessage->incrementCount();
if (m_enabled)
- m_previousMessage->updateRepeatCountInConsole(*m_frontendDispatcher);
+ previousMessage->updateRepeatCountInConsole(*m_frontendDispatcher);
} else {
- m_previousMessage = consoleMessage.get();
+ ConsoleMessage* newMessage = consoleMessage.get();
m_consoleMessages.append(WTFMove(consoleMessage));
if (m_enabled)
- m_previousMessage->addToFrontend(*m_frontendDispatcher, m_injectedScriptManager, true);
- }
+ newMessage->addToFrontend(*m_frontendDispatcher, m_injectedScriptManager, true);
- if (m_consoleMessages.size() >= maximumConsoleMessages) {
- m_expiredConsoleMessageCount += expireConsoleMessagesStep;
- m_consoleMessages.remove(0, expireConsoleMessagesStep);
+ if (m_consoleMessages.size() >= maximumConsoleMessages) {
+ m_expiredConsoleMessageCount += expireConsoleMessagesStep;
+ m_consoleMessages.remove(0, expireConsoleMessagesStep);
+ }
}
}
Modified: branches/safari-605-branch/Source/_javascript_Core/inspector/agents/InspectorConsoleAgent.h (227018 => 227019)
--- branches/safari-605-branch/Source/_javascript_Core/inspector/agents/InspectorConsoleAgent.h 2018-01-17 05:03:45 UTC (rev 227018)
+++ branches/safari-605-branch/Source/_javascript_Core/inspector/agents/InspectorConsoleAgent.h 2018-01-17 05:03:47 UTC (rev 227019)
@@ -83,7 +83,6 @@
RefPtr<ConsoleBackendDispatcher> m_backendDispatcher;
InspectorHeapAgent* m_heapAgent;
- ConsoleMessage* m_previousMessage { nullptr };
Vector<std::unique_ptr<ConsoleMessage>> m_consoleMessages;
int m_expiredConsoleMessageCount { 0 };
HashMap<String, unsigned> m_counts;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
