Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (259617 => 259618)
--- trunk/Source/_javascript_Core/ChangeLog 2020-04-07 00:58:30 UTC (rev 259617)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-04-07 01:04:05 UTC (rev 259618)
@@ -1,3 +1,13 @@
+2020-04-06 Devin Rousso <drou...@apple.com>
+
+ Web Inspector: `console.log(...)` appear as `CONSOLE LOG LOG` in the system console
+ https://bugs.webkit.org/show_bug.cgi?id=210083
+
+ Reviewed by Timothy Hatcher.
+
+ * runtime/ConsoleClient.cpp:
+ (JSC::appendMessagePrefix):
+
2020-04-06 Mark Lam <mark....@apple.com>
REGRESSION: 68000 JSC tests failing.
Modified: trunk/Source/_javascript_Core/runtime/ConsoleClient.cpp (259617 => 259618)
--- trunk/Source/_javascript_Core/runtime/ConsoleClient.cpp 2020-04-07 00:58:30 UTC (rev 259617)
+++ trunk/Source/_javascript_Core/runtime/ConsoleClient.cpp 2020-04-07 01:04:05 UTC (rev 259618)
@@ -62,6 +62,9 @@
{
String sourceString;
switch (source) {
+ case MessageSource::ConsoleAPI:
+ // Default, no need to be more specific.
+ break;
case MessageSource::XML:
sourceString = "XML"_s;
break;
@@ -71,9 +74,6 @@
case MessageSource::Network:
sourceString = "NETWORK"_s;
break;
- case MessageSource::ConsoleAPI:
- sourceString = "CONSOLE"_s;
- break;
case MessageSource::Storage:
sourceString = "STORAGE"_s;
break;
@@ -112,29 +112,10 @@
break;
}
- String levelString;
- switch (level) {
- case MessageLevel::Debug:
- levelString = "DEBUG"_s;
- break;
- case MessageLevel::Log:
- levelString = "LOG"_s;
- break;
- case MessageLevel::Info:
- levelString = "INFO"_s;
- break;
- case MessageLevel::Warning:
- levelString = "WARN"_s;
- break;
- case MessageLevel::Error:
- levelString = "ERROR"_s;
- break;
- }
-
String typeString;
switch (type) {
case MessageType::Log:
- typeString = "LOG"_s;
+ // Default, no need to be more specific.
break;
case MessageType::Clear:
typeString = "CLEAR"_s;
@@ -177,11 +158,34 @@
break;
}
- builder.append(sourceString);
- builder.append(' ');
- builder.append(levelString);
- builder.append(' ');
- builder.append(typeString);
+ String levelString;
+ switch (level) {
+ case MessageLevel::Log:
+ // Default, no need to be more specific.
+ if (type == MessageType::Log)
+ levelString = "LOG"_s;
+ break;
+ case MessageLevel::Debug:
+ levelString = "DEBUG"_s;
+ break;
+ case MessageLevel::Info:
+ levelString = "INFO"_s;
+ break;
+ case MessageLevel::Warning:
+ levelString = "WARN"_s;
+ break;
+ case MessageLevel::Error:
+ levelString = "ERROR"_s;
+ break;
+ }
+
+ builder.append("CONSOLE");
+ if (!sourceString.isEmpty())
+ builder.append(' ', sourceString);
+ if (!typeString.isEmpty())
+ builder.append(' ', typeString);
+ if (!levelString.isEmpty())
+ builder.append(' ', levelString);
}
void ConsoleClient::printConsoleMessage(MessageSource source, MessageType type, MessageLevel level, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber)
Modified: trunk/Source/WebCore/ChangeLog (259617 => 259618)
--- trunk/Source/WebCore/ChangeLog 2020-04-07 00:58:30 UTC (rev 259617)
+++ trunk/Source/WebCore/ChangeLog 2020-04-07 01:04:05 UTC (rev 259618)
@@ -1,3 +1,14 @@
+2020-04-06 Devin Rousso <drou...@apple.com>
+
+ Web Inspector: `console.log(...)` appear as `CONSOLE LOG LOG` in the system console
+ https://bugs.webkit.org/show_bug.cgi?id=210083
+
+ Reviewed by Timothy Hatcher.
+
+ * page/PageConsoleClient.cpp:
+ (WebCore::PageConsoleClient::addMessage):
+ Use the actual `MessageSource` and `MessageType` when printing console messages.
+
2020-04-06 Wenson Hsieh <wenson_hs...@apple.com>
REGRESSION: 4 TestWebKitAPI.DragAndDropTests.DataTransferSetData tests failing on iOS
Modified: trunk/Source/WebCore/page/PageConsoleClient.cpp (259617 => 259618)
--- trunk/Source/WebCore/page/PageConsoleClient.cpp 2020-04-07 00:58:30 UTC (rev 259617)
+++ trunk/Source/WebCore/page/PageConsoleClient.cpp 2020-04-07 01:04:05 UTC (rev 259618)
@@ -131,9 +131,9 @@
if (UNLIKELY(m_page.settings().logsPageMessagesToSystemConsoleEnabled() || shouldPrintExceptions())) {
if (consoleMessage->type() == MessageType::Image) {
ASSERT(consoleMessage->arguments());
- ConsoleClient::printConsoleMessageWithArguments(MessageSource::ConsoleAPI, MessageType::Log, consoleMessage->level(), consoleMessage->arguments()->globalObject(), *consoleMessage->arguments());
+ ConsoleClient::printConsoleMessageWithArguments(consoleMessage->source(), consoleMessage->type(), consoleMessage->level(), consoleMessage->arguments()->globalObject(), *consoleMessage->arguments());
} else
- ConsoleClient::printConsoleMessage(MessageSource::ConsoleAPI, MessageType::Log, consoleMessage->level(), consoleMessage->message(), consoleMessage->url(), consoleMessage->line(), consoleMessage->column());
+ ConsoleClient::printConsoleMessage(consoleMessage->source(), consoleMessage->type(), consoleMessage->level(), consoleMessage->message(), consoleMessage->url(), consoleMessage->line(), consoleMessage->column());
}
}
