Changeset 261200 in webkit

Timestamp:

May 5, 2020, 3:09:35 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION(r239175): Source Maps: original source not shown when in nested folder
​https://bugs.webkit.org/show_bug.cgi?id=198276

Reviewed by Joseph Pecoraro.

• UserInterface/Views/TreeOutline.js:

(WI.TreeOutline.prototype.removeChildren):
r239175 made it so that WI.TreeOutline.prototype.removeChildren actually modified the
this.children member property array (which is not a getter), meaning that if a caller had
previously saved a reference to it before calling removeChildren(), the saved reference
would also be modified, preventing it from being of any real use afterwards. At that time,
WI.TreeOutline maintained an index value for each WI.TreeElement, which meant that it
was necessary to remove from this.children as otherwise Array.prototype.indexOf calls
would not be accurate. Since then, WI.TreeOutline has moved to using representedObject,
meaning it's no longer necessary to modify this.children.

• UserInterface/Views/SourceCodeTreeElement.js:

(WI.SourceCodeTreeElement.prototype.onpopulate):
(WI.SourceCodeTreeElement.prototype.onpopulate.combineFolderChain): Deleted.
(WI.SourceCodeTreeElement.prototype.onpopulate.findAndCombineFolderChains): Deleted.
Drive-by: don't attempt to combine folder chains when "Group by Path" to match the rest of

the look/feel of the navigation sidebar.

• UserInterface/Models/SourceMapResource.js:

(WI.SourceMapResource.prototype.get sourceMapDisplaySubpath):
Drive-by: fix "null" being shown as the root subpath folder when using a local server.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/SourceMapResource.js (modified) (1 diff)
• UserInterface/Views/SourceCodeTreeElement.js (modified) (1 diff)
• UserInterface/Views/TreeOutline.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-05-05  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION(r239175): Source Maps: original source not shown when in nested folder
+        https://bugs.webkit.org/show_bug.cgi?id=198276
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/TreeOutline.js:
+        (WI.TreeOutline.prototype.removeChildren):
+        r239175 made it so that `WI.TreeOutline.prototype.removeChildren` actually modified the
+        `this.children` member property array (which is not a getter), meaning that if a caller had
+        previously saved a reference to it before calling `removeChildren()`, the saved reference
+        would also be modified, preventing it from being of any real use afterwards. At that time,
+        `WI.TreeOutline` maintained an index value for each `WI.TreeElement`, which meant that it
+        was necessary to remove from `this.children` as otherwise `Array.prototype.indexOf` calls
+        would not be accurate. Since then, `WI.TreeOutline` has moved to using `representedObject`,
+        meaning it's no longer necessary to modify `this.children`.
+
+        * UserInterface/Views/SourceCodeTreeElement.js:
+        (WI.SourceCodeTreeElement.prototype.onpopulate):
+        (WI.SourceCodeTreeElement.prototype.onpopulate.combineFolderChain): Deleted.
+        (WI.SourceCodeTreeElement.prototype.onpopulate.findAndCombineFolderChains): Deleted.
+        Drive-by: don't attempt to combine folder chains when "Group by Path" to match the rest of
+                  the look/feel of the navigation sidebar.
+
+        * UserInterface/Models/SourceMapResource.js:
+        (WI.SourceMapResource.prototype.get sourceMapDisplaySubpath):
+        Drive-by: fix "null" being shown as the root subpath folder when using a local server.
+
 2020-05-05  Devin Rousso  <drousso@apple.com>
 

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

@@ -64 +64 @@
 
         // Different schemes / hosts. Return the host + path of this resource.
-        if (resourceURLComponents.scheme !== sourceMappingBasePathURLComponents.scheme || resourceURLComponents.host !== sourceMappingBasePathURLComponents.host)
-            return resourceURLComponents.host + (resourceURLComponents.port ? (":" + resourceURLComponents.port) : "") + resourceURLComponents.path;
+        if (resourceURLComponents.scheme !== sourceMappingBasePathURLComponents.scheme || resourceURLComponents.host !== sourceMappingBasePathURLComponents.host) {
+            let subpath = "";
+            if (resourceURLComponents.host) {
+                subpath += resourceURLComponents.host;
+                if (resourceURLComponents.port)
+                    subpath += ":" + resourceURLComponents.port;
+                subpath += resourceURLComponents.path;
+            } else {
+                // Remove the leading "/" so there isn't an empty folder.
+                subpath += resourceURLComponents.path.substring(1);
+            }
+            return subpath;
+        }
 
         // Same host, but not a subpath of the base. This implies a ".." in the relative path.

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

@@ -125 +125 @@
         }
 
-        for (var i = 0; i < this.children.length; ++i)
-            findAndCombineFolderChains(this.children[i], null);
+        if (WI.settings.resourceGroupingMode.value === WI.Resource.GroupingMode.Type) {
+            for (let child of this.children)
+                findAndCombineFolderChains(child);
+        }
     }
 

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

@@ -371 +371 @@
     removeChildren(suppressOnDeselect)
     {
-        while (this.children.length) {
-            let child = this.children[0];
+        for (let child of this.children) {
             child.deselect(suppressOnDeselect);
 
@@ -387 +386 @@
             child.previousSibling = null;
 
-            this.children.shift();
-
             if (treeOutline)
                 treeOutline.dispatchEventToListeners(WI.TreeOutline.Event.ElementRemoved, {element: child});
         }
+
+        this.children = [];
     }