Web Inspector: Protocol Logging: log messages as objects if inspector^2 is open

https://bugs.webkit.org/show_bug.cgi?id=193284

Reviewed by Joseph Pecoraro.

Source/WebCore:

No newe tests, as this is simply exposes a value.

* inspector/InspectorFrontendHost.idl:
* inspector/InspectorFrontendHost.h:
* inspector/InspectorFrontendHost.cpp:
(WebCore::InspectorFrontendHost::isBeingInspected): Added.

Source/WebInspectorUI:

If inspector^2 is closed, stringify all messages.
If inspector^2 is open, log each message JSON object without modifying it.

* UserInterface/Protocol/LoggingProtocolTracer.js:
(WI.LoggingProtocolTracer.prototype._processEntry):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239779 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 63394d7..c28dee6 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2019-01-09  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Protocol Logging: log messages as objects if inspector^2 is open
+        https://bugs.webkit.org/show_bug.cgi?id=193284
+
+        Reviewed by Joseph Pecoraro.
+
+        No newe tests, as this is simply exposes a value.
+
+        * inspector/InspectorFrontendHost.idl:
+        * inspector/InspectorFrontendHost.h:
+        * inspector/InspectorFrontendHost.cpp:
+        (WebCore::InspectorFrontendHost::isBeingInspected): Added.
+
 2019-01-09  Zalan Bujtas  <zalan@apple.com>
 
         [LFC][BFC][MarginCollapsing] Add support for peculiar cases.

diff --git a/Source/WebCore/inspector/InspectorFrontendHost.cpp b/Source/WebCore/inspector/InspectorFrontendHost.cpp
index c080a56..15b8dc0 100644 (file)
--- a/Source/WebCore/inspector/InspectorFrontendHost.cpp
+++ b/Source/WebCore/inspector/InspectorFrontendHost.cpp
@@ -445,6 +445,15 @@ void InspectorFrontendHost::inspectInspector()
         m_frontendPage->inspectorController().show();
 }
 
+bool InspectorFrontendHost::isBeingInspected()
+{
+    if (!m_frontendPage)
+        return false;
+
+    InspectorController& inspectorController = m_frontendPage->inspectorController();
+    return inspectorController.hasLocalFrontend() || inspectorController.hasRemoteFrontend();
+}
+
 bool InspectorFrontendHost::supportsShowCertificate() const
 {
 #if PLATFORM(COCOA)

diff --git a/Source/WebCore/inspector/InspectorFrontendHost.h b/Source/WebCore/inspector/InspectorFrontendHost.h
index 9c04425..5242cc6 100644 (file)
--- a/Source/WebCore/inspector/InspectorFrontendHost.h
+++ b/Source/WebCore/inspector/InspectorFrontendHost.h
@@ -109,6 +109,7 @@ public:
 
     void beep();
     void inspectInspector();
+    bool isBeingInspected();
 
 private:
 #if ENABLE(CONTEXT_MENUS)

diff --git a/Source/WebCore/inspector/InspectorFrontendHost.idl b/Source/WebCore/inspector/InspectorFrontendHost.idl
index 163274b..c7cbf9d 100644 (file)
--- a/Source/WebCore/inspector/InspectorFrontendHost.idl
+++ b/Source/WebCore/inspector/InspectorFrontendHost.idl
@@ -81,6 +81,7 @@
 
     void beep();
     void inspectInspector();
+    boolean isBeingInspected();
 };
 
 dictionary ContextMenuItem {

diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index 6f13654..1015bff 100644 (file)
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,16 @@
+2019-01-09  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Protocol Logging: log messages as objects if inspector^2 is open
+        https://bugs.webkit.org/show_bug.cgi?id=193284
+
+        Reviewed by Joseph Pecoraro.
+
+        If inspector^2 is closed, stringify all messages.
+        If inspector^2 is open, log each message JSON object without modifying it.
+
+        * UserInterface/Protocol/LoggingProtocolTracer.js:
+        (WI.LoggingProtocolTracer.prototype._processEntry):
+
 2019-01-09  Nikita Vasilyev  <nvasilyev@apple.com>
 
         Web Inspector: Styles: clicking on property that soon to be discarded shouldn't start selection

diff --git a/Source/WebInspectorUI/UserInterface/Protocol/LoggingProtocolTracer.js b/Source/WebInspectorUI/UserInterface/Protocol/LoggingProtocolTracer.js
index 8d4390d..5009a30 100644 (file)
--- a/Source/WebInspectorUI/UserInterface/Protocol/LoggingProtocolTracer.js
+++ b/Source/WebInspectorUI/UserInterface/Protocol/LoggingProtocolTracer.js
@@ -119,7 +119,13 @@ WI.LoggingProtocolTracer = class LoggingProtocolTracer extends WI.ProtocolTracer
             let targetId = connection && connection.target ? connection.target.identifier : "unknown";
             if (this._filterMultiplexingBackend && targetId === "multi")
                 return;
-            this._logToConsole(`${entry.type} (${targetId}): ${JSON.stringify(entry.message)}`);
+
+            let prefix = `${entry.type} (${targetId})`;
+            if (!window.InspectorTest && InspectorFrontendHost.isBeingInspected())
+                this._logToConsole(prefix, entry.message);
+            else
+                this._logToConsole(`${prefix}: ${JSON.stringify(entry.message)}`);
+
             if (entry.exception) {
                 this._logToConsole(entry.exception);
                 if (entry.exception.stack)