<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[238331] trunk/Source/WebInspectorUI</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/238331">238331</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2018-11-16 17:28:44 -0800 (Fri, 16 Nov 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Include default filtering of InspectorBackend.dumpInspectorProtocolMessages with multi target backend
https://bugs.webkit.org/show_bug.cgi?id=191785

Reviewed by Matt Baker.

* UserInterface/Debug/Bootstrap.js:
(dumpMessagesCurrentState):
(applyDumpMessagesState):
(WI.runBootstrapOperations):
Include tri-state for the logs button.

* UserInterface/Protocol/InspectorBackend.js:
(InspectorBackendClass.prototype.set filterMultiplexingBackendInspectorProtocolMessages):
(InspectorBackendClass.prototype.get filterMultiplexingBackendInspectorProtocolMessages):
(InspectorBackendClass.prototype._startOrStopAutomaticTracing):
Add new filtering state (the Setting already got added in the past).

* UserInterface/Protocol/LoggingProtocolTracer.js:
(WI.LoggingProtocolTracer):
(WI.LoggingProtocolTracer.prototype.set filterMultiplexingBackend):
(WI.LoggingProtocolTracer.prototype.get filterMultiplexingBackend):
(WI.LoggingProtocolTracer.prototype._processEntry):
Perform new filtering.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceDebugBootstrapjs">trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorBackendjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolLoggingProtocolTracerjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/LoggingProtocolTracer.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (238330 => 238331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2018-11-17 01:28:41 UTC (rev 238330)
+++ trunk/Source/WebInspectorUI/ChangeLog       2018-11-17 01:28:44 UTC (rev 238331)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2018-11-16  Joseph Pecoraro  <pecoraro@apple.com>
</span><span class="cx"> 
</span><ins>+        Web Inspector: Include default filtering of InspectorBackend.dumpInspectorProtocolMessages with multi target backend
+        https://bugs.webkit.org/show_bug.cgi?id=191785
+
+        Reviewed by Matt Baker.
+
+        * UserInterface/Debug/Bootstrap.js:
+        (dumpMessagesCurrentState):
+        (applyDumpMessagesState):
+        (WI.runBootstrapOperations):
+        Include tri-state for the logs button.
+
+        * UserInterface/Protocol/InspectorBackend.js:
+        (InspectorBackendClass.prototype.set filterMultiplexingBackendInspectorProtocolMessages):
+        (InspectorBackendClass.prototype.get filterMultiplexingBackendInspectorProtocolMessages):
+        (InspectorBackendClass.prototype._startOrStopAutomaticTracing):
+        Add new filtering state (the Setting already got added in the past).
+
+        * UserInterface/Protocol/LoggingProtocolTracer.js:
+        (WI.LoggingProtocolTracer):
+        (WI.LoggingProtocolTracer.prototype.set filterMultiplexingBackend):
+        (WI.LoggingProtocolTracer.prototype.get filterMultiplexingBackend):
+        (WI.LoggingProtocolTracer.prototype._processEntry):
+        Perform new filtering.
+
+2018-11-16  Joseph Pecoraro  <pecoraro@apple.com>
+
</ins><span class="cx">         Web Inspector: Keep Web Inspector window alive across process swaps (PSON) (Local Inspector)
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=191740
</span><span class="cx">         <rdar://problem/45470897>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceDebugBootstrapjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js (238330 => 238331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js     2018-11-17 01:28:41 UTC (rev 238330)
+++ trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js        2018-11-17 01:28:44 UTC (rev 238331)
</span><span class="lines">@@ -39,30 +39,80 @@
</span><span class="cx">         window.location.reload();
</span><span class="cx">     });
</span><span class="cx"> 
</span><del>-    const dumpMessagesToolTip = WI.unlocalizedString("Enable dump inspector messages to console");
</del><ins>+    // Toggle Inspector Messages Filtering.
+    let ignoreChangesToState = false;
+    const DumpMessagesState = {Off: "off", Filtering: "filtering", Everything: "everything"};
+    const dumpMessagesToolTip = WI.unlocalizedString("Enable dump inspector messages to console.\nShift-click to dump all inspector messages with no filtering.");
</ins><span class="cx">     const dumpMessagesActivatedToolTip = WI.unlocalizedString("Disable dump inspector messages to console");
</span><span class="cx">     let dumpMessagesToolbarItem = new WI.ActivateButtonToolbarItem("dump-messages", dumpMessagesToolTip, dumpMessagesActivatedToolTip, "Images/Console.svg");
</span><del>-    dumpMessagesToolbarItem.activated = InspectorBackend.dumpInspectorProtocolMessages;
</del><ins>+
+    function dumpMessagesCurrentState() {
+        if (!InspectorBackend.dumpInspectorProtocolMessages)
+            return DumpMessagesState.Off;
+        if (InspectorBackend.filterMultiplexingBackendInspectorProtocolMessages)
+            return DumpMessagesState.Filtering;
+        return DumpMessagesState.Everything;
+    }
+
+    function applyDumpMessagesState(state) {
+        ignoreChangesToState = true;
+        switch (state) {
+        case DumpMessagesState.Off:
+            InspectorBackend.dumpInspectorProtocolMessages = false;
+            InspectorBackend.filterMultiplexingBackendInspectorProtocolMessages = false;
+            dumpMessagesToolbarItem.activated = false;
+            dumpMessagesToolbarItem.element.style.removeProperty("color");
+            break;
+        case DumpMessagesState.Filtering:
+            InspectorBackend.dumpInspectorProtocolMessages = true;
+            InspectorBackend.filterMultiplexingBackendInspectorProtocolMessages = true;
+            dumpMessagesToolbarItem.activated = true;
+            dumpMessagesToolbarItem.element.style.removeProperty("color");
+            break;
+        case DumpMessagesState.Everything:
+            InspectorBackend.dumpInspectorProtocolMessages = true;
+            InspectorBackend.filterMultiplexingBackendInspectorProtocolMessages = false;
+            dumpMessagesToolbarItem.activated = true;
+            dumpMessagesToolbarItem.element.style.color = "rgb(164, 41, 154)";
+            break;
+        }
+        ignoreChangesToState = false;
+    }
+
+    WI.toolbar.addToolbarItem(dumpMessagesToolbarItem, WI.Toolbar.Section.CenterRight);
</ins><span class="cx">     dumpMessagesToolbarItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, () => {
</span><del>-        InspectorBackend.dumpInspectorProtocolMessages = !InspectorBackend.dumpInspectorProtocolMessages;
-        dumpMessagesToolbarItem.activated = InspectorBackend.dumpInspectorProtocolMessages;
</del><ins>+        let nextState;
+        switch (dumpMessagesCurrentState()) {
+        case DumpMessagesState.Off:
+            nextState = WI.modifierKeys.shiftKey ? DumpMessagesState.Everything : DumpMessagesState.Filtering;
+            break;
+        case DumpMessagesState.Filtering:
+            nextState = WI.modifierKeys.shiftKey ? DumpMessagesState.Everything : DumpMessagesState.Off;
+            break;
+        case DumpMessagesState.Everything:
+            nextState = DumpMessagesState.Off;
+            break;
+        }
+        applyDumpMessagesState(nextState);
</ins><span class="cx">     });
</span><span class="cx">     WI.settings.autoLogProtocolMessages.addEventListener(WI.Setting.Event.Changed, () => {
</span><del>-        dumpMessagesToolbarItem.activated = InspectorBackend.dumpInspectorProtocolMessages;
</del><ins>+        if (ignoreChangesToState)
+            return;
+        applyDumpMessagesState(dumpMessagesCurrentState());
</ins><span class="cx">     });
</span><del>-    WI.toolbar.addToolbarItem(dumpMessagesToolbarItem, WI.Toolbar.Section.CenterRight);
</del><ins>+    applyDumpMessagesState(dumpMessagesCurrentState());
</ins><span class="cx"> 
</span><ins>+    // Next Level Inspector.
</ins><span class="cx">     let inspectionLevel = InspectorFrontendHost ? InspectorFrontendHost.inspectionLevel() : 1;
</span><span class="cx">     const inspectInspectorToolTip = WI.unlocalizedString("Open Web Inspector [%d]").format(inspectionLevel + 1);
</span><span class="cx">     let inspectInspectorToolbarItem = new WI.ButtonToolbarItem("inspect-inspector", inspectInspectorToolTip);
</span><ins>+    WI.toolbar.addToolbarItem(inspectInspectorToolbarItem, WI.Toolbar.Section.CenterRight);
</ins><span class="cx">     inspectInspectorToolbarItem.element.textContent = inspectionLevel + 1;
</span><span class="cx">     inspectInspectorToolbarItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, () => {
</span><span class="cx">         InspectorFrontendHost.inspectInspector();
</span><span class="cx">     });
</span><del>-    WI.toolbar.addToolbarItem(inspectInspectorToolbarItem, WI.Toolbar.Section.CenterRight);
</del><span class="cx"> 
</span><del>-    function updateDebugUI()
-    {
</del><ins>+    function updateDebugUI() {
</ins><span class="cx">         dumpMessagesToolbarItem.hidden = !WI.showDebugUISetting.value;
</span><span class="cx">         inspectInspectorToolbarItem.hidden = !WI.showDebugUISetting.value;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorBackendjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js (238330 => 238331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js   2018-11-17 01:28:41 UTC (rev 238330)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js      2018-11-17 01:28:44 UTC (rev 238331)
</span><span class="lines">@@ -96,6 +96,18 @@
</span><span class="cx">         return WI.settings.autoLogTimeStats.value;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    set filterMultiplexingBackendInspectorProtocolMessages(value)
+    {
+        WI.settings.filterMultiplexingBackendInspectorProtocolMessages.value = value;
+
+        this._defaultTracer.filterMultiplexingBackend = value;
+    }
+
+    get filterMultiplexingBackendInspectorProtocolMessages()
+    {
+        return WI.settings.filterMultiplexingBackendInspectorProtocolMessages.value;
+    }
+
</ins><span class="cx">     set customTracer(tracer)
</span><span class="cx">     {
</span><span class="cx">         console.assert(!tracer || tracer instanceof WI.ProtocolTracer, tracer);
</span><span class="lines">@@ -198,6 +210,7 @@
</span><span class="cx">     {
</span><span class="cx">         this._defaultTracer.dumpMessagesToConsole = this.dumpInspectorProtocolMessages;
</span><span class="cx">         this._defaultTracer.dumpTimingDataToConsole = this.dumpTimingDataToConsole;
</span><ins>+        this._defaultTracer.filterMultiplexingBackend = this.filterMultiplexingBackendInspectorProtocolMessages;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     _agentForDomain(domainName)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolLoggingProtocolTracerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/LoggingProtocolTracer.js (238330 => 238331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/LoggingProtocolTracer.js      2018-11-17 01:28:41 UTC (rev 238330)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/LoggingProtocolTracer.js 2018-11-17 01:28:44 UTC (rev 238331)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> 
</span><span class="cx">         this._dumpMessagesToConsole = false;
</span><span class="cx">         this._dumpTimingDataToConsole = false;
</span><ins>+        this._filterMultiplexingBackend = true;
</ins><span class="cx">         this._logToConsole = window.InspectorTest ? InspectorFrontendHost.unbufferedLog.bind(InspectorFrontendHost) : console.log;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -56,6 +57,16 @@
</span><span class="cx">         return this._dumpTimingDataToConsole;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    set filterMultiplexingBackend(value)
+    {
+        this._filterMultiplexingBackend = !!value;
+    }
+
+    get filterMultiplexingBackend()
+    {
+        return this._filterMultiplexingBackend;
+    }
+
</ins><span class="cx">     logFrontendException(connection, message, exception)
</span><span class="cx">     {
</span><span class="cx">         this._processEntry({type: "exception", connection, message, exception});
</span><span class="lines">@@ -106,6 +117,8 @@
</span><span class="cx">         } else if (this._dumpMessagesToConsole && !entry.timings) {
</span><span class="cx">             let connection = entry.connection;
</span><span class="cx">             let targetId = connection && connection.target ? connection.target.identifier : "unknown";
</span><ins>+            if (this._filterMultiplexingBackend && targetId === "multi")
+                return;
</ins><span class="cx">             this._logToConsole(`${entry.type} (${targetId}): ${JSON.stringify(entry.message)}`);
</span><span class="cx">             if (entry.exception) {
</span><span class="cx">                 this._logToConsole(entry.exception);
</span></span></pre>
</div>
</div>

</body>
</html>