Changeset 214861 in webkit

Timestamp:

Apr 3, 2017 8:19:09 PM (7 years ago)

Author:

Matt Baker

Message:

Web Inspector: Show additional pause reason details for DOM "subtree modified" breakpoint
​https://bugs.webkit.org/show_bug.cgi?id=169479

Reviewed by Timothy Hatcher.

• Localizations/en.lproj/localizedStrings.js:

New Pause Reason UI strings.

• UserInterface/Views/DebuggerSidebarPanel.js:

(WebInspector.DebuggerSidebarPanel.prototype._updatePauseReasonSection):
Include a link for the target node when breaking for subtree modifications.
This is either the parent of a node being inserted, or a node that is
being removed.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (3 diffs)
• UserInterface/Views/DebuggerSidebarPanel.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-04-03  Matt Baker  <mattbaker@apple.com>
+
+        Web Inspector: Show additional pause reason details for DOM "subtree modified" breakpoint
+        https://bugs.webkit.org/show_bug.cgi?id=169479
+
+        Reviewed by Timothy Hatcher.
+
+        * Localizations/en.lproj/localizedStrings.js:
+        New Pause Reason UI strings.
+
+        * UserInterface/Views/DebuggerSidebarPanel.js:
+        (WebInspector.DebuggerSidebarPanel.prototype._updatePauseReasonSection):
+        Include a link for the target node when breaking for subtree modifications.
+        This is either the parent of a node being inserted, or a node that is
+        being removed.
+
 2017-04-03  Devin Rousso  <webkit@devinrousso.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -154 +154 @@
 localizedStrings["Checked"] = "Checked";
 localizedStrings["Child Layers"] = "Child Layers";
+localizedStrings["Child added to "] = "Child added to ";
 localizedStrings["Children"] = "Children";
 localizedStrings["Classes"] = "Classes";
@@ -660 +661 @@
 localizedStrings["Remove selected item"] = "Remove selected item";
 localizedStrings["Remove this breakpoint action"] = "Remove this breakpoint action";
+localizedStrings["Removed descendant "] = "Removed descendant ";
 localizedStrings["Rendering Frames"] = "Rendering Frames";
 localizedStrings["Repeat"] = "Repeat";
@@ -857 +859 @@
 localizedStrings["Transition"] = "Transition";
 localizedStrings["Triggered Breakpoint"] = "Triggered Breakpoint";
-localizedStrings["Triggered DOM Breakpoint"] = "Triggered DOM Breakpoint";
 localizedStrings["Triggered XHR Breakpoint"] = "Triggered XHR Breakpoint";
 localizedStrings["True"] = "True";

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

@@ -975 +975 @@
                     return;
 
-                this._pauseReasonTreeOutline = this.createContentTreeOutline(true, true);
-
-                let domBreakpointTreeElement = new WebInspector.DOMBreakpointTreeElement(domBreakpoint, WebInspector.DebuggerSidebarPanel.PausedBreakpointIconStyleClassName, WebInspector.UIString("Triggered DOM Breakpoint"));
-                let domBreakpointDetailsSection = new WebInspector.DetailsSectionRow;
+                const suppressFiltering = true;
+                this._pauseReasonTreeOutline = this.createContentTreeOutline(suppressFiltering);
+
+                let type = WebInspector.DOMBreakpointTreeElement.displayNameForType(domBreakpoint.type);
+                let domBreakpointTreeElement = new WebInspector.DOMBreakpointTreeElement(domBreakpoint, WebInspector.DebuggerSidebarPanel.PausedBreakpointIconStyleClassName, type);
+                let domBreakpointRow = new WebInspector.DetailsSectionRow;
                 this._pauseReasonTreeOutline.appendChild(domBreakpointTreeElement);
-                domBreakpointDetailsSection.element.appendChild(this._pauseReasonTreeOutline.element);
-
-                this._pauseReasonGroup.rows = [domBreakpointDetailsSection];
+                domBreakpointRow.element.appendChild(this._pauseReasonTreeOutline.element);
+
+                let ownerElementRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Element"), WebInspector.linkifyNodeReference(domNode));
+                this._pauseReasonGroup.rows = [domBreakpointRow, ownerElementRow];
+
+                if (domBreakpoint.type !== WebInspector.DOMBreakpoint.Type.SubtreeModified)
+                    return true;
+
+                console.assert(pauseData.targetNode);
+
+                let remoteObject = WebInspector.RemoteObject.fromPayload(pauseData.targetNode, target);
+                remoteObject.pushNodeToFrontend((nodeId) => {
+                    if (!nodeId)
+                        return;
+
+                    let node = WebInspector.domTreeManager.nodeForId(nodeId);
+                    console.assert(node, "Missing node for id.", nodeId);
+                    if (!node)
+                        return;
+
+                    let fragment = document.createDocumentFragment();
+                    let description = pauseData.insertion ? WebInspector.UIString("Child added to ") : WebInspector.UIString("Removed descendant ");
+                    fragment.append(description, WebInspector.linkifyNodeReference(node));
+
+                    let targetDescriptionRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Details"), fragment);
+                    targetDescriptionRow.element.classList.add("target-description");
+
+                    this._pauseReasonGroup.rows = this._pauseReasonGroup.rows.concat(targetDescriptionRow);
+                });
+
                 return true;
             }