Changeset 249037 in webkit

Timestamp:

Aug 22, 2019, 6:07:43 PM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION(r248485): stack overflow when viewing a source map generated from inline content
​https://bugs.webkit.org/show_bug.cgi?id=201042
<rdar://problem/54509750>

Reviewed by Antoine Quint.

In r248485, WI.ResourceClusterContentView was changed to requestContent whenever the
given resource finished loading (by listening for WI.Resource.Event.LoadingDidFinish).

Even though retrieving a source map's contents uses Promises, in the case that the content
was inlined in the "original" source code, the code path would mark the source map as being
finished (which would fire a WI.Resource.Event.LoadingDidFinish) _before_ it could return
a Promise, which would've been cached (WI.SourceCode.prototype.requestContent) and
preventend any reentrancy.

Wrapping the inline code path in a Promise.resolve() gives the WI.SourceCode a chance to
cache the Promise before any events are fired.

• UserInterface/Models/SourceMapResource.js:

(WI.SourceMapResource.prototype.requestContentFromBackend):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/SourceMapResource.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-08-22  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION(r248485): stack overflow when viewing a source map generated from inline content
+        https://bugs.webkit.org/show_bug.cgi?id=201042
+        <rdar://problem/54509750>
+
+        Reviewed by Antoine Quint.
+
+        In r248485, `WI.ResourceClusterContentView` was changed to `requestContent` whenever the
+        given resource finished loading (by listening for `WI.Resource.Event.LoadingDidFinish`).
+
+        Even though retrieving a source map's contents uses `Promise`s, in the case that the content
+        was inlined in the "original" source code, the code path would mark the source map as being
+        finished (which would fire a `WI.Resource.Event.LoadingDidFinish`) _before_ it could return
+        a `Promise`, which would've been cached (`WI.SourceCode.prototype.requestContent`) and
+        preventend any reentrancy.
+
+        Wrapping the inline code path in a `Promise.resolve()` gives the `WI.SourceCode` a chance to
+        cache the `Promise` before any events are fired.
+
+        * UserInterface/Models/SourceMapResource.js:
+        (WI.SourceMapResource.prototype.requestContentFromBackend):
+
 2019-08-22  Nikita Vasilyev  <nvasilyev@apple.com>
 

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

@@ -85 +85 @@
             // FIXME: We don't know the MIME-type for inline content. Guess by analyzing the content?
             // Returns a promise.
-            return sourceMapResourceLoaded.call(this, {content: inlineContent, mimeType: this.mimeType, statusCode: 200});
+            return Promise.resolve().then(sourceMapResourceLoaded.bind(this, {content: inlineContent, mimeType: this.mimeType, statusCode: 200}));
         }