Changeset 246621 in webkit

Timestamp:

Jun 19, 2019 5:40:27 PM (5 years ago)

Author:

Nikita Vasilyev

Message:

REGRESSION(r240946): Web Inspector: Styles: Pasting multiple properties has issues
​https://bugs.webkit.org/show_bug.cgi?id=198505
<rdar://problem/51374780>

Reviewed by Matt Baker.

Source/WebInspectorUI:

Since r240946, setting WI.CSSStyleDeclaration.prototype.text updates the text immediately.
When WI.CSSStyleDeclaration.prototype.update gets called after setting text, it exits early
without firing WI.CSSStyleDeclaration.Event.PropertiesChanged.

• UserInterface/Models/CSSStyleDeclaration.js:

(WI.CSSStyleDeclaration):
(WI.CSSStyleDeclaration.prototype.set text):

LayoutTests:

• inspector/css/modify-css-property.html:

Listen for PropertiesChanged on the specific inline style declaration.
In Debug, PropertiesChanged may fire on a computed style declaration first,
causing the test to fail.

• inspector/css/pseudo-element-matches-for-pseudo-element-node.html:

Drive-by: fix trailing white space.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/css/modify-css-property.html (modified) (1 diff)
• LayoutTests/inspector/css/pseudo-element-matches-for-pseudo-element-node.html (modified) (1 diff)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-06-19  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        REGRESSION(r240946): Web Inspector: Styles: Pasting multiple properties has issues
+        https://bugs.webkit.org/show_bug.cgi?id=198505
+        <rdar://problem/51374780>
+
+        Reviewed by Matt Baker.
+
+        * inspector/css/modify-css-property.html:
+        Listen for PropertiesChanged on the specific inline style declaration.
+        In Debug, PropertiesChanged may fire on a computed style declaration first,
+        causing the test to fail.
+
+        * inspector/css/pseudo-element-matches-for-pseudo-element-node.html:
+        Drive-by: fix trailing white space.
+
 2019-06-19  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/inspector/css/modify-css-property.html

@@ -118 +118 @@
             let styleDeclaration = getInlineStyleDeclaration();
 
-            WI.CSSStyleDeclaration.awaitEvent(WI.CSSStyleDeclaration.Event.PropertiesChanged).then((event) => {
+            styleDeclaration.awaitEvent(WI.CSSStyleDeclaration.Event.PropertiesChanged).then((event) => {
                 InspectorTest.expectThat(!styleDeclaration.locked, `Style declaration is unlocked.`);
                 InspectorTest.expectEqual(getProperty("width").rawValue, "200px", `"width" property value should update to "200px".`);

trunk/LayoutTests/inspector/css/pseudo-element-matches-for-pseudo-element-node.html

@@ -35 +35 @@
         }
 
-        InspectorTest.completeTest();                
+        InspectorTest.completeTest();
     }
 

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-06-19  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        REGRESSION(r240946): Web Inspector: Styles: Pasting multiple properties has issues
+        https://bugs.webkit.org/show_bug.cgi?id=198505
+        <rdar://problem/51374780>
+
+        Reviewed by Matt Baker.
+
+        Since r240946, setting WI.CSSStyleDeclaration.prototype.text updates the text immediately.
+        When WI.CSSStyleDeclaration.prototype.update gets called after setting text, it exits early
+        without firing WI.CSSStyleDeclaration.Event.PropertiesChanged.
+
+        * UserInterface/Models/CSSStyleDeclaration.js:
+        (WI.CSSStyleDeclaration):
+        (WI.CSSStyleDeclaration.prototype.set text):
+
 2019-06-19  Matt Baker  <mattbaker@apple.com>
 

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

@@ -43 +43 @@
         this._initialState = null;
         this._updatesInProgressCount = 0;
+        this._pendingPropertiesChanged = false;
         this._locked = false;
         this._pendingProperties = [];
@@ -184 +185 @@
         // Don't fire the event if text hasn't changed. However, it should still fire for Computed style declarations
         // because it never has text.
-        if (oldText === this._text && this._type !== WI.CSSStyleDeclaration.Type.Computed)
-            return;
+        if (oldText === this._text && !this._pendingPropertiesChanged && this._type !== WI.CSSStyleDeclaration.Type.Computed)
+            return;
+
+        this._pendingPropertiesChanged = false;
 
         function delayed()
@@ -238 +241 @@
             timeoutId = null;
             this._updatesInProgressCount = Math.max(0, this._updatesInProgressCount - 1);
+            this._pendingPropertiesChanged = true;
         };