Attachment 358397 Details for Bug 193163 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

devextras-1.patch (text/plain), 3.74 KB, created by Joseph Pecoraro on 2019-01-04 16:53:09 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2019-01-04 16:53:09 PST

Size: 3.74 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 5eae418fd47..0a570342046 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-01-04  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        Web Inspector: Always buffer some console messages without requiring developerExtrasEnabled be enabled at log time
>+        https://bugs.webkit.org/show_bug.cgi?id=193163
>+        <rdar://problem/36593635>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * inspector/agents/InspectorConsoleAgent.cpp:
>+        (Inspector::InspectorConsoleAgent::addMessageToConsole):
>+        (Inspector::InspectorConsoleAgent::addConsoleMessage):
>+        Allow console messages to be buffered without the developer extras setting.
>+        Reduce the buffer size on watchOS to limit any potential memory impact.
>+
> 2019-01-03  Michael Saboff  <msaboff@apple.com>
> 
>         DFG IntegerRangeOptimization phase exceeding loop limit shouldn't ASSERT
>diff --git a/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp b/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp
>index 4cfed7c55f4..dee0dd3c614 100644
>--- a/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp
>+++ b/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp
>@@ -39,7 +39,12 @@
> 
> namespace Inspector {
> 
>+#if PLATFORM(WATCHOS)
>+static const unsigned maximumConsoleMessages = 25;
>+#else
> static const unsigned maximumConsoleMessages = 100;
>+#endif
>+
> static const int expireConsoleMessagesStep = 10;
> 
> InspectorConsoleAgent::InspectorConsoleAgent(AgentContext& context, InspectorHeapAgent* heapAgent)
>@@ -120,9 +125,6 @@ void InspectorConsoleAgent::reset()
> 
> void InspectorConsoleAgent::addMessageToConsole(std::unique_ptr<ConsoleMessage> message)
> {
>-    if (!m_injectedScriptManager.inspectorEnvironment().developerExtrasEnabled())
>-        return;
>-
>     if (message->type() == MessageType::Clear) {
>         ErrorString unused;
>         clearMessages(unused);
>@@ -216,7 +218,6 @@ static bool isGroupMessage(MessageType type)
> 
> void InspectorConsoleAgent::addConsoleMessage(std::unique_ptr<ConsoleMessage> consoleMessage)
> {
>-    ASSERT(m_injectedScriptManager.inspectorEnvironment().developerExtrasEnabled());
>     ASSERT_ARG(consoleMessage, consoleMessage);
> 
>     ConsoleMessage* previousMessage = m_consoleMessages.isEmpty() ? nullptr : m_consoleMessages.last().get();
>diff --git a/Source/WebCore/inspector/agents/WebConsoleAgent.cpp b/Source/WebCore/inspector/agents/WebConsoleAgent.cpp
>index d3d43b6f6fe..537ff488021 100644
>--- a/Source/WebCore/inspector/agents/WebConsoleAgent.cpp
>+++ b/Source/WebCore/inspector/agents/WebConsoleAgent.cpp
>@@ -144,9 +144,6 @@ void WebConsoleAgent::frameWindowDiscarded(DOMWindow* window)
> 
> void WebConsoleAgent::didReceiveResponse(unsigned long requestIdentifier, const ResourceResponse& response)
> {
>-    if (!m_injectedScriptManager.inspectorEnvironment().developerExtrasEnabled())
>-        return;
>-
>     if (response.httpStatusCode() >= 400) {
>         String message = "Failed to load resource: the server responded with a status of " + String::number(response.httpStatusCode()) + " (" + response.httpStatusText() + ')';
>         addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::Network, MessageType::Log, MessageLevel::Error, message, response.url().string(), 0, 0, nullptr, requestIdentifier));
>@@ -155,9 +152,6 @@ void WebConsoleAgent::didReceiveResponse(unsigned long requestIdentifier, const
> 
> void WebConsoleAgent::didFailLoading(unsigned long requestIdentifier, const ResourceError& error)
> {
>-    if (!m_injectedScriptManager.inspectorEnvironment().developerExtrasEnabled())
>-        return;
>-
>     // Report failures only.
>     if (error.isCancellation())
>         return;

Flags:

mattbaker: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193163: 358397