Attachment 372171 Details for Bug 198860 – Patch

[patch] Patch

bug-198860-20190614203815.patch (text/plain), 6.88 KB, created by Devin Rousso on 2019-06-14 20:38:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-06-14 20:38:17 PDT

Size: 6.88 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 926b90cc67776b20e5fc5f9541c3d14024093263..d8998ac4d76c52c80608583bd92c5fcdb82f8356 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,25 @@
>+2019-06-14  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Sources: the Inspector Style Sheet is missing when grouped by path
>+        https://bugs.webkit.org/show_bug.cgi?id=198860
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Controllers/CSSManager.js:
>+        (WI.CSSManager.prototype.get styleSheets):
>+        (WI.CSSManager.prototype.inspectorStyleSheetsForFrame):
>+        (WI.CSSManager.prototype.preferredInspectorStyleSheetForFrame):
>+        (WI.CSSManager.prototype._inspectorStyleSheetsForFrame): Deleted.
>+        Expose a way to fetch all inspector stylesheets for a given frame.
>+        Make sure to associate inspector stylesheets with their frame.
>+
>+        * UserInterface/Views/SourcesNavigationSidebarPanel.js:
>+        (WI.SourcesNavigationSidebarPanel.prototype._compareTreeElements):
>+        (WI.SourcesNavigationSidebarPanel.prototype._addResourcesRecursivelyForFrame):
>+        (WI.SourcesNavigationSidebarPanel.prototype._handleCSSStyleSheetAdded):
>+        Add paths for inspector stylesheet creation/fetching when grouping by path.
>+        Sort inspector stylesheets as the first item of an origin/frame when grouping by path.
>+
> 2019-06-13  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: REGRESSION(r246178): extra spaces added in at-rules when formatting CSS
>diff --git a/Source/WebInspectorUI/UserInterface/Controllers/CSSManager.js b/Source/WebInspectorUI/UserInterface/Controllers/CSSManager.js
>index a2fbe91eac2662cce736e7a9d1e4d4a6aa16a920..2f39a786112b224abee9f517bd2db739c143c728 100644
>--- a/Source/WebInspectorUI/UserInterface/Controllers/CSSManager.js
>+++ b/Source/WebInspectorUI/UserInterface/Controllers/CSSManager.js
>@@ -179,7 +179,7 @@ WI.CSSManager = class CSSManager extends WI.Object
> 
>     get styleSheets()
>     {
>-        return [...this._styleSheetIdentifierMap.values()];
>+        return Array.from(this._styleSheetIdentifierMap.values());
>     }
> 
>     get defaultAppearance()
>@@ -299,9 +299,14 @@ WI.CSSManager = class CSSManager extends WI.Object
>         return styles;
>     }
> 
>+    inspectorStyleSheetsForFrame(frame)
>+    {
>+        return this.styleSheets.filter((styleSheet) => styleSheet.isInspectorStyleSheet() && styleSheet.parentFrame === frame);
>+    }
>+
>     preferredInspectorStyleSheetForFrame(frame, callback, doNotCreateIfMissing)
>     {
>-        var inspectorStyleSheets = this._inspectorStyleSheetsForFrame(frame);
>+        var inspectorStyleSheets = this.inspectorStyleSheetsForFrame(frame);
>         for (let styleSheet of inspectorStyleSheets) {
>             if (styleSheet[WI.CSSManager.PreferredInspectorStyleSheetSymbol]) {
>                 callback(styleSheet);
>@@ -314,7 +319,9 @@ WI.CSSManager = class CSSManager extends WI.Object
> 
>         if (CSSAgent.createStyleSheet) {
>             CSSAgent.createStyleSheet(frame.id, function(error, styleSheetId) {
>+                const url = null;
>                 let styleSheet = WI.cssManager.styleSheetForIdentifier(styleSheetId);
>+                styleSheet.updateInfo(url, frame, styleSheet.origin, styleSheet.isInlineStyleTag(), styleSheet.startLineNumber, styleSheet.startColumnNumber);
>                 styleSheet[WI.CSSManager.PreferredInspectorStyleSheetSymbol] = true;
>                 callback(styleSheet);
>             });
>@@ -490,18 +497,6 @@ WI.CSSManager = class CSSManager extends WI.Object
> 
>     // Private
> 
>-    _inspectorStyleSheetsForFrame(frame)
>-    {
>-        let styleSheets = [];
>-
>-        for (let styleSheet of this.styleSheets) {
>-            if (styleSheet.isInspectorStyleSheet() && styleSheet.parentFrame === frame)
>-                styleSheets.push(styleSheet);
>-        }
>-
>-        return styleSheets;
>-    }
>-
>     _nodePseudoClassesDidChange(event)
>     {
>         var node = event.target;
>diff --git a/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js b/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js
>index 8e9dd14bf1cc53fd8e2a2204a140e4dca7a0c766..1bd1dc6bc6e8295b3092ff28b245307d6a7299be 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js
>@@ -574,6 +574,7 @@ WI.SourcesNavigationSidebarPanel = class SourcesNavigationSidebarPanel extends W
>     _compareTreeElements(a, b)
>     {
>         const rankFunctions = [
>+            (treeElement) => treeElement instanceof WI.CSSStyleSheetTreeElement && treeElement.representedObject.isInspectorStyleSheet(),
>             (treeElement) => treeElement === this._mainFrameTreeElement,
>             (treeElement) => treeElement instanceof WI.FrameTreeElement,
>             (treeElement) => {
>@@ -589,12 +590,10 @@ WI.SourcesNavigationSidebarPanel = class SourcesNavigationSidebarPanel extends W
> 
>         let aRank = rankFunctions.findIndex((rankFunction) => rankFunction(a));
>         let bRank = rankFunctions.findIndex((rankFunction) => rankFunction(b));
>-        if (aRank >= 0 && bRank >= 0) {
>-            if (aRank < bRank)
>-                return -1;
>-            if (bRank < aRank)
>-                return 1;
>-        }
>+        if ((aRank >= 0 && bRank < 0) || aRank < bRank)
>+            return -1;
>+        if ((bRank >= 0 && aRank < 0) || bRank < aRank)
>+            return 1;
> 
>         return a.mainTitle.extendedLocaleCompare(b.mainTitle) || a.subtitle.extendedLocaleCompare(b.subtitle);
>     }
>@@ -739,6 +738,11 @@ WI.SourcesNavigationSidebarPanel = class SourcesNavigationSidebarPanel extends W
> 
>         for (let childFrame of frame.childFrameCollection)
>             this._addResourcesRecursivelyForFrame(childFrame);
>+
>+        if (WI.settings.resourceGroupingMode.value === WI.Resource.GroupingMode.Path) {
>+            for (let styleSheet of WI.cssManager.inspectorStyleSheetsForFrame(frame))
>+                this._addResource(styleSheet);
>+        }
>     }
> 
>     _addScript(script)
>@@ -1922,11 +1926,15 @@ WI.SourcesNavigationSidebarPanel = class SourcesNavigationSidebarPanel extends W
>         if (!styleSheet.isInspectorStyleSheet())
>             return;
> 
>-        let frameTreeElement = this.treeElementForRepresentedObject(styleSheet.parentFrame);
>-        if (!frameTreeElement)
>-            return;
>+        if (WI.settings.resourceGroupingMode.value === WI.Resource.GroupingMode.Type) {
>+            let frameTreeElement = this.treeElementForRepresentedObject(styleSheet.parentFrame);
>+            if (frameTreeElement) {
>+                frameTreeElement.addRepresentedObjectToNewChildQueue(styleSheet);
>+                return;
>+            }
>+        }
> 
>-        frameTreeElement.addRepresentedObjectToNewChildQueue(styleSheet);
>+        this._addResource(styleSheet);
>     }
> 
>     _handleTargetAdded(event)

Actions: View | Formatted Diff | Diff

Attachments on bug 198860: 372171