Title: [238331] trunk/Source/WebInspectorUI
- Revision
- 238331
- Author
- joep...@webkit.org
- Date
- 2018-11-16 17:28:44 -0800 (Fri, 16 Nov 2018)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (238330 => 238331)
--- 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)
@@ -1,5 +1,31 @@
2018-11-16 Joseph Pecoraro <pecor...@apple.com>
+ 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 <pecor...@apple.com>
+
Web Inspector: Keep Web Inspector window alive across process swaps (PSON) (Local Inspector)
https://bugs.webkit.org/show_bug.cgi?id=191740
<rdar://problem/45470897>
Modified: trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js (238330 => 238331)
--- 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)
@@ -39,30 +39,80 @@
window.location.reload();
});
- const dumpMessagesToolTip = WI.unlocalizedString("Enable dump inspector messages to console");
+ // 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.");
const dumpMessagesActivatedToolTip = WI.unlocalizedString("Disable dump inspector messages to console");
let dumpMessagesToolbarItem = new WI.ActivateButtonToolbarItem("dump-messages", dumpMessagesToolTip, dumpMessagesActivatedToolTip, "Images/Console.svg");
- dumpMessagesToolbarItem.activated = InspectorBackend.dumpInspectorProtocolMessages;
+
+ 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);
dumpMessagesToolbarItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, () => {
- InspectorBackend.dumpInspectorProtocolMessages = !InspectorBackend.dumpInspectorProtocolMessages;
- dumpMessagesToolbarItem.activated = InspectorBackend.dumpInspectorProtocolMessages;
+ 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);
});
WI.settings.autoLogProtocolMessages.addEventListener(WI.Setting.Event.Changed, () => {
- dumpMessagesToolbarItem.activated = InspectorBackend.dumpInspectorProtocolMessages;
+ if (ignoreChangesToState)
+ return;
+ applyDumpMessagesState(dumpMessagesCurrentState());
});
- WI.toolbar.addToolbarItem(dumpMessagesToolbarItem, WI.Toolbar.Section.CenterRight);
+ applyDumpMessagesState(dumpMessagesCurrentState());
+ // Next Level Inspector.
let inspectionLevel = InspectorFrontendHost ? InspectorFrontendHost.inspectionLevel() : 1;
const inspectInspectorToolTip = WI.unlocalizedString("Open Web Inspector [%d]").format(inspectionLevel + 1);
let inspectInspectorToolbarItem = new WI.ButtonToolbarItem("inspect-inspector", inspectInspectorToolTip);
+ WI.toolbar.addToolbarItem(inspectInspectorToolbarItem, WI.Toolbar.Section.CenterRight);
inspectInspectorToolbarItem.element.textContent = inspectionLevel + 1;
inspectInspectorToolbarItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, () => {
InspectorFrontendHost.inspectInspector();
});
- WI.toolbar.addToolbarItem(inspectInspectorToolbarItem, WI.Toolbar.Section.CenterRight);
- function updateDebugUI()
- {
+ function updateDebugUI() {
dumpMessagesToolbarItem.hidden = !WI.showDebugUISetting.value;
inspectInspectorToolbarItem.hidden = !WI.showDebugUISetting.value;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js (238330 => 238331)
--- 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)
@@ -96,6 +96,18 @@
return WI.settings.autoLogTimeStats.value;
}
+ set filterMultiplexingBackendInspectorProtocolMessages(value)
+ {
+ WI.settings.filterMultiplexingBackendInspectorProtocolMessages.value = value;
+
+ this._defaultTracer.filterMultiplexingBackend = value;
+ }
+
+ get filterMultiplexingBackendInspectorProtocolMessages()
+ {
+ return WI.settings.filterMultiplexingBackendInspectorProtocolMessages.value;
+ }
+
set customTracer(tracer)
{
console.assert(!tracer || tracer instanceof WI.ProtocolTracer, tracer);
@@ -198,6 +210,7 @@
{
this._defaultTracer.dumpMessagesToConsole = this.dumpInspectorProtocolMessages;
this._defaultTracer.dumpTimingDataToConsole = this.dumpTimingDataToConsole;
+ this._defaultTracer.filterMultiplexingBackend = this.filterMultiplexingBackendInspectorProtocolMessages;
}
_agentForDomain(domainName)
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/LoggingProtocolTracer.js (238330 => 238331)
--- 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)
@@ -31,6 +31,7 @@
this._dumpMessagesToConsole = false;
this._dumpTimingDataToConsole = false;
+ this._filterMultiplexingBackend = true;
this._logToConsole = window.InspectorTest ? InspectorFrontendHost.unbufferedLog.bind(InspectorFrontendHost) : console.log;
}
@@ -56,6 +57,16 @@
return this._dumpTimingDataToConsole;
}
+ set filterMultiplexingBackend(value)
+ {
+ this._filterMultiplexingBackend = !!value;
+ }
+
+ get filterMultiplexingBackend()
+ {
+ return this._filterMultiplexingBackend;
+ }
+
logFrontendException(connection, message, exception)
{
this._processEntry({type: "exception", connection, message, exception});
@@ -106,6 +117,8 @@
} else if (this._dumpMessagesToConsole && !entry.timings) {
let connection = entry.connection;
let targetId = connection && connection.target ? connection.target.identifier : "unknown";
+ if (this._filterMultiplexingBackend && targetId === "multi")
+ return;
this._logToConsole(`${entry.type} (${targetId}): ${JSON.stringify(entry.message)}`);
if (entry.exception) {
this._logToConsole(entry.exception);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
