Diff
Modified: trunk/LayoutTests/ChangeLog (236844 => 236845)
--- trunk/LayoutTests/ChangeLog 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/LayoutTests/ChangeLog 2018-10-04 20:27:45 UTC (rev 236845)
@@ -1,5 +1,19 @@
2018-10-04 Devin Rousso <[email protected]>
+ Web Inspector: merge ProbeManager into DebuggerManager
+ https://bugs.webkit.org/show_bug.cgi?id=190225
+
+ Reviewed by Joseph Pecoraro.
+
+ * http/tests/inspector/debugger/debugger-test.js:
+ (TestPage.registerInitializer.InspectorTest.startTracingProbes):
+ (TestPage.registerInitializer):
+ * http/tests/inspector/resources/probe-test.js:
+ (TestPage.registerInitializer.ProtocolTest.Probe.installTracingListeners):
+ (TestPage.registerInitializer):
+
+2018-10-04 Devin Rousso <[email protected]>
+
Web Inspector: some files not listed in OpenResourceDialog
https://bugs.webkit.org/show_bug.cgi?id=190272
Modified: trunk/LayoutTests/http/tests/inspector/debugger/debugger-test.js (236844 => 236845)
--- trunk/LayoutTests/http/tests/inspector/debugger/debugger-test.js 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/LayoutTests/http/tests/inspector/debugger/debugger-test.js 2018-10-04 20:27:45 UTC (rev 236845)
@@ -51,21 +51,21 @@
InspectorTest.startTracingProbes = function()
{
- if (!WI.probeManager)
+ if (!WI.debuggerManager)
return;
- WI.probeManager.addEventListener(WI.ProbeManager.Event.ProbeSetAdded, function(event) {
+ WI.debuggerManager.addEventListener(WI.DebuggerManager.Event.ProbeSetAdded, function(event) {
var probeSet = event.data.probeSet;
console.assert(probeSet instanceof WI.ProbeSet, "Unexpected object type!");
- InspectorTest.log("Probe set was added. New count: " + WI.probeManager.probeSets.length);
+ InspectorTest.log("Probe set was added. New count: " + WI.debuggerManager.probeSets.length);
});
- WI.probeManager.addEventListener(WI.ProbeManager.Event.ProbeSetRemoved, function(event) {
+ WI.debuggerManager.addEventListener(WI.DebuggerManager.Event.ProbeSetRemoved, function(event) {
var probeSet = event.data.probeSet;
console.assert(probeSet instanceof WI.ProbeSet, "Unexpected object type!");
- InspectorTest.log("Probe set was removed. New count: " + WI.probeManager.probeSets.length);
+ InspectorTest.log("Probe set was removed. New count: " + WI.debuggerManager.probeSets.length);
});
WI.Probe.addEventListener(WI.Probe.Event.ExpressionChanged, function(event) {
Modified: trunk/LayoutTests/http/tests/inspector/resources/probe-test.js (236844 => 236845)
--- trunk/LayoutTests/http/tests/inspector/resources/probe-test.js 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/LayoutTests/http/tests/inspector/resources/probe-test.js 2018-10-04 20:27:45 UTC (rev 236845)
@@ -49,7 +49,7 @@
ProtocolTest.Probe.installTracingListeners = function()
{
- if (!WI.debuggerManager || !WI.probeManager)
+ if (!WI.debuggerManager)
return;
WI.debuggerManager.addEventListener(WI.DebuggerManager.Event.BreakpointAdded, function(event) {
@@ -95,18 +95,18 @@
InspectorTest.log("Breakpoint actions changed. New count: " + breakpoint.actions.length);
});
- WI.probeManager.addEventListener(WI.ProbeManager.Event.ProbeSetAdded, function(event) {
+ WI.debuggerManager.addEventListener(WI.DebuggerManager.Event.ProbeSetAdded, function(event) {
var probeSet = event.data.probeSet;
console.assert(probeSet instanceof WI.ProbeSet, "Unexpected object type!");
- InspectorTest.log("Probe set was added. New count: " + WI.probeManager.probeSets.length);
+ InspectorTest.log("Probe set was added. New count: " + WI.debuggerManager.probeSets.length);
});
- WI.probeManager.addEventListener(WI.ProbeManager.Event.ProbeSetRemoved, function(event) {
+ WI.debuggerManager.addEventListener(WI.DebuggerManager.Event.ProbeSetRemoved, function(event) {
var probeSet = event.data.probeSet;
console.assert(probeSet instanceof WI.ProbeSet, "Unexpected object type!");
- InspectorTest.log("Probe set was removed. New count: " + WI.probeManager.probeSets.length);
+ InspectorTest.log("Probe set was removed. New count: " + WI.debuggerManager.probeSets.length);
});
WI.Probe.addEventListener(WI.Probe.Event.ExpressionChanged, function(event) {
Modified: trunk/Source/WebInspectorUI/ChangeLog (236844 => 236845)
--- trunk/Source/WebInspectorUI/ChangeLog 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/Source/WebInspectorUI/ChangeLog 2018-10-04 20:27:45 UTC (rev 236845)
@@ -1,5 +1,50 @@
2018-10-04 Devin Rousso <[email protected]>
+ Web Inspector: merge ProbeManager into DebuggerManager
+ https://bugs.webkit.org/show_bug.cgi?id=190225
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Main.html:
+ * UserInterface/Base/Main.js:
+ (WI.loaded):
+ * UserInterface/Test.html:
+ * UserInterface/Test/Test.js:
+ (WI.loaded):
+
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WI.DebuggerManager.prototype.get probeSets): Added.
+ (WI.DebuggerManager.prototype.probeForIdentifier): Added.
+ (WI.DebuggerManager.prototype.addBreakpoint):
+ (WI.DebuggerManager.prototype.removeBreakpoint):
+ (WI.DebuggerManager.prototype.didSampleProbe): Added.
+ (WI.DebuggerManager.prototype._handleBreakpointActionsDidChange): Added.
+ (WI.DebuggerManager.prototype._addProbesForBreakpoint): Added.
+ (WI.DebuggerManager.prototype._removeProbesForBreakpoint): Added.
+ (WI.DebuggerManager.prototype._updateProbesForBreakpoint): Added.
+ (WI.DebuggerManager.prototype._probeSetForBreakpoint): Added.
+ * UserInterface/Controllers/ProbeManager.js: Removed.
+
+ * UserInterface/Protocol/DebuggerObserver.js:
+ (WI.DebuggerObserver.prototype.didSampleProbe):
+
+ * UserInterface/Controllers/TimelineManager.js:
+ (WI.TimelineManager.prototype._processRecord):
+
+ * UserInterface/Views/BreakpointTreeElement.js:
+ (WI.BreakpointTreeElement.prototype.onattach):
+
+ * UserInterface/Views/ProbeDetailsSidebarPanel.js:
+ (WI.ProbeDetailsSidebarPanel.prototype.closed):
+ (WI.ProbeDetailsSidebarPanel.prototype.initialLayout):
+
+ * UserInterface/Views/TextResourceContentView.js:
+ (WI.TextResourceContentView):
+ (WI.TextResourceContentView.prototype.get supplementalRepresentedObjects):
+ (WI.TextResourceContentView.prototype.closed):
+
+2018-10-04 Devin Rousso <[email protected]>
+
Web Inspector: some files not listed in OpenResourceDialog
https://bugs.webkit.org/show_bug.cgi?id=190272
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (236844 => 236845)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2018-10-04 20:27:45 UTC (rev 236845)
@@ -124,7 +124,6 @@
this.timelineManager = new WI.TimelineManager;
this.debuggerManager = new WI.DebuggerManager;
this.layerTreeManager = new WI.LayerTreeManager;
- this.probeManager = new WI.ProbeManager;
this.workerManager = new WI.WorkerManager;
this.domDebuggerManager = new WI.DOMDebuggerManager;
this.canvasManager = new WI.CanvasManager;
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (236844 => 236845)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2018-10-04 20:27:45 UTC (rev 236845)
@@ -38,7 +38,7 @@
WI.Breakpoint.addEventListener(WI.Breakpoint.Event.ConditionDidChange, this._breakpointEditablePropertyDidChange, this);
WI.Breakpoint.addEventListener(WI.Breakpoint.Event.IgnoreCountDidChange, this._breakpointEditablePropertyDidChange, this);
WI.Breakpoint.addEventListener(WI.Breakpoint.Event.AutoContinueDidChange, this._breakpointEditablePropertyDidChange, this);
- WI.Breakpoint.addEventListener(WI.Breakpoint.Event.ActionsDidChange, this._breakpointEditablePropertyDidChange, this);
+ WI.Breakpoint.addEventListener(WI.Breakpoint.Event.ActionsDidChange, this._handleBreakpointActionsDidChange, this);
WI.timelineManager.addEventListener(WI.TimelineManager.Event.CapturingWillStart, this._timelineCapturingWillStart, this);
WI.timelineManager.addEventListener(WI.TimelineManager.Event.CapturingStopped, this._timelineCapturingStopped, this);
@@ -80,6 +80,13 @@
this._targetDebuggerDataMap = new Map;
this._targetDebuggerDataMap.set(WI.mainTarget, new WI.DebuggerData(WI.mainTarget));
+ // Used to detect deleted probe actions.
+ this._knownProbeIdentifiersForBreakpoint = new Map;
+
+ // Main lookup tables for probes and probe sets.
+ this._probesByIdentifier = new Map;
+ this._probeSetsByBreakpoint = new Map;
+
// Restore the correct breakpoints enabled setting if Web Inspector had
// previously been left in a state where breakpoints were temporarily disabled.
this._temporarilyDisabledBreakpointsRestoreSetting = new WI.Setting("temporarily-disabled-breakpoints-restore", null);
@@ -310,6 +317,16 @@
target.DebuggerAgent.setAsyncStackTraceDepth(this._asyncStackTraceDepthSetting.value);
}
+ get probeSets()
+ {
+ return [...this._probeSetsByBreakpoint.values()];
+ }
+
+ probeForIdentifier(identifier)
+ {
+ return this._probesByIdentifier.get(identifier);
+ }
+
pause()
{
if (this.paused)
@@ -462,6 +479,8 @@
this._saveBreakpoints();
+ this._addProbesForBreakpoint(breakpoint);
+
this.dispatchEventToListeners(WI.DebuggerManager.Event.BreakpointAdded, {breakpoint});
}
@@ -510,6 +529,8 @@
this._saveBreakpoints();
+ this._removeProbesForBreakpoint(breakpoint);
+
this.dispatchEventToListeners(WI.DebuggerManager.Event.BreakpointRemoved, {breakpoint});
}
@@ -754,6 +775,15 @@
target.addScript(script);
}
+ didSampleProbe(target, sample)
+ {
+ console.assert(this._probesByIdentifier.has(sample.probeId), "Unknown probe identifier specified for sample: ", sample);
+ let probe = this._probesByIdentifier.get(sample.probeId);
+ let elapsedTime = WI.timelineManager.computeElapsedTime(sample.timestamp);
+ let object = WI.RemoteObject.fromPayload(sample.payload, target);
+ probe.addSample(new WI.ProbeSample(sample.sampleId, sample.batchId, elapsedTime, object));
+ }
+
// Private
_sourceCodeLocationFromPayload(target, payload)
@@ -1082,6 +1112,13 @@
}
}
+ _handleBreakpointActionsDidChange(event)
+ {
+ this._breakpointEditablePropertyDidChange(event);
+
+ this._updateProbesForBreakpoint(event.target);
+ }
+
_startDisablingBreakpointsTemporarily()
{
console.assert(!this.breakpointsDisabledTemporarily, "Already temporarily disabling breakpoints.");
@@ -1214,6 +1251,88 @@
this._ignoreBreakpointDisplayLocationDidChangeEvent = false;
}
+ _addProbesForBreakpoint(breakpoint)
+ {
+ if (this._knownProbeIdentifiersForBreakpoint.has(breakpoint))
+ return;
+
+ this._knownProbeIdentifiersForBreakpoint.set(breakpoint, new Set);
+
+ this._updateProbesForBreakpoint(breakpoint);
+ }
+
+ _removeProbesForBreakpoint(breakpoint)
+ {
+ console.assert(this._knownProbeIdentifiersForBreakpoint.has(breakpoint));
+
+ this._updateProbesForBreakpoint(breakpoint);
+ this._knownProbeIdentifiersForBreakpoint.delete(breakpoint);
+ }
+
+ _updateProbesForBreakpoint(breakpoint)
+ {
+ let knownProbeIdentifiers = this._knownProbeIdentifiersForBreakpoint.get(breakpoint);
+ if (!knownProbeIdentifiers) {
+ // Sometimes actions change before the added breakpoint is fully dispatched.
+ this._addProbesForBreakpoint(breakpoint);
+ return;
+ }
+
+ let seenProbeIdentifiers = new Set;
+
+ for (let probeAction of breakpoint.probeActions) {
+ let probeIdentifier = probeAction.id;
+ console.assert(probeIdentifier, "Probe added without breakpoint action identifier: ", breakpoint);
+
+ seenProbeIdentifiers.add(probeIdentifier);
+ if (!knownProbeIdentifiers.has(probeIdentifier)) {
+ // New probe; find or create relevant probe set.
+ knownProbeIdentifiers.add(probeIdentifier);
+ let probeSet = this._probeSetForBreakpoint(breakpoint);
+ let newProbe = new WI.Probe(probeIdentifier, breakpoint, probeAction.data);
+ this._probesByIdentifier.set(probeIdentifier, newProbe);
+ probeSet.addProbe(newProbe);
+ break;
+ }
+
+ let probe = this._probesByIdentifier.get(probeIdentifier);
+ console.assert(probe, "Probe known but couldn't be found by identifier: ", probeIdentifier);
+ // Update probe _expression_; if it differed, change events will fire.
+ probe._expression_ = probeAction.data;
+ }
+
+ // Look for missing probes based on what we saw last.
+ for (let probeIdentifier of knownProbeIdentifiers) {
+ if (seenProbeIdentifiers.has(probeIdentifier))
+ break;
+
+ // The probe has gone missing, remove it.
+ let probeSet = this._probeSetForBreakpoint(breakpoint);
+ let probe = this._probesByIdentifier.get(probeIdentifier);
+ this._probesByIdentifier.delete(probeIdentifier);
+ knownProbeIdentifiers.delete(probeIdentifier);
+ probeSet.removeProbe(probe);
+
+ // Remove the probe set if it has become empty.
+ if (!probeSet.probes.length) {
+ this._probeSetsByBreakpoint.delete(probeSet.breakpoint);
+ probeSet.willRemove();
+ this.dispatchEventToListeners(WI.DebuggerManager.Event.ProbeSetRemoved, {probeSet});
+ }
+ }
+ }
+
+ _probeSetForBreakpoint(breakpoint)
+ {
+ let probeSet = this._probeSetsByBreakpoint.get(breakpoint);
+ if (!probeSet) {
+ probeSet = new WI.ProbeSet(breakpoint);
+ this._probeSetsByBreakpoint.set(breakpoint, probeSet);
+ this.dispatchEventToListeners(WI.DebuggerManager.Event.ProbeSetAdded, {probeSet});
+ }
+ return probeSet;
+ }
+
_debugUIEnabledDidChange()
{
let eventType = WI.isDebugUIEnabled() ? WI.DebuggerManager.Event.ScriptAdded : WI.DebuggerManager.Event.ScriptRemoved;
@@ -1234,7 +1353,9 @@
ScriptAdded: "debugger-manager-script-added",
ScriptRemoved: "debugger-manager-script-removed",
ScriptsCleared: "debugger-manager-scripts-cleared",
- BreakpointsEnabledDidChange: "debugger-manager-breakpoints-enabled-did-change"
+ BreakpointsEnabledDidChange: "debugger-manager-breakpoints-enabled-did-change",
+ ProbeSetAdded: "debugger-manager-probe-set-added",
+ ProbeSetRemoved: "debugger-manager-probe-set-removed",
};
WI.DebuggerManager.PauseReason = {
Deleted: trunk/Source/WebInspectorUI/UserInterface/Controllers/ProbeManager.js (236844 => 236845)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/ProbeManager.js 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/ProbeManager.js 2018-10-04 20:27:45 UTC (rev 236845)
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2013 University of Washington. All rights reserved.
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WI.ProbeManager = class ProbeManager extends WI.Object
-{
- constructor()
- {
- super();
-
- // Used to detect deleted probe actions.
- this._knownProbeIdentifiersForBreakpoint = new Map;
-
- // Main lookup tables for probes and probe sets.
- this._probesByIdentifier = new Map;
- this._probeSetsByBreakpoint = new Map;
-
- WI.debuggerManager.addEventListener(WI.DebuggerManager.Event.BreakpointAdded, this._breakpointAdded, this);
- WI.debuggerManager.addEventListener(WI.DebuggerManager.Event.BreakpointRemoved, this._breakpointRemoved, this);
- WI.Breakpoint.addEventListener(WI.Breakpoint.Event.ActionsDidChange, this._breakpointActionsChanged, this);
-
- // Saved breakpoints should not be restored on the first event loop turn, because it
- // makes manager initialization order very fragile. No breakpoints should be available.
- console.assert(!WI.debuggerManager.breakpoints.length, "No breakpoints should exist before all the managers are constructed.");
- }
-
- // Public
-
- get probeSets()
- {
- return [...this._probeSetsByBreakpoint.values()];
- }
-
- probeForIdentifier(identifier)
- {
- return this._probesByIdentifier.get(identifier);
- }
-
- // Protected (called by WI.DebuggerObserver)
-
- didSampleProbe(target, sample)
- {
- console.assert(this._probesByIdentifier.has(sample.probeId), "Unknown probe identifier specified for sample: ", sample);
- let probe = this._probesByIdentifier.get(sample.probeId);
- let elapsedTime = WI.timelineManager.computeElapsedTime(sample.timestamp);
- let object = WI.RemoteObject.fromPayload(sample.payload, target);
- probe.addSample(new WI.ProbeSample(sample.sampleId, sample.batchId, elapsedTime, object));
- }
-
- // Private
-
- _breakpointAdded(breakpointOrEvent)
- {
- var breakpoint;
- if (breakpointOrEvent instanceof WI.Breakpoint)
- breakpoint = breakpointOrEvent;
- else
- breakpoint = breakpointOrEvent.data.breakpoint;
-
- console.assert(breakpoint instanceof WI.Breakpoint, "Unknown object passed as breakpoint: ", breakpoint);
-
- if (this._knownProbeIdentifiersForBreakpoint.has(breakpoint))
- return;
-
- this._knownProbeIdentifiersForBreakpoint.set(breakpoint, new Set);
-
- this._breakpointActionsChanged(breakpoint);
- }
-
- _breakpointRemoved(event)
- {
- var breakpoint = event.data.breakpoint;
- console.assert(this._knownProbeIdentifiersForBreakpoint.has(breakpoint));
-
- this._breakpointActionsChanged(breakpoint);
- this._knownProbeIdentifiersForBreakpoint.delete(breakpoint);
- }
-
- _breakpointActionsChanged(breakpointOrEvent)
- {
- var breakpoint;
- if (breakpointOrEvent instanceof WI.Breakpoint)
- breakpoint = breakpointOrEvent;
- else
- breakpoint = breakpointOrEvent.target;
-
- console.assert(breakpoint instanceof WI.Breakpoint, "Unknown object passed as breakpoint: ", breakpoint);
-
- // Sometimes actions change before the added breakpoint is fully dispatched.
- if (!this._knownProbeIdentifiersForBreakpoint.has(breakpoint)) {
- this._breakpointAdded(breakpoint);
- return;
- }
-
- var knownProbeIdentifiers = this._knownProbeIdentifiersForBreakpoint.get(breakpoint);
- var seenProbeIdentifiers = new Set;
-
- breakpoint.probeActions.forEach(function(probeAction) {
- var probeIdentifier = probeAction.id;
- console.assert(probeIdentifier, "Probe added without breakpoint action identifier: ", breakpoint);
-
- seenProbeIdentifiers.add(probeIdentifier);
- if (!knownProbeIdentifiers.has(probeIdentifier)) {
- // New probe; find or create relevant probe set.
- knownProbeIdentifiers.add(probeIdentifier);
- var probeSet = this._probeSetForBreakpoint(breakpoint);
- var newProbe = new WI.Probe(probeIdentifier, breakpoint, probeAction.data);
- this._probesByIdentifier.set(probeIdentifier, newProbe);
- probeSet.addProbe(newProbe);
- return;
- }
-
- var probe = this._probesByIdentifier.get(probeIdentifier);
- console.assert(probe, "Probe known but couldn't be found by identifier: ", probeIdentifier);
- // Update probe _expression_; if it differed, change events will fire.
- probe._expression_ = probeAction.data;
- }, this);
-
- // Look for missing probes based on what we saw last.
- knownProbeIdentifiers.forEach(function(probeIdentifier) {
- if (seenProbeIdentifiers.has(probeIdentifier))
- return;
-
- // The probe has gone missing, remove it.
- var probeSet = this._probeSetForBreakpoint(breakpoint);
- var probe = this._probesByIdentifier.get(probeIdentifier);
- this._probesByIdentifier.delete(probeIdentifier);
- knownProbeIdentifiers.delete(probeIdentifier);
- probeSet.removeProbe(probe);
-
- // Remove the probe set if it has become empty.
- if (!probeSet.probes.length) {
- this._probeSetsByBreakpoint.delete(probeSet.breakpoint);
- probeSet.willRemove();
- this.dispatchEventToListeners(WI.ProbeManager.Event.ProbeSetRemoved, {probeSet});
- }
- }, this);
- }
-
- _probeSetForBreakpoint(breakpoint)
- {
- if (this._probeSetsByBreakpoint.has(breakpoint))
- return this._probeSetsByBreakpoint.get(breakpoint);
-
- var newProbeSet = new WI.ProbeSet(breakpoint);
- this._probeSetsByBreakpoint.set(breakpoint, newProbeSet);
- this.dispatchEventToListeners(WI.ProbeManager.Event.ProbeSetAdded, {probeSet: newProbeSet});
- return newProbeSet;
- }
-};
-
-WI.ProbeManager.Event = {
- ProbeSetAdded: "probe-manager-probe-set-added",
- ProbeSetRemoved: "probe-manager-probe-set-removed",
-};
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (236844 => 236845)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2018-10-04 20:27:45 UTC (rev 236845)
@@ -596,7 +596,7 @@
case TimelineAgent.EventType.ProbeSample:
// Pass the startTime as the endTime since this record type has no duration.
- sourceCodeLocation = WI.probeManager.probeForIdentifier(recordPayload.data.probeId).breakpoint.sourceCodeLocation;
+ sourceCodeLocation = WI.debuggerManager.probeForIdentifier(recordPayload.data.probeId).breakpoint.sourceCodeLocation;
return new WI.ScriptTimelineRecord(WI.ScriptTimelineRecord.EventType.ProbeSampleRecorded, startTime, startTime, callFrames, sourceCodeLocation, recordPayload.data.probeId);
case TimelineAgent.EventType.TimerInstall:
Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (236844 => 236845)
--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2018-10-04 20:27:45 UTC (rev 236845)
@@ -807,7 +807,6 @@
<script src=""
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/DebuggerObserver.js (236844 => 236845)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/DebuggerObserver.js 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/DebuggerObserver.js 2018-10-04 20:27:45 UTC (rev 236845)
@@ -80,6 +80,6 @@
didSampleProbe(sample)
{
- WI.probeManager.didSampleProbe(this.target, sample);
+ WI.debuggerManager.didSampleProbe(this.target, sample);
}
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Test/Test.js (236844 => 236845)
--- trunk/Source/WebInspectorUI/UserInterface/Test/Test.js 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/Source/WebInspectorUI/UserInterface/Test/Test.js 2018-10-04 20:27:45 UTC (rev 236845)
@@ -60,7 +60,6 @@
this.timelineManager = new WI.TimelineManager;
this.debuggerManager = new WI.DebuggerManager;
this.layerTreeManager = new WI.LayerTreeManager;
- this.probeManager = new WI.ProbeManager;
this.workerManager = new WI.WorkerManager;
this.domDebuggerManager = new WI.DOMDebuggerManager;
this.canvasManager = new WI.CanvasManager;
Modified: trunk/Source/WebInspectorUI/UserInterface/Test.html (236844 => 236845)
--- trunk/Source/WebInspectorUI/UserInterface/Test.html 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/Source/WebInspectorUI/UserInterface/Test.html 2018-10-04 20:27:45 UTC (rev 236845)
@@ -222,7 +222,6 @@
<script src=""
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js (236844 => 236845)
--- trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js 2018-10-04 20:27:45 UTC (rev 236845)
@@ -45,10 +45,9 @@
this._listenerSet.register(breakpoint, WI.Breakpoint.Event.AutoContinueDidChange, this._updateStatus);
this._listenerSet.register(breakpoint, WI.Breakpoint.Event.ResolvedStateDidChange, this._updateStatus);
this._listenerSet.register(WI.debuggerManager, WI.DebuggerManager.Event.BreakpointsEnabledDidChange, this._updateStatus);
+ this._listenerSet.register(WI.debuggerManager, WI.DebuggerManager.Event.ProbeSetAdded, this._probeSetAdded);
+ this._listenerSet.register(WI.debuggerManager, WI.DebuggerManager.Event.ProbeSetRemoved, this._probeSetRemoved);
- this._listenerSet.register(WI.probeManager, WI.ProbeManager.Event.ProbeSetAdded, this._probeSetAdded);
- this._listenerSet.register(WI.probeManager, WI.ProbeManager.Event.ProbeSetRemoved, this._probeSetRemoved);
-
this._statusImageElement = document.createElement("img");
this._statusImageElement.className = WI.BreakpointTreeElement.StatusImageElementStyleClassName;
this._listenerSet.register(this._statusImageElement, "mousedown", this._statusImageElementMouseDown);
@@ -109,7 +108,7 @@
this._listenerSet.install();
- for (var probeSet of WI.probeManager.probeSets)
+ for (var probeSet of WI.debuggerManager.probeSets)
if (probeSet.breakpoint === this._breakpoint)
this._addProbeSet(probeSet);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProbeDetailsSidebarPanel.js (236844 => 236845)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ProbeDetailsSidebarPanel.js 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProbeDetailsSidebarPanel.js 2018-10-04 20:27:45 UTC (rev 236845)
@@ -88,7 +88,7 @@
closed()
{
- WI.probeManager.removeEventListener(null, null, this);
+ WI.debuggerManager.removeEventListener(null, null, this);
super.closed();
}
@@ -99,10 +99,10 @@
{
super.initialLayout();
- WI.probeManager.addEventListener(WI.ProbeManager.Event.ProbeSetAdded, this._probeSetAdded, this);
- WI.probeManager.addEventListener(WI.ProbeManager.Event.ProbeSetRemoved, this._probeSetRemoved, this);
+ WI.debuggerManager.addEventListener(WI.DebuggerManager.Event.ProbeSetAdded, this._probeSetAdded, this);
+ WI.debuggerManager.addEventListener(WI.DebuggerManager.Event.ProbeSetRemoved, this._probeSetRemoved, this);
- for (let probeSet of new Set([...this._inspectedProbeSets, ...WI.probeManager.probeSets]))
+ for (let probeSet of new Set([...this._inspectedProbeSets, ...WI.debuggerManager.probeSets]))
this._probeSetAdded(probeSet);
this.inspectedProbeSets = this._inspectedProbeSets;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js (236844 => 236845)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js 2018-10-04 20:08:54 UTC (rev 236844)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js 2018-10-04 20:27:45 UTC (rev 236845)
@@ -40,8 +40,8 @@
this._textEditor.addEventListener(WI.SourceCodeTextEditor.Event.ContentDidPopulate, this._contentDidPopulate, this);
this._textEditor.readOnly = !this._shouldBeEditable();
- WI.probeManager.addEventListener(WI.ProbeManager.Event.ProbeSetAdded, this._probeSetsChanged, this);
- WI.probeManager.addEventListener(WI.ProbeManager.Event.ProbeSetRemoved, this._probeSetsChanged, this);
+ WI.debuggerManager.addEventListener(WI.DebuggerManager.Event.ProbeSetAdded, this._probeSetsChanged, this);
+ WI.debuggerManager.addEventListener(WI.DebuggerManager.Event.ProbeSetRemoved, this._probeSetsChanged, this);
var toolTip = WI.UIString("Pretty print");
var activatedToolTip = WI.UIString("Original formatting");
@@ -87,7 +87,7 @@
get supplementalRepresentedObjects()
{
- var objects = WI.probeManager.probeSets.filter(function(probeSet) {
+ let objects = WI.debuggerManager.probeSets.filter(function(probeSet) {
return this._resource.contentIdentifier === probeSet.breakpoint.contentIdentifier;
}, this);
@@ -123,7 +123,7 @@
super.closed();
this.resource.removeEventListener(null, null, this);
- WI.probeManager.removeEventListener(null, null, this);
+ WI.debuggerManager.removeEventListener(null, null, this);
WI.showJavaScriptTypeInformationSetting.removeEventListener(null, null, this);
WI.enableControlFlowProfilerSetting.removeEventListener(null, null, this);
