Changeset 268885 in webkit

Timestamp:

Oct 22, 2020, 1:09:03 PM (6 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION(r266074): Sources: icon for non-JavaScript breakpoints doesn't change when breakpoints are globally disabled
​https://bugs.webkit.org/show_bug.cgi?id=218064

Reviewed by Joseph Pecoraro.

• UserInterface/Models/Breakpoint.js:

(WI.Breakpoint.prototype.get resolved): Added.

• UserInterface/Models/JavaScriptBreakpoint.js:

(WI.JavaScriptBreakpoint.prototype.get resolved):
Add get resolved to the base class based on WI.debuggerManager.breakpointsEnabled. Use
it in the subclass as part of the result.

• UserInterface/Views/BreakpointTreeElement.js:

(WI.BreakpointTreeElement.prototype.updateStatus):
(WI.BreakpointTreeElement.prototype._dataUpdated):

• UserInterface/Views/BreakpointTreeElement.css:

(.item.breakpoint .status > .status-image:not(.resolved)): Added.

• UserInterface/Views/JavaScriptBreakpointTreeElement.css:

(.item.breakpoint.javascript .status > .status-image): Deleted.
(.item.breakpoint.javascript .status > .status-image.resolved): Deleted.

• UserInterface/Views/JavaScriptBreakpointTreeElement.js:

(WI.JavaScriptBreakpointTreeElement.prototype.updateStatus): Deleted.
Eliminate unnecessary protected function now that all breakpoints have a get resolved.
Drive-by: inline CSS class name constants.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/Breakpoint.js (modified) (1 diff)
• UserInterface/Models/JavaScriptBreakpoint.js (modified) (1 diff)
• UserInterface/Views/BreakpointTreeElement.css (modified) (1 diff)
• UserInterface/Views/BreakpointTreeElement.js (modified) (5 diffs)
• UserInterface/Views/JavaScriptBreakpointTreeElement.css (modified) (1 diff)
• UserInterface/Views/JavaScriptBreakpointTreeElement.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-10-22  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION(r266074): Sources: icon for non-JavaScript breakpoints doesn't change when breakpoints are globally disabled
+        https://bugs.webkit.org/show_bug.cgi?id=218064
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Models/Breakpoint.js:
+        (WI.Breakpoint.prototype.get resolved): Added.
+        * UserInterface/Models/JavaScriptBreakpoint.js:
+        (WI.JavaScriptBreakpoint.prototype.get resolved):
+        Add `get resolved` to the base class based on `WI.debuggerManager.breakpointsEnabled`. Use
+        it in the subclass as part of the result.
+
+        * UserInterface/Views/BreakpointTreeElement.js:
+        (WI.BreakpointTreeElement.prototype.updateStatus):
+        (WI.BreakpointTreeElement.prototype._dataUpdated):
+        * UserInterface/Views/BreakpointTreeElement.css:
+        (.item.breakpoint .status > .status-image:not(.resolved)): Added.
+        * UserInterface/Views/JavaScriptBreakpointTreeElement.css:
+        (.item.breakpoint.javascript .status > .status-image): Deleted.
+        (.item.breakpoint.javascript .status > .status-image.resolved): Deleted.
+        * UserInterface/Views/JavaScriptBreakpointTreeElement.js:
+        (WI.JavaScriptBreakpointTreeElement.prototype.updateStatus): Deleted.
+        Eliminate unnecessary protected function now that all breakpoints have a `get resolved`.
+        Drive-by: inline CSS class name constants.
+
 2020-10-20  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js

@@ -97 +97 @@
     }
 
+    get resolved()
+    {
+        // Overridden by subclasses if needed.
+        return WI.debuggerManager.breakpointsEnabled;
+    }
+
     get disabled()
     {

trunk/Source/WebInspectorUI/UserInterface/Models/JavaScriptBreakpoint.js

@@ -190 +190 @@
     get resolved()
     {
-        return this._resolved;
+        return super.resolved && this._resolved;
     }
 

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

@@ -51 +51 @@
 }
 
+.item.breakpoint .status > .status-image:not(.resolved) {
+    filter: grayscale();
+}
+
 .item.breakpoint.paused .icon {
     content: url(../Images/TypeIcons.svg#PausedBreakpoint-light);

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

@@ -50 +50 @@
 
         this.status = WI.ImageUtilities.useSVGSymbol("Images/Breakpoint.svg");
-        this.status.className = WI.BreakpointTreeElement.StatusImageElementStyleClassName;
+        this.status.className = "status-image";
 
         this._listenerSet.register(this.status, "mousedown", this._statusImageElementMouseDown);
@@ -139 +139 @@
             return;
 
-        this.status.classList.toggle(WI.BreakpointTreeElement.StatusImageDisabledStyleClassName, this._breakpoint.disabled);
+        this.status.classList.toggle("resolved", this._breakpoint.resolved);
+        this.status.classList.toggle("disabled", this._breakpoint.disabled);
         if (this._breakpoint.editable)
-            this.status.classList.toggle(WI.BreakpointTreeElement.StatusImageAutoContinueStyleClassName, this._breakpoint.autoContinue);
+            this.status.classList.toggle("auto-continue", this._breakpoint.autoContinue);
     }
 
@@ -192 +193 @@
     _dataUpdated()
     {
-        if (this.element.classList.contains(WI.BreakpointTreeElement.ProbeDataUpdatedStyleClassName)) {
+        if (this.element.classList.contains("data-updated")) {
             clearTimeout(this._removeIconAnimationTimeoutIdentifier);
-            this.element.classList.remove(WI.BreakpointTreeElement.ProbeDataUpdatedStyleClassName);
+            this.element.classList.remove("data-updated");
             // We want to restart the animation, which can only be done by removing the class,
             // performing layout, and re-adding the class. Try adding class back on next run loop.
@@ -201 +202 @@
         }
 
-        this.element.classList.add(WI.BreakpointTreeElement.ProbeDataUpdatedStyleClassName);
+        this.element.classList.add("data-updated");
         this._removeIconAnimationTimeoutIdentifier = setTimeout(() => {
-            this.element.classList.remove(WI.BreakpointTreeElement.ProbeDataUpdatedStyleClassName);
+            this.element.classList.remove("data-updated");
         }, WI.BreakpointTreeElement.ProbeDataUpdatedAnimationDuration);
     }
@@ -219 +220 @@
 };
 
-WI.BreakpointTreeElement.StatusImageElementStyleClassName = "status-image";
-WI.BreakpointTreeElement.StatusImageAutoContinueStyleClassName = "auto-continue";
-WI.BreakpointTreeElement.StatusImageDisabledStyleClassName = "disabled";
-WI.BreakpointTreeElement.ProbeDataUpdatedStyleClassName = "data-updated";
-
 WI.BreakpointTreeElement.ProbeDataUpdatedAnimationDuration = 400; // milliseconds

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

@@ -23 +23 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-.item.breakpoint.javascript .status > .status-image {
-    filter: grayscale();
-}
-
-.item.breakpoint.javascript .status > .status-image.resolved {
-    filter: none;
-}
 
 body:not(.window-inactive, .window-docked-inactive) .tree-outline:focus-within .item.breakpoint.javascript.selected .status > .status-image.resolved {

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

@@ -53 +53 @@
     }
 
-    // Protected
-
-    updateStatus()
-    {
-        super.updateStatus();
-
-        if (!this.status)
-            return;
-
-        this.status.classList.toggle("resolved", this.breakpoint.resolved && WI.debuggerManager.breakpointsEnabled);
-    }
-
     // Private