Attachment 359817 Details for Bug 193615 – Patch

[patch] Patch

patch.txt (text/plain), 27.13 KB, created by Nikita Vasilyev on 2019-01-22 17:17:28 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Nikita Vasilyev

Created: 2019-01-22 17:17:28 PST

Size: 27.13 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index f8f57599f67..b625b81631b 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-01-22  Nikita Vasilyev  <nvasilyev@apple.com>
>+
>+        Web Inspector: Styles: refactor properties/allProperties/visibleProperties/allVisibleProperties
>+        https://bugs.webkit.org/show_bug.cgi?id=193615
>+
>+        Reviewed by Devin Rousso.
>+
>+        Rename:
>+        - properties to enabledProperties;
>+        - allProperties to properties.
>+
>+        * inspector/css/css-property-expected.txt:
>+        * inspector/css/css-property.html:
>+        * inspector/css/force-page-appearance.html:
>+        * inspector/css/matched-style-properties.html:
>+        * inspector/css/modify-css-property.html:
>+        * inspector/css/shadow-scoped-style.html:
>+
> 2019-01-19  Eric Liang  <ericliang@apple.com>
> 
>         AXSelected attribute on RadioButton should not be settable.
>diff --git a/LayoutTests/inspector/css/css-property-expected.txt b/LayoutTests/inspector/css/css-property-expected.txt
>index 7b7d402ce6f..af85013a05e 100644
>--- a/LayoutTests/inspector/css/css-property-expected.txt
>+++ b/LayoutTests/inspector/css/css-property-expected.txt
>@@ -51,6 +51,6 @@ PASS: "background-repeat-y" has the text "".
> PASS: "background-repeat-y" has the _text (private) "".
> 
> -- Running test case: CSSProperty.prototype.remove
>-PASS: The removed property should no longer be in allProperties array.
>+PASS: The removed property should no longer be in properties array.
> PASS: The second property should shift and become the first.
> 
>diff --git a/LayoutTests/inspector/css/css-property.html b/LayoutTests/inspector/css/css-property.html
>index 0ce1bffd76c..51d8ebdbce4 100644
>--- a/LayoutTests/inspector/css/css-property.html
>+++ b/LayoutTests/inspector/css/css-property.html
>@@ -16,7 +16,7 @@ function test() {
>                 if (rule.selectorText !== "div#x")
>                     continue;
> 
>-                for (let property of rule.style.properties) {
>+                for (let property of rule.style.enabledProperties) {
>                     switch (property.name) {
>                     case "background-repeat":
>                         InspectorTest.expectThat(property.valid, `"${property.name}" is a valid property.`);
>@@ -42,7 +42,7 @@ function test() {
>                 if (rule.selectorText !== "div#x")
>                     continue;
> 
>-                for (let property of rule.style.properties) {
>+                for (let property of rule.style.enabledProperties) {
>                     switch (property.name) {
>                     case "background-repeat":
>                     case "background-repeat-x":
>@@ -68,7 +68,7 @@ function test() {
>                 if (rule.selectorText !== "div#x")
>                     continue;
> 
>-                for (let property of rule.style.properties) {
>+                for (let property of rule.style.enabledProperties) {
>                     switch (property.name) {
>                     case "background-repeat":
>                     case "background-repeat-x":
>@@ -94,7 +94,7 @@ function test() {
>                 if (rule.selectorText !== "div#x")
>                     continue;
> 
>-                for (let property of rule.style.properties) {
>+                for (let property of rule.style.enabledProperties) {
>                     switch (property.name) {
>                     case "background-repeat":
>                     case "background-repeat-x":
>@@ -118,7 +118,7 @@ function test() {
>                 if (rule.selectorText !== "div#x")
>                     continue;
> 
>-                for (let property of rule.style.allProperties) {
>+                for (let property of rule.style.properties) {
>                     switch (property.name) {
>                     case "background-repeat":
>                     case "background-repeat-x":
>@@ -145,7 +145,7 @@ function test() {
>                 if (rule.selectorText !== "div#x")
>                     continue;
> 
>-                for (let property of rule.style.allProperties) {
>+                for (let property of rule.style.properties) {
>                     switch (property.name) {
>                     case "background-repeat":
>                     case "background-repeat-x":
>@@ -176,7 +176,7 @@ function test() {
>                 // synthesize a value for the CSSProperty if it is falsy.  This is used for cases
>                 // where a shorthand property is written in the style, since the longhand properties
>                 // (with corresponding values) are still sent to the frontend.
>-                for (let property of rule.style.properties) {
>+                for (let property of rule.style.enabledProperties) {
>                     switch (property.name) {
>                     case "background-repeat":
>                         InspectorTest.expectEqual(property.text, "background-repeat: repeat;", `"${property.name}" has the text "background-repeat: repeat;".`);
>@@ -210,14 +210,14 @@ function test() {
>                 if (rule.selectorText !== "div#x")
>                     continue;
> 
>-                let propertiesLength = rule.style.allProperties.length;
>-                let firstProperty = rule.style.allProperties[0];
>-                let secondProperty = rule.style.allProperties[1];
>+                let propertiesLength = rule.style.properties.length;
>+                let firstProperty = rule.style.properties[0];
>+                let secondProperty = rule.style.properties[1];
> 
>-                rule.style.allProperties[0].remove();
>+                rule.style.properties[0].remove();
> 
>-                InspectorTest.expectEqual(rule.style.allProperties.length, propertiesLength - 1, "The removed property should no longer be in allProperties array.");
>-                InspectorTest.expectEqual(rule.style.allProperties[0], secondProperty, "The second property should shift and become the first.");
>+                InspectorTest.expectEqual(rule.style.properties.length, propertiesLength - 1, "The removed property should no longer be in properties array.");
>+                InspectorTest.expectEqual(rule.style.properties[0], secondProperty, "The second property should shift and become the first.");
>             }
> 
>             resolve();
>diff --git a/LayoutTests/inspector/css/force-page-appearance.html b/LayoutTests/inspector/css/force-page-appearance.html
>index 178b4c0d5a9..aaa561ce589 100644
>--- a/LayoutTests/inspector/css/force-page-appearance.html
>+++ b/LayoutTests/inspector/css/force-page-appearance.html
>@@ -14,7 +14,7 @@ function test() {
> 
>     let getProperty = (propertyName) => {
>         let styleDeclaration = nodeStyles.computedStyle;
>-        for (let property of styleDeclaration.properties) {
>+        for (let property of styleDeclaration.enabledProperties) {
>             if (property.name === propertyName)
>                 return property;
>         }
>diff --git a/LayoutTests/inspector/css/matched-style-properties.html b/LayoutTests/inspector/css/matched-style-properties.html
>index b2e69def03e..b5d8c10e2ba 100644
>--- a/LayoutTests/inspector/css/matched-style-properties.html
>+++ b/LayoutTests/inspector/css/matched-style-properties.html
>@@ -40,8 +40,8 @@ function test() {
>             if (rule.type !== WI.CSSStyleSheet.Type.Author)
>                 continue;
> 
>-            for (var j = 0; j < rule.style.properties.length; ++j) {
>-                var property = rule.style.properties[j];
>+            for (var j = 0; j < rule.style.enabledProperties.length; ++j) {
>+                var property = rule.style.enabledProperties[j];
> 
>                 if (property.anonymous)
>                     continue;
>diff --git a/LayoutTests/inspector/css/modify-css-property.html b/LayoutTests/inspector/css/modify-css-property.html
>index 52266588482..c1817029f76 100644
>--- a/LayoutTests/inspector/css/modify-css-property.html
>+++ b/LayoutTests/inspector/css/modify-css-property.html
>@@ -29,7 +29,7 @@ function test() {
> 
>             let getProperty = (propertyName) => {
>                 let styleDeclaration = getMatchedStyleDeclaration();
>-                for (let property of styleDeclaration.properties) {
>+                for (let property of styleDeclaration.enabledProperties) {
>                     if (property.name === propertyName)
>                         return property;
>                 }
>@@ -64,7 +64,7 @@ function test() {
> 
>             let getProperty = (propertyName) => {
>                 let styleDeclaration = getMatchedStyleDeclaration();
>-                for (let property of styleDeclaration.properties) {
>+                for (let property of styleDeclaration.enabledProperties) {
>                     if (property.name === propertyName)
>                         return property;
>                 }
>@@ -107,7 +107,7 @@ function test() {
> 
>             let getProperty = (propertyName) => {
>                 let styleDeclaration = getInlineStyleDeclaration();
>-                for (let property of styleDeclaration.properties) {
>+                for (let property of styleDeclaration.enabledProperties) {
>                     if (property.name === propertyName)
>                         return property;
>                 }
>@@ -153,7 +153,7 @@ function test() {
> 
>             let getProperty = (propertyName) => {
>                 let styleDeclaration = getMatchedStyleDeclaration();
>-                for (let property of styleDeclaration.allProperties) {
>+                for (let property of styleDeclaration.properties) {
>                     if (property.name === propertyName)
>                         return property;
>                 }
>@@ -200,7 +200,7 @@ function test() {
> 
>             let getProperty = (propertyName) => {
>                 let styleDeclaration = getMatchedStyleDeclaration();
>-                for (let property of styleDeclaration.allProperties) {
>+                for (let property of styleDeclaration.properties) {
>                     if (property.name === propertyName)
>                         return property;
>                 }
>diff --git a/LayoutTests/inspector/css/shadow-scoped-style.html b/LayoutTests/inspector/css/shadow-scoped-style.html
>index e4dc2db25de..284b8155201 100644
>--- a/LayoutTests/inspector/css/shadow-scoped-style.html
>+++ b/LayoutTests/inspector/css/shadow-scoped-style.html
>@@ -13,7 +13,7 @@ function test()
> 
>     function generateCSSRuleString(style) {
>         let styleText = style.selectorText + " {\n";
>-        for (let property of style.properties) {
>+        for (let property of style.enabledProperties) {
>             if (property.anonymous)
>                 continue;
> 
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index fe668cfe686..deebf57b6af 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,47 @@
>+2019-01-22  Nikita Vasilyev  <nvasilyev@apple.com>
>+
>+        Web Inspector: Styles: refactor properties/allProperties/visibleProperties/allVisibleProperties
>+        https://bugs.webkit.org/show_bug.cgi?id=193615
>+
>+        Reviewed by Devin Rousso.
>+
>+        Remove unused visibleProperties.
>+
>+        Rename:
>+        - properties to enabledProperties;
>+        - allProperties to properties;
>+        - allVisibleProperties to visibleProperties.
>+
>+        * UserInterface/Models/CSSProperty.js:
>+        (WI.CSSProperty.prototype._prependSemicolonIfNeeded):
>+        (WI.CSSProperty):
>+        * UserInterface/Models/CSSStyleDeclaration.js:
>+        (WI.CSSStyleDeclaration):
>+        (WI.CSSStyleDeclaration.prototype.get enabledProperties):
>+        (WI.CSSStyleDeclaration.prototype.get properties):
>+        (WI.CSSStyleDeclaration.prototype.propertyForName):
>+        (WI.CSSStyleDeclaration.prototype.newBlankProperty):
>+        (WI.CSSStyleDeclaration.prototype.shiftPropertiesAfter):
>+        (WI.CSSStyleDeclaration.prototype._rangeAfterPropertyAtIndex):
>+        * UserInterface/Models/DOMNodeStyles.js:
>+        (WI.DOMNodeStyles.prototype._parseStylePropertyPayload):
>+        (WI.DOMNodeStyles.prototype._markOverriddenProperties):
>+        (WI.DOMNodeStyles.prototype._associateRelatedProperties):
>+        (WI.DOMNodeStyles.prototype._isPropertyFoundInMatchingRules):
>+        (WI.DOMNodeStyles):
>+        * UserInterface/Views/BoxModelDetailsSectionRow.js:
>+        (WI.BoxModelDetailsSectionRow.prototype._updateMetrics):
>+        * UserInterface/Views/ComputedStyleDetailsPanel.js:
>+        (WI.ComputedStyleDetailsPanel.prototype._computePropertyTraces):
>+        * UserInterface/Views/ComputedStyleSection.js:
>+        (WI.ComputedStyleSection.prototype.get propertiesToRender):
>+        * UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.js:
>+        (WI.SpreadsheetCSSStyleDeclarationEditor.prototype.get propertiesToRender):
>+        * UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js:
>+        (WI.SpreadsheetRulesStyleDetailsPanel.prototype.layout):
>+        * UserInterface/Views/SpreadsheetStyleProperty.js:
>+        (WI.SpreadsheetStyleProperty.prototype.updateStatus):
>+
> 2019-01-18  Jer Noble  <jer.noble@apple.com>
> 
>         SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>diff --git a/Source/WebInspectorUI/UserInterface/Models/CSSProperty.js b/Source/WebInspectorUI/UserInterface/Models/CSSProperty.js
>index 4ba36efc8c3..172a1345e1c 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/CSSProperty.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/CSSProperty.js
>@@ -392,7 +392,7 @@ WI.CSSProperty = class CSSProperty extends WI.Object
>     _prependSemicolonIfNeeded()
>     {
>         for (let i = this.index - 1; i >= 0; --i) {
>-            let property = this._ownerStyle.allProperties[i];
>+            let property = this._ownerStyle.properties[i];
>             if (!property.enabled)
>                 continue;
> 
>diff --git a/Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js b/Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js
>index 62f11405844..1ddc3ff558d 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js
>@@ -44,8 +44,9 @@ WI.CSSStyleDeclaration = class CSSStyleDeclaration extends WI.Object
>         this._pendingProperties = [];
>         this._propertyNameMap = {};
> 
>-        this._allProperties = [];
>-        this._allVisibleProperties = null;
>+        this._properties = [];
>+        this._enabledProperties = [];
>+        this._visibleProperties = null;
> 
>         this.update(text, properties, styleSheetTextRange, {dontFireEvents: true});
>     }
>@@ -114,18 +115,17 @@ WI.CSSStyleDeclaration = class CSSStyleDeclaration extends WI.Object
>         var oldText = this._text;
> 
>         this._text = text;
>-        this._properties = properties.filter((property) => property.enabled);
>-        this._allProperties = properties;
>+        this._properties = properties;
>+        this._enabledProperties = properties.filter((property) => property.enabled);
> 
>         this._styleSheetTextRange = styleSheetTextRange;
>         this._propertyNameMap = {};
> 
>-        delete this._visibleProperties;
>-        this._allVisibleProperties = null;
>+        this._visibleProperties = null;
> 
>         var editable = this.editable;
> 
>-        for (let property of this._allProperties) {
>+        for (let property of this._properties) {
>             property.ownerStyle = this;
> 
>             // Store the property in a map if we aren't editable. This
>@@ -144,7 +144,7 @@ WI.CSSStyleDeclaration = class CSSStyleDeclaration extends WI.Object
>         for (var i = 0; i < oldProperties.length; ++i) {
>             var oldProperty = oldProperties[i];
> 
>-            if (!this._properties.includes(oldProperty)) {
>+            if (!this._enabledProperties.includes(oldProperty)) {
>                 // Clear the index, since it is no longer valid.
>                 oldProperty.index = NaN;
> 
>@@ -161,9 +161,9 @@ WI.CSSStyleDeclaration = class CSSStyleDeclaration extends WI.Object
>             return;
> 
>         var addedProperties = [];
>-        for (var i = 0; i < this._properties.length; ++i) {
>-            if (!oldProperties.includes(this._properties[i]))
>-                addedProperties.push(this._properties[i]);
>+        for (var i = 0; i < this._enabledProperties.length; ++i) {
>+            if (!oldProperties.includes(this._enabledProperties[i]))
>+                addedProperties.push(this._enabledProperties[i]);
>         }
> 
>         // Don't fire the event if there is text and it hasn't changed.
>@@ -220,20 +220,12 @@ WI.CSSStyleDeclaration = class CSSStyleDeclaration extends WI.Object
>         this._nodeStyles.changeStyleText(this, text);
>     }
> 
>-    get properties()
>+    get enabledProperties()
>     {
>-        return this._properties;
>+        return this._enabledProperties;
>     }
> 
>-    get allProperties() { return this._allProperties; }
>-
>-    get allVisibleProperties()
>-    {
>-        if (!this._allVisibleProperties)
>-            this._allVisibleProperties = this._allProperties.filter((property) => !!property.styleDeclarationTextRange);
>-
>-        return this._allVisibleProperties;
>-    }
>+    get properties() { return this._properties; }
> 
>     get visibleProperties()
>     {
>@@ -293,7 +285,7 @@ WI.CSSStyleDeclaration = class CSSStyleDeclaration extends WI.Object
> 
>         var bestMatchProperty = null;
> 
>-        findMatch(this._properties);
>+        findMatch(this._enabledProperties);
> 
>         if (bestMatchProperty)
>             return bestMatchProperty;
>@@ -314,11 +306,6 @@ WI.CSSStyleDeclaration = class CSSStyleDeclaration extends WI.Object
>         return newProperty;
>     }
> 
>-    hasProperties()
>-    {
>-        return !!this._properties.length;
>-    }
>-
>     newBlankProperty(propertyIndex)
>     {
>         let text, name, value, priority, overridden, implicit, anonymous;
>@@ -328,11 +315,11 @@ WI.CSSStyleDeclaration = class CSSStyleDeclaration extends WI.Object
> 
>         let property = new WI.CSSProperty(propertyIndex, text, name, value, priority, enabled, overridden, implicit, anonymous, valid, styleSheetTextRange);
> 
>-        this._allProperties.insertAtIndex(property, propertyIndex);
>-        for (let index = propertyIndex + 1; index < this._allProperties.length; index++)
>-            this._allProperties[index].index = index;
>+        this._properties.insertAtIndex(property, propertyIndex);
>+        for (let index = propertyIndex + 1; index < this._properties.length; index++)
>+            this._properties[index].index = index;
> 
>-        this.update(this._text, this._allProperties, this._styleSheetTextRange, {dontFireEvents: true, suppressLock: true});
>+        this.update(this._text, this._properties, this._styleSheetTextRange, {dontFireEvents: true, suppressLock: true});
> 
>         return property;
>     }
>@@ -340,14 +327,14 @@ WI.CSSStyleDeclaration = class CSSStyleDeclaration extends WI.Object
>     shiftPropertiesAfter(cssProperty, lineDelta, columnDelta, propertyWasRemoved)
>     {
>         // cssProperty.index could be set to NaN by WI.CSSStyleDeclaration.prototype.update.
>-        let realIndex = this._allProperties.indexOf(cssProperty);
>+        let realIndex = this._properties.indexOf(cssProperty);
>         if (realIndex === -1)
>             return;
> 
>         let endLine = cssProperty.styleSheetTextRange.endLine;
> 
>-        for (let i = realIndex + 1; i < this._allProperties.length; i++) {
>-            let property = this._allProperties[i];
>+        for (let i = realIndex + 1; i < this._properties.length; i++) {
>+            let property = this._properties[i];
> 
>             if (property._styleSheetTextRange) {
>                 if (property.styleSheetTextRange.startLine === endLine) {
>@@ -362,10 +349,10 @@ WI.CSSStyleDeclaration = class CSSStyleDeclaration extends WI.Object
>         }
> 
>         if (propertyWasRemoved)
>-            this._allProperties.splice(realIndex, 1);
>+            this._properties.splice(realIndex, 1);
> 
>         // Invalidate cached properties.
>-        this._allVisibleProperties = null;
>+        this._visibleProperties = null;
>     }
> 
>     // Protected
>@@ -382,10 +369,10 @@ WI.CSSStyleDeclaration = class CSSStyleDeclaration extends WI.Object
>         if (index < 0)
>             return this._styleSheetTextRange.collapseToStart();
> 
>-        if (index >= this.allVisibleProperties.length)
>+        if (index >= this.visibleProperties.length)
>             return this._styleSheetTextRange.collapseToEnd();
> 
>-        let property = this.allVisibleProperties[index];
>+        let property = this.visibleProperties[index];
>         return property.styleSheetTextRange.collapseToEnd();
>     }
> };
>diff --git a/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js b/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js
>index f44b05628a1..16cf2ff3f28 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js
>@@ -536,7 +536,7 @@ WI.DOMNodeStyles = class DOMNodeStyles extends WI.Object
> 
>         if (styleDeclaration) {
>             // Use propertyForName when the index is NaN since propertyForName is fast in that case.
>-            var property = isNaN(index) ? styleDeclaration.propertyForName(name, true) : styleDeclaration.properties[index];
>+            var property = isNaN(index) ? styleDeclaration.propertyForName(name, true) : styleDeclaration.enabledProperties[index];
> 
>             // Reuse a property if the index and name matches. Otherwise it is a different property
>             // and should be created from scratch. This works in the simple cases where only existing
>@@ -880,7 +880,7 @@ WI.DOMNodeStyles = class DOMNodeStyles extends WI.Object
> 
>         for (var i = 0; i < styles.length; ++i) {
>             var style = styles[i];
>-            var properties = style.properties;
>+            var properties = style.enabledProperties;
> 
>             for (var j = 0; j < properties.length; ++j) {
>                 var property = properties[j];
>@@ -922,7 +922,7 @@ WI.DOMNodeStyles = class DOMNodeStyles extends WI.Object
>     _associateRelatedProperties(styles, propertyNameToEffectiveProperty)
>     {
>         for (var i = 0; i < styles.length; ++i) {
>-            var properties = styles[i].properties;
>+            var properties = styles[i].enabledProperties;
> 
>             var knownShorthands = {};
> 
>@@ -979,7 +979,7 @@ WI.DOMNodeStyles = class DOMNodeStyles extends WI.Object
>     _isPropertyFoundInMatchingRules(propertyName)
>     {
>         return this._orderedStyles.some((style) => {
>-            return style.properties.some((property) => property.name === propertyName);
>+            return style.enabledProperties.some((property) => property.name === propertyName);
>         });
>     }
> };
>diff --git a/Source/WebInspectorUI/UserInterface/Views/BoxModelDetailsSectionRow.js b/Source/WebInspectorUI/UserInterface/Views/BoxModelDetailsSectionRow.js
>index 9441b2af435..e8b9388845b 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/BoxModelDetailsSectionRow.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/BoxModelDetailsSectionRow.js
>@@ -200,7 +200,7 @@ WI.BoxModelDetailsSectionRow = class BoxModelDetailsSectionRow extends WI.Detail
> 
>         this._boxElements = [];
> 
>-        if (!style.hasProperties()) {
>+        if (style.enabledProperties.length === 0) {
>             this.showEmptyMessage();
>             return;
>         }
>diff --git a/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js b/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js
>index fa6903f769e..fe0c520a187 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js
>@@ -166,7 +166,7 @@ WI.ComputedStyleDetailsPanel = class ComputedStyleDetailsPanel extends WI.StyleD
>     {
>         let result = new Map();
>         for (let rule of orderedDeclarations) {
>-            for (let property of rule.allProperties) {
>+            for (let property of rule.properties) {
>                 let properties = result.get(property.name);
>                 if (!properties) {
>                     properties = [];
>diff --git a/Source/WebInspectorUI/UserInterface/Views/ComputedStyleSection.js b/Source/WebInspectorUI/UserInterface/Views/ComputedStyleSection.js
>index a2072202b79..486fa319868 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/ComputedStyleSection.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/ComputedStyleSection.js
>@@ -125,9 +125,9 @@ WI.ComputedStyleSection = class ComputedStyleSection extends WI.View
>             return properties;
> 
>         if (this._style._styleSheetTextRange)
>-            properties = this._style.allVisibleProperties;
>+            properties = this._style.visibleProperties;
>         else
>-            properties = this._style.allProperties;
>+            properties = this._style.properties;
> 
>         properties.sort((a, b) => a.name.extendedLocaleCompare(b.name));
> 
>diff --git a/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.js b/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.js
>index 2411bfee15a..52d494a8730 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.js
>@@ -222,9 +222,9 @@ WI.SpreadsheetCSSStyleDeclarationEditor = class SpreadsheetCSSStyleDeclarationEd
>             return properties;
> 
>         if (this._style._styleSheetTextRange)
>-            properties = this._style.allVisibleProperties;
>+            properties = this._style.visibleProperties;
>         else
>-            properties = this._style.allProperties;
>+            properties = this._style.properties;
> 
>         if (this._sortPropertiesByName)
>             properties.sort((a, b) => a.name.extendedLocaleCompare(b.name));
>diff --git a/Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js b/Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js
>index d8f0a5a4d25..3f99aa09132 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js
>@@ -236,7 +236,7 @@ WI.SpreadsheetRulesStyleDetailsPanel = class SpreadsheetRulesStyleDetailsPanel e
> 
>             section.addEventListener(WI.SpreadsheetCSSStyleDeclarationSection.Event.FilterApplied, this._handleSectionFilterApplied, this);
> 
>-            if (this._newRuleSelector === style.selectorText && !style.hasProperties())
>+            if (this._newRuleSelector === style.selectorText && style.enabledProperties.length === 0)
>                 section.startEditingRuleSelector();
> 
>             this.addSubview(section);
>diff --git a/Source/WebInspectorUI/UserInterface/Views/SpreadsheetStyleProperty.js b/Source/WebInspectorUI/UserInterface/Views/SpreadsheetStyleProperty.js
>index 8529fa3e055..611d816f907 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/SpreadsheetStyleProperty.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/SpreadsheetStyleProperty.js
>@@ -247,7 +247,7 @@ WI.SpreadsheetStyleProperty = class SpreadsheetStyleProperty extends WI.Object
>         let duplicatePropertyExistsBelow = (cssProperty) => {
>             let propertyFound = false;
> 
>-            for (let property of this._property.ownerStyle.properties) {
>+            for (let property of this._property.ownerStyle.enabledProperties) {
>                 if (property === cssProperty)
>                     propertyFound = true;
>                 else if (property.name === cssProperty.name && propertyFound)

Actions: View | Formatted Diff | Diff

Attachments on bug 193615: 359626 | 359630 | 359817