Attachment 382549 Details for Bug 203722 – Patch

[patch] Patch

bug-203722-20191031213035.patch (text/plain), 3.06 KB, created by Devin Rousso on 2019-10-31 21:30:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-10-31 21:30:36 PDT

Size: 3.06 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 45c8bb19af6007710e88de354968b0e1783098c9..84c64357e47743a854d0377743a0d719f7d9c048 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-10-31  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: REGRESSION(?): 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 NOBODY (OOPS!).
>+
>+        * UserInterface/Models/SourceCode.js:
>+        (WI.SourceCode.prototype.get currentRevision):
>+        (WI.SourceCode.prototype.revisionContentDidChange):
>+        (WI.SourceCode.prototype._processContent):
>+        (WI.SourceCode.prototype._initializeCurrentRevisionIfNeeded): Deleted.
>+        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-10-31  Nikita Vasilyev  <nvasilyev@apple.com>
> 
>         Web Inspector: Color picker: incorrect saturation when selecting color on color square
>diff --git a/Source/WebInspectorUI/UserInterface/Models/SourceCode.js b/Source/WebInspectorUI/UserInterface/Models/SourceCode.js
>index af78650704e507ba18c50127187c715e8e0507e9..3369369f066c65fbb45f59b0cd8c523280f2a34e 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/SourceCode.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/SourceCode.js
>@@ -66,7 +66,6 @@ WI.SourceCode = class SourceCode extends WI.Object
> 
>     get currentRevision()
>     {
>-        this._initializeCurrentRevisionIfNeeded();
>         return this._currentRevision;
>     }
> 
>@@ -178,6 +177,9 @@ WI.SourceCode = class SourceCode extends WI.Object
> 
>     revisionContentDidChange(revision)
>     {
>+        if (revision === this._originalRevision && this._currentRevision === this._originalRevision)
>+            this._currentRevision = this._originalRevision.copy();
>+
>         if (this._ignoreRevisionContentDidChangeEvent)
>             return;
> 
>@@ -221,12 +223,6 @@ WI.SourceCode = class SourceCode extends WI.Object
> 
>     // Private
> 
>-    _initializeCurrentRevisionIfNeeded()
>-    {
>-        if (this._currentRevision === this._originalRevision)
>-            this.currentRevision = this._originalRevision.copy();
>-    }
>-
>     _processContent(parameters)
>     {
>         // Different backend APIs return one of `content, `body`, `text`, or `scriptSource`.
>@@ -249,8 +245,6 @@ WI.SourceCode = class SourceCode extends WI.Object
>         });
>         this._ignoreRevisionContentDidChangeEvent = false;
> 
>-        this._initializeCurrentRevisionIfNeeded();
>-
>         // FIXME: Returning the content in this promise is misleading. It may not be current content
>         // now, and it may become out-dated later on. We should drop content from this promise
>         // and require clients to ask for the current contents from the sourceCode in the result.

Actions: View | Formatted Diff | Diff

Attachments on bug 203722: 382549 | 382565