Changeset 240368 in webkit

Timestamp:

Jan 23, 2019 4:59:12 PM (5 years ago)

Author:

Nikita Vasilyev

Message:

Web Inspector: Refactor WI.CSSStyleDeclaration.prototype.update
​https://bugs.webkit.org/show_bug.cgi?id=193737

Reviewed by Matt Baker.

Remove unused event data from the WI.CSSStyleDeclaration.Event.PropertiesChanged event.

• UserInterface/Models/CSSStyleDeclaration.js:

(WI.CSSStyleDeclaration.prototype.update):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/CSSStyleDeclaration.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-01-23  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        Web Inspector: Refactor WI.CSSStyleDeclaration.prototype.update
+        https://bugs.webkit.org/show_bug.cgi?id=193737
+
+        Reviewed by Matt Baker.
+
+        Remove unused event data from the WI.CSSStyleDeclaration.Event.PropertiesChanged event.
+
+        * UserInterface/Models/CSSStyleDeclaration.js:
+        (WI.CSSStyleDeclaration.prototype.update):
+
 2019-01-23  Devin Rousso  <drousso@apple.com>
 

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

@@ -112 +112 @@
         properties = properties || [];
 
-        var oldProperties = this._properties || [];
-        var oldText = this._text;
+        let oldProperties = this._properties || [];
+        let oldText = this._text;
 
         this._text = text;
@@ -124 +124 @@
         this._visibleProperties = null;
 
-        var editable = this.editable;
+        let editable = this.editable;
 
         for (let property of this._properties) {
@@ -141 +141 @@
         }
 
-        var removedProperties = [];
-        for (var i = 0; i < oldProperties.length; ++i) {
-            var oldProperty = oldProperties[i];
-
-            if (!this._enabledProperties.includes(oldProperty)) {
-                // Clear the index, since it is no longer valid.
-                oldProperty.index = NaN;
-
-                removedProperties.push(oldProperty);
-
-                // Keep around old properties in pending in case they
-                // are needed again during editing.
-                if (editable)
-                    this._pendingProperties.push(oldProperty);
-            }
+        for (let oldProperty of oldProperties) {
+            if (this._enabledProperties.includes(oldProperty))
+                continue;
+
+            // Clear the index, since it is no longer valid.
+            oldProperty.index = NaN;
+
+            // Keep around old properties in pending in case they
+            // are needed again during editing.
+            if (editable)
+                this._pendingProperties.push(oldProperty);
         }
 
@@ -161 +157 @@
             return;
 
-        var addedProperties = [];
-        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.
-        if (oldText && this._text && oldText === this._text) {
-            if (!this._locked || suppressLock) {
-                // We shouldn't have any added or removed properties in this case.
-                console.assert(!addedProperties.length && !removedProperties.length);
-            }
-
-            if (!addedProperties.length && !removedProperties.length)
-                return;
-        }
+        if (oldText && this._text && oldText === this._text)
+            return;
 
         function delayed()
         {
-            this.dispatchEventToListeners(WI.CSSStyleDeclaration.Event.PropertiesChanged, {addedProperties, removedProperties});
+            this.dispatchEventToListeners(WI.CSSStyleDeclaration.Event.PropertiesChanged);
         }