Changeset 250618 in webkit

Timestamp:

Oct 2, 2019 11:49:53 AM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION(r250149): changing CSS via the Styles details sidebar panel doesn't update the associated resource
​https://bugs.webkit.org/show_bug.cgi?id=202446

Reviewed by Joseph Pecoraro.

When updating the text of a WI.CSSProperty (or the selector of a WI.CSSRule) is updated,
Web Inspector will update the backend style sheet, which will notify the WI.CSSManager of
the change, without ever going through the associated WI.SourceCode. WI.CSSManager then
updates the content of the WI.SourceCode to reflect these changes, but at that point the
WI.SourceCode hadn't yet "moved" it's currentRevision forward of it's originalRevision
which means it would get overridden the first time the WI.SourceCode updates itself.

Modify WI.SourceCode such that every path to get the currentRevision ensures that it is
"moved" forward before the WI.SourceCodeRevision value is returned.

• UserInterface/Models/SourceCode.js:

(WI.SourceCode.prototype.get currentRevision):
(WI.SourceCode.prototype.get content):
(WI.SourceCode.prototype.revisionContentDidChange):
(WI.SourceCode.prototype._initializeCurrentRevisionIfNeeded): Added.
(WI.SourceCode.prototype._processContent):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/SourceCode.js (modified) (5 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-10-02  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION(r250149): changing CSS via the Styles details sidebar panel doesn't update the associated resource
+        https://bugs.webkit.org/show_bug.cgi?id=202446
+
+        Reviewed by Joseph Pecoraro.
+
+        When updating the text of a `WI.CSSProperty` (or the selector of a `WI.CSSRule`) is updated,
+        Web Inspector will update the backend style sheet, which will notify the `WI.CSSManager` of
+        the change, without ever going through the associated `WI.SourceCode`. `WI.CSSManager` then
+        updates the content of the `WI.SourceCode` to reflect these changes, but at that point the
+        `WI.SourceCode` hadn't yet "moved" it's `currentRevision` forward of it's `originalRevision`
+        which means it would get overridden the first time the `WI.SourceCode` updates itself.
+
+        Modify `WI.SourceCode` such that every path to get the `currentRevision` ensures that it is
+        "moved" forward before the `WI.SourceCodeRevision` value is returned.
+
+        * UserInterface/Models/SourceCode.js:
+        (WI.SourceCode.prototype.get currentRevision):
+        (WI.SourceCode.prototype.get content):
+        (WI.SourceCode.prototype.revisionContentDidChange):
+        (WI.SourceCode.prototype._initializeCurrentRevisionIfNeeded): Added.
+        (WI.SourceCode.prototype._processContent):
+
 2019-10-01  Devin Rousso  <drousso@apple.com>
 

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

@@ -67 +67 @@
     get currentRevision()
     {
+        this._initializeCurrentRevisionIfNeeded();
         return this._currentRevision;
     }
@@ -87 +88 @@
     get content()
     {
-        return this._currentRevision.content;
+        return this.currentRevision.content;
     }
 
@@ -181 +182 @@
             return;
 
-        if (revision !== this._currentRevision)
+        if (revision !== this.currentRevision)
             return;
 
@@ -220 +221 @@
 
     // Private
+
+    _initializeCurrentRevisionIfNeeded()
+    {
+        if (this._currentRevision === this._originalRevision)
+            this.currentRevision = this._originalRevision.copy();
+    }
 
     _processContent(parameters)
@@ -238 +245 @@
         this._ignoreRevisionContentDidChangeEvent = false;
 
-        if (this._currentRevision === this._originalRevision)
-            this.currentRevision = this._originalRevision.copy();
+        this._initializeCurrentRevisionIfNeeded();
 
         // FIXME: Returning the content in this promise is misleading. It may not be current content