Changeset 242315 in webkit

Timestamp:

Mar 2, 2019 12:50:08 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Sources: breakpoints should be disabled when an audit is running
​https://bugs.webkit.org/show_bug.cgi?id=195105
<rdar://problem/48441373>

Reviewed by Joseph Pecoraro.

• UserInterface/Views/SourcesNavigationSidebarPanel.js:

(WI.SourcesNavigationSidebarPanel):
(WI.SourcesNavigationSidebarPanel.prototype.closed):
(WI.SourcesNavigationSidebarPanel.prototype._updateTemporarilyDisabledBreakpointsButtons): Added.
(WI.SourcesNavigationSidebarPanel.prototype._updateBreakpointsDisabledBanner):
(WI.SourcesNavigationSidebarPanel.prototype._handleTimelineCapturingWillStart):
(WI.SourcesNavigationSidebarPanel.prototype._handleTimelineCapturingStopped):
(WI.SourcesNavigationSidebarPanel.prototype._handleAuditManagerTestScheduled): Added.
(WI.SourcesNavigationSidebarPanel.prototype._handleAuditManagerTestCompleted): Added.

• UserInterface/Views/SourcesNavigationSidebarPanel.css:

(.sidebar > .panel.navigation.sources > .content > .warning-banner + .warning-banner): Added.

• UserInterface/Views/DebuggerSidebarPanel.js:

(WI.DebuggerSidebarPanel):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/DebuggerSidebarPanel.js (modified) (1 diff)
• UserInterface/Views/SourcesNavigationSidebarPanel.css (modified) (1 diff)
• UserInterface/Views/SourcesNavigationSidebarPanel.js (modified) (7 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-03-02  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Sources: breakpoints should be disabled when an audit is running
+        https://bugs.webkit.org/show_bug.cgi?id=195105
+        <rdar://problem/48441373>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/SourcesNavigationSidebarPanel.js:
+        (WI.SourcesNavigationSidebarPanel):
+        (WI.SourcesNavigationSidebarPanel.prototype.closed):
+        (WI.SourcesNavigationSidebarPanel.prototype._updateTemporarilyDisabledBreakpointsButtons): Added.
+        (WI.SourcesNavigationSidebarPanel.prototype._updateBreakpointsDisabledBanner):
+        (WI.SourcesNavigationSidebarPanel.prototype._handleTimelineCapturingWillStart):
+        (WI.SourcesNavigationSidebarPanel.prototype._handleTimelineCapturingStopped):
+        (WI.SourcesNavigationSidebarPanel.prototype._handleAuditManagerTestScheduled): Added.
+        (WI.SourcesNavigationSidebarPanel.prototype._handleAuditManagerTestCompleted): Added.
+        * UserInterface/Views/SourcesNavigationSidebarPanel.css:
+        (.sidebar > .panel.navigation.sources > .content > .warning-banner + .warning-banner): Added.
+
+        * UserInterface/Views/DebuggerSidebarPanel.js:
+        (WI.DebuggerSidebarPanel):
+
 2019-03-02  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js

@@ -251 +251 @@
             this._debuggerDidPause(null);
 
-        if (WI.timelineManager.isCapturing() && WI.debuggerManager.breakpointsDisabledTemporarily)
-            this._timelineCapturingWillStart(null);
+        if (WI.debuggerManager.breakpointsDisabledTemporarily) {
+            if (WI.timelineManager.isCapturing())
+                this._timelineCapturingWillStart();
+
+            if (WI.auditManager.runningState === WI.AuditManager.RunningState.Active || WI.auditManager.runningState === WI.AuditManager.RunningState.Stopping)
+                this._handleAuditManagerTestScheduled();
+        }
 
         this._updateBreakpointsDisabledBanner();

trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.css

@@ -63 +63 @@
 }
 
