Attachment 358367 Details for Bug 193158 – Patch

[patch] Patch

bug-193158-20190104151902.patch (text/plain), 10.53 KB, created by Devin Rousso on 2019-01-04 14:19:03 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-01-04 14:19:03 PST

Size: 10.53 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 55d4eff45f3faedb551d8ae52c154c6ea39c1149..3077a5138042e90fcf4b7ad3d00375e594d3cf0e 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,30 @@
>+2019-01-04  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Audit: disable breakpoints when running Audit
>+        https://bugs.webkit.org/show_bug.cgi?id=193158
>+        <rdar://problem/47057083>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Controllers/DebuggerManager.js:
>+        (WI.DebuggerManager):
>+        (WI.DebuggerManager.prototype._handleAuditManagerTestScheduled): Added.
>+        (WI.DebuggerManager.prototype._handleAuditManagerTestCompleted): Added.
>+
>+        * UserInterface/Views/DebuggerSidebarPanel.js:
>+        (WI.DebuggerSidebarPanel.prototype._handleAuditManagerTestScheduled): Added.
>+        (WI.DebuggerSidebarPanel.prototype._handleAuditManagerTestCompleted): Added.
>+        (WI.DebuggerSidebarPanel.prototype._updateBreakpointsDisabledBanner):
>+
>+        * UserInterface/Base/Main.js:
>+        (WI.loaded):
>+        * UserInterface/Test/Test.js:
>+        (WI.loaded):
>+        Move `WI.auditManager` higher in the managers list so that it can be used in
>+        `WI.DebuggerManager`'s constructor.
>+
>+        * Localizations/en.lproj/localizedStrings.js:
>+
> 2019-01-04  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         Web Inspector: Include `globalThis` in default JavaScript completions
>diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>index aa78eeb05fb3e09d26342f7b42fbebef4a0d536d..ea1540cd492f7696fdbd9867335e7debafe27f7a 100644
>--- a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>+++ b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>@@ -276,6 +276,7 @@ localizedStrings["Debug: "] = "Debug: ";
> localizedStrings["Debugger"] = "Debugger";
> localizedStrings["Debugger Paused"] = "Debugger Paused";
> localizedStrings["Debugger Statement"] = "Debugger Statement";
>+localizedStrings["Debugger disabled during Audit"] = "Debugger disabled during Audit";
> localizedStrings["Debugger disabled during Timeline recording"] = "Debugger disabled during Timeline recording";
> localizedStrings["Debugger:"] = "Debugger:";
> localizedStrings["Debugs"] = "Debugs";
>@@ -894,6 +895,7 @@ localizedStrings["Step out (%s or %s)"] = "Step out (%s or %s)";
> localizedStrings["Step over (%s or %s)"] = "Step over (%s or %s)";
> localizedStrings["Stiffness"] = "Stiffness";
> localizedStrings["Stop"] = "Stop";
>+localizedStrings["Stop Audit"] = "Stop Audit";
> localizedStrings["Stop Recording"] = "Stop Recording";
> localizedStrings["Stop element selection (%s)"] = "Stop element selection (%s)";
> localizedStrings["Stop recording"] = "Stop recording";
>diff --git a/Source/WebInspectorUI/UserInterface/Base/Main.js b/Source/WebInspectorUI/UserInterface/Base/Main.js
>index 251cef7c43434448ba6c972ea27faa0cca7884b6..81b06dd502e8ae5793ca26cc1745f07fc2eb3e6a 100644
>--- a/Source/WebInspectorUI/UserInterface/Base/Main.js
>+++ b/Source/WebInspectorUI/UserInterface/Base/Main.js
>@@ -114,12 +114,12 @@ WI.loaded = function()
>         WI.memoryManager = new WI.MemoryManager,
>         WI.applicationCacheManager = new WI.ApplicationCacheManager,
>         WI.timelineManager = new WI.TimelineManager,
>+        WI.auditManager = new WI.AuditManager,
>         WI.debuggerManager = new WI.DebuggerManager,
>         WI.layerTreeManager = new WI.LayerTreeManager,
>         WI.workerManager = new WI.WorkerManager,
>         WI.domDebuggerManager = new WI.DOMDebuggerManager,
>         WI.canvasManager = new WI.CanvasManager,
>-        WI.auditManager = new WI.AuditManager,
>     ];
> 
>     // Register for events.
>diff --git a/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js b/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js
>index e994556128d000e794398582e8222413271b4284..7f84554706ebce668c36d38a0b95874cad36271b 100644
>--- a/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js
>+++ b/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js
>@@ -41,6 +41,9 @@ WI.DebuggerManager = class DebuggerManager extends WI.Object
>         WI.timelineManager.addEventListener(WI.TimelineManager.Event.CapturingWillStart, this._timelineCapturingWillStart, this);
>         WI.timelineManager.addEventListener(WI.TimelineManager.Event.CapturingStopped, this._timelineCapturingStopped, this);
> 
>+        WI.auditManager.addEventListener(WI.AuditManager.Event.TestScheduled, this._handleAuditManagerTestScheduled, this);
>+        WI.auditManager.addEventListener(WI.AuditManager.Event.TestCompleted, this._handleAuditManagerTestCompleted, this);
>+
>         WI.targetManager.addEventListener(WI.TargetManager.Event.TargetRemoved, this._targetRemoved, this);
> 
>         WI.settings.pauseForInternalScripts.addEventListener(WI.Setting.Event.Changed, this._pauseForInternalScriptsDidChange, this);
>@@ -1144,6 +1147,19 @@ WI.DebuggerManager = class DebuggerManager extends WI.Object
>         this._stopDisablingBreakpointsTemporarily();
>     }
> 
>+    _handleAuditManagerTestScheduled(event)
>+    {
>+        this._startDisablingBreakpointsTemporarily();
>+
>+        if (this.paused)
>+            this.resume();
>+    }
>+
>+    _handleAuditManagerTestCompleted(event)
>+    {
>+        this._stopDisablingBreakpointsTemporarily();
>+    }
>+
>     _targetRemoved(event)
>     {
>         let wasPaused = this.paused;
>diff --git a/Source/WebInspectorUI/UserInterface/Test/Test.js b/Source/WebInspectorUI/UserInterface/Test/Test.js
>index f8adde814a31199222b807081ba3dacaeb27b5de..195fbc21222239dda5037848fbf2435249ed7907 100644
>--- a/Source/WebInspectorUI/UserInterface/Test/Test.js
>+++ b/Source/WebInspectorUI/UserInterface/Test/Test.js
>@@ -57,12 +57,12 @@ WI.loaded = function()
>         WI.heapManager = new WI.HeapManager,
>         WI.memoryManager = new WI.MemoryManager,
>         WI.timelineManager = new WI.TimelineManager,
>+        WI.auditManager = new WI.AuditManager,
>         WI.debuggerManager = new WI.DebuggerManager,
>         WI.layerTreeManager = new WI.LayerTreeManager,
>         WI.workerManager = new WI.WorkerManager,
>         WI.domDebuggerManager = new WI.DOMDebuggerManager,
>         WI.canvasManager = new WI.CanvasManager,
>-        WI.auditManager = new WI.AuditManager,
>     ];
> 
>     // Register for events.
>diff --git a/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js b/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js
>index 90ab86d2af47e623491f0914596d4bbe66b49e67..aaddb34c6ca01ec78bae892910ab197c8a6e78f6 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js
>@@ -58,15 +58,25 @@ WI.DebuggerSidebarPanel = class DebuggerSidebarPanel extends WI.NavigationSideba
>         WI.timelineManager.addEventListener(WI.TimelineManager.Event.CapturingWillStart, this._timelineCapturingWillStart, this);
>         WI.timelineManager.addEventListener(WI.TimelineManager.Event.CapturingStopped, this._timelineCapturingStopped, this);
> 
>+        WI.auditManager.addEventListener(WI.AuditManager.Event.TestScheduled, this._handleAuditManagerTestScheduled, this);
>+        WI.auditManager.addEventListener(WI.AuditManager.Event.TestCompleted, this._handleAuditManagerTestCompleted, this);
>+
>         WI.targetManager.addEventListener(WI.TargetManager.Event.TargetAdded, this._targetAdded, this);
>         WI.targetManager.addEventListener(WI.TargetManager.Event.TargetRemoved, this._targetRemoved, this);
> 
>         this._timelineRecordingWarningElement = document.createElement("div");
>         this._timelineRecordingWarningElement.classList.add("warning-banner");
>         this._timelineRecordingWarningElement.append(WI.UIString("Debugger disabled during Timeline recording"), " ");
>-        let stopRecordingLink = this._timelineRecordingWarningElement.appendChild(document.createElement("a"));
>-        stopRecordingLink.textContent = WI.UIString("Stop recording");
>-        stopRecordingLink.addEventListener("click", () => { WI.timelineManager.stopCapturing(); });
>+        let timelineStopRecordingLink = this._timelineRecordingWarningElement.appendChild(document.createElement("a"));
>+        timelineStopRecordingLink.textContent = WI.UIString("Stop recording");
>+        timelineStopRecordingLink.addEventListener("click", () => { WI.timelineManager.stopCapturing(); });
>+
>+        this._auditTestRecordingWarningElement = document.createElement("div");
>+        this._auditTestRecordingWarningElement.classList.add("warning-banner");
>+        this._auditTestRecordingWarningElement.append(WI.UIString("Debugger disabled during Audit"), " ");
>+        let auditStopRecordingLink = this._auditTestRecordingWarningElement.appendChild(document.createElement("a"));
>+        auditStopRecordingLink.textContent = WI.UIString("Stop Audit");
>+        auditStopRecordingLink.addEventListener("click", () => { WI.auditManager.stop(); });
> 
>         this._breakpointsDisabledWarningElement = document.createElement("div");
>         this._breakpointsDisabledWarningElement.classList.add("warning-banner");
>@@ -638,12 +648,31 @@ WI.DebuggerSidebarPanel = class DebuggerSidebarPanel extends WI.NavigationSideba
>         this._updateBreakpointsDisabledBanner();
>     }
> 
>+    _handleAuditManagerTestScheduled(event)
>+    {
>+        this._debuggerBreakpointsButtonItem.enabled = false;
>+        this._debuggerPauseResumeButtonItem.enabled = false;
>+
>+        this.contentView.element.insertBefore(this._auditTestRecordingWarningElement, this.contentView.element.firstChild);
>+        this._updateBreakpointsDisabledBanner();
>+    }
>+
>+    _handleAuditManagerTestCompleted(event)
>+    {
>+        this._debuggerBreakpointsButtonItem.enabled = true;
>+        this._debuggerPauseResumeButtonItem.enabled = true;
>+
>+        this._auditTestRecordingWarningElement.remove();
>+        this._updateBreakpointsDisabledBanner();
>+    }
>+
>     _updateBreakpointsDisabledBanner()
>     {
>         let breakpointsEnabled = WI.debuggerManager.breakpointsEnabled;
>         let timelineWarningShowing = !!this._timelineRecordingWarningElement.parentElement;
>+        let auditWarningShowing = !!this._auditTestRecordingWarningElement.parentElement;
> 
>-        if (!breakpointsEnabled && !timelineWarningShowing)
>+        if (!breakpointsEnabled && !timelineWarningShowing && !auditWarningShowing)
>             this.contentView.element.insertBefore(this._breakpointsDisabledWarningElement, this.contentView.element.firstChild);
>         else
>             this._breakpointsDisabledWarningElement.remove();

Actions: View | Formatted Diff | Diff

Attachments on bug 193158: 358367 | 358391