Changeset 251932 in webkit

Timestamp:

Nov 1, 2019 12:17:10 PM (4 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION(r249831): content view is empty if a breakpoint is hit in the main resource
​https://bugs.webkit.org/show_bug.cgi?id=203722
<rdar://problem/56802409>

Reviewed by Joseph Pecoraro.

• UserInterface/Models/SourceCode.js:

(WI.SourceCode.prototype.get currentRevision):
(WI.SourceCode.prototype.revisionContentDidChange):
(WI.SourceCode.prototype._initializeCurrentRevisionIfNeeded):
(WI.SourceCode.prototype._processContent):
Don't wait to lazily clone the originalRevision and use it as the currentRevision. Some
listeners expect the currentRevision to already be set by the time this happens, so as
soon as the original revision's content is changed, clone it into the currentRevision.

Location:

trunk/Source/WebInspectorUI

Files:

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

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-11-01  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION(r249831): content view is empty if a breakpoint is hit in the main resource
+        https://bugs.webkit.org/show_bug.cgi?id=203722
+        <rdar://problem/56802409>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Models/SourceCode.js:
+        (WI.SourceCode.prototype.get currentRevision):
+        (WI.SourceCode.prototype.revisionContentDidChange):
+        (WI.SourceCode.prototype._initializeCurrentRevisionIfNeeded):
+        (WI.SourceCode.prototype._processContent):
+        Don't wait to lazily clone the `originalRevision` and use it as the `currentRevision`. Some
+        listeners expect the `currentRevision` to already be set by the time this happens, so as
+        soon as the original revision's content is changed, clone it into the `currentRevision`.
+
 2019-11-01  Devin Rousso  <drousso@apple.com>
 

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

@@ -179 +179 @@
     revisionContentDidChange(revision)
     {
+        if (revision === this._originalRevision)
+            this._initializeCurrentRevisionIfNeeded();
+
         if (this._ignoreRevisionContentDidChangeEvent)
             return;
@@ -225 +228 @@
     {
         if (this._currentRevision === this._originalRevision)
-            this.currentRevision = this._originalRevision.copy();
+            this._currentRevision = this._originalRevision.copy();
     }
 
@@ -249 +252 @@
         });
         this._ignoreRevisionContentDidChangeEvent = false;
-
-        this._initializeCurrentRevisionIfNeeded();
 
         // FIXME: Returning the content in this promise is misleading. It may not be current content