+.sidebar > .panel.navigation.sources > .content > .warning-banner + .warning-banner {
+    display: none;
+}
+
 .sidebar > .panel.navigation.sources > .content > .details-section {
     padding-bottom: 1px;

trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js

@@ -95 +95 @@
 
         this._timelineRecordingWarningElement = null;
+        this._auditTestWarningElement = null;
         this._breakpointsDisabledWarningElement = null;
 
@@ -257 +258 @@
         WI.timelineManager.addEventListener(WI.TimelineManager.Event.CapturingStopped, this._handleTimelineCapturingStopped, this);
 
+        WI.auditManager.addEventListener(WI.AuditManager.Event.TestScheduled, this._handleAuditManagerTestScheduled, this);
+        WI.auditManager.addEventListener(WI.AuditManager.Event.TestCompleted, this._handleAuditManagerTestCompleted, this);
+
         WI.cssManager.addEventListener(WI.CSSManager.Event.StyleSheetAdded, this._handleCSSStyleSheetAdded, this);
 
@@ -316 +320 @@
             this._handleDebuggerPaused();
 
-        if (WI.timelineManager.isCapturing() && WI.debuggerManager.breakpointsDisabledTemporarily)
-            this._handleTimelineCapturingWillStart();
+        if (WI.debuggerManager.breakpointsDisabledTemporarily) {
+            if (WI.timelineManager.isCapturing())
+                this._handleTimelineCapturingWillStart();
+
+            if (WI.auditManager.runningState === WI.AuditManager.RunningState.Active || WI.auditManager.runningState === WI.AuditManager.RunningState.Stopping)
+                this._handleAuditManagerTestScheduled();
+        }
 
         this._updateBreakpointsDisabledBanner();
@@ -349 +358 @@
         WI.consoleManager.removeEventListener(null, null, this);
         WI.timelineManager.removeEventListener(null, null, this);
+        WI.auditManager.removeEventListener(null, null, this);
         WI.cssManager.removeEventListener(null, null, this);
         WI.targetManager.removeEventListener(null, null, this);
@@ -926 +936 @@
     }
 
+    _updateTemporarilyDisabledBreakpointsButtons()
+    {
+        let breakpointsDisabledTemporarily = WI.debuggerManager.breakpointsDisabledTemporarily;
+        this._debuggerBreakpointsButtonItem.enabled = !breakpointsDisabledTemporarily;
+        this._debuggerPauseResumeButtonItem.enabled = !breakpointsDisabledTemporarily;
+    }
+
     _updateBreakpointsDisabledBanner()
     {
-        if (!WI.debuggerManager.breakpointsEnabled && !this._timelineRecordingWarningElement) {
+        if (!WI.debuggerManager.breakpointsEnabled && !this._timelineRecordingWarningElement && !this._auditTestWarningElement) {
             if (!this._breakpointsDisabledWarningElement) {
                 let enableBreakpointsButton = document.createElement("button");
@@ -1608 +1625 @@
     _handleTimelineCapturingWillStart(event)
     {
-        this._debuggerBreakpointsButtonItem.enabled = false;
-        this._debuggerPauseResumeButtonItem.enabled = false;
+        this._updateTemporarilyDisabledBreakpointsButtons();
 
         if (!this._timelineRecordingWarningElement) {
@@ -1630 +1646 @@
     _handleTimelineCapturingStopped(event)
     {
-        this._debuggerBreakpointsButtonItem.enabled = true;
-        this._debuggerPauseResumeButtonItem.enabled = true;
+        this._updateTemporarilyDisabledBreakpointsButtons();
 
         if (this._timelineRecordingWarningElement) {
             this._timelineRecordingWarningElement.remove();
             this._timelineRecordingWarningElement = null;
+        }
+
+        this._updateBreakpointsDisabledBanner();
+    }
+
+    _handleAuditManagerTestScheduled(event)
+    {
+        this._updateTemporarilyDisabledBreakpointsButtons();
+
+        if (!this._auditTestWarningElement) {
+            let stopAuditButton = document.createElement("button");
+            stopAuditButton.textContent = WI.UIString("Stop Audit");
+            stopAuditButton.addEventListener("click", (event) => {
+                WI.auditManager.stop();
+            });
+
+            this._auditTestWarningElement = document.createElement("div");
+            this._auditTestWarningElement.classList.add("warning-banner");
+            this._auditTestWarningElement.append(WI.UIString("Debugger disabled during Audit"), document.createElement("br"), stopAuditButton);
+        }
+
+        this.contentView.element.insertBefore(this._auditTestWarningElement, this.contentView.element.firstChild);
+
+        this._updateBreakpointsDisabledBanner();
+    }
+
+    _handleAuditManagerTestCompleted(event)
+    {
+        this._updateTemporarilyDisabledBreakpointsButtons();
+
+        if (this._auditTestWarningElement) {
+            this._auditTestWarningElement.remove();
+            this._auditTestWarningElement = null;
         }