Changeset 247747 in webkit

Timestamp:

Jul 23, 2019 2:50:59 PM (5 years ago)

Author:

Nikita Vasilyev

Message:

Web Inspector: Display "Resource has no content" for about:blank iframes instead of an error
​https://bugs.webkit.org/show_bug.cgi?id=198029

Reviewed by Devin Rousso.

Display "about:blank" in the middle of the content view when selecting "about:blank" resources.
Previoulsly, we showed a misleading "An error occurred trying to load the resource" error
message.

• UserInterface/Models/CSSStyleSheet.js:

(WI.CSSStyleSheet.prototype.requestContentFromBackend):

• UserInterface/Models/Resource.js:

(WI.Resource.prototype.requestContentFromBackend):

• UserInterface/Models/Script.js:

(WI.Script.prototype.requestContentFromBackend):

• UserInterface/Models/SourceCode.js:

(WI.SourceCode.generateSpecialContentForURL):
(WI.SourceCode.prototype._processContent):
(WI.SourceCode):

• UserInterface/Views/ResourceContentView.js:

(WI.ResourceContentView.prototype._contentAvailable):

• UserInterface/Views/SourceCodeTextEditor.js:

(WI.SourceCodeTextEditor.prototype._contentAvailable):
(WI.SourceCodeTextEditor.prototype._showMessage):

• UserInterface/Views/TextResourceContentView.js:

(WI.TextResourceContentView.prototype._contentDidPopulate):
Display empty text editor when it has no content instead of "Resource has no content" message.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/CSSStyleSheet.js (modified) (1 diff)
• UserInterface/Models/Resource.js (modified) (1 diff)
• UserInterface/Models/Script.js (modified) (1 diff)
• UserInterface/Models/SourceCode.js (modified) (3 diffs)
• UserInterface/Views/ResourceContentView.js (modified) (1 diff)
• UserInterface/Views/SourceCodeTextEditor.js (modified) (2 diffs)
• UserInterface/Views/TextResourceContentView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-07-23  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        Web Inspector: Display "Resource has no content" for about:blank iframes instead of an error
+        https://bugs.webkit.org/show_bug.cgi?id=198029
+
+        Reviewed by Devin Rousso.
+
+        Display "about:blank" in the middle of the content view when selecting "about:blank" resources.
+        Previoulsly, we showed a misleading "An error occurred trying to load the resource" error
+        message.
+
+        * UserInterface/Models/CSSStyleSheet.js:
+        (WI.CSSStyleSheet.prototype.requestContentFromBackend):
+        * UserInterface/Models/Resource.js:
+        (WI.Resource.prototype.requestContentFromBackend):
+        * UserInterface/Models/Script.js:
+        (WI.Script.prototype.requestContentFromBackend):
+        * UserInterface/Models/SourceCode.js:
+        (WI.SourceCode.generateSpecialContentForURL):
+        (WI.SourceCode.prototype._processContent):
+        (WI.SourceCode):
+        * UserInterface/Views/ResourceContentView.js:
+        (WI.ResourceContentView.prototype._contentAvailable):
+
+        * UserInterface/Views/SourceCodeTextEditor.js:
+        (WI.SourceCodeTextEditor.prototype._contentAvailable):
+        (WI.SourceCodeTextEditor.prototype._showMessage):
+        * UserInterface/Views/TextResourceContentView.js:
+        (WI.TextResourceContentView.prototype._contentDidPopulate):
+        Display empty text editor when it has no content instead of "Resource has no content" message.
+
 2019-07-22  Devin Rousso  <drousso@apple.com>
 

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

@@ -191 +191 @@
     requestContentFromBackend()
     {
+        let specialContentPromise = WI.SourceCode.generateSpecialContentForURL(this._url);
+        if (specialContentPromise)
+            return specialContentPromise;
+
         if (!this._id) {
             // There is no identifier to request content with. Reject the promise to cause the

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

@@ -820 +820 @@
     requestContentFromBackend()
     {
+        let specialContentPromise = WI.SourceCode.generateSpecialContentForURL(this._url);
+        if (specialContentPromise)
+            return specialContentPromise;
+
         // If we have the requestIdentifier we can get the actual response for this specific resource.
         // Otherwise the content will be cached resource data, which might not exist anymore.

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

@@ -186 +186 @@
     requestContentFromBackend()
     {
+        let specialContentPromise = WI.SourceCode.generateSpecialContentForURL(this._url);
+        if (specialContentPromise)
+            return specialContentPromise;
+
         if (!this._id) {
             // There is no identifier to request content with. Return false to cause the

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

@@ -38 +38 @@
     }
 
+    // Static
+
+    static generateSpecialContentForURL(url)
+    {
+        if (url === "about:blank") {
+            return Promise.resolve({
+                content: "",
+                message: WI.unlocalizedString("about:blank")
+            });
+        }
+        return null;
+    }
+
     // Public
 
@@ -198 +211 @@
         let content = rawContent;
         let error = parameters.error;
+        let message = parameters.message;
         if (parameters.base64Encoded)
             content = content ? decodeBase64ToBlob(content, this.mimeType) : "";
@@ -213 +227 @@
         return Promise.resolve({
             error,
+            message,
             sourceCode: this,
             content,

trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js

@@ -136 +136 @@
         }
 
+        if (parameters.message) {
+            this.showMessage(parameters.message);
+            return;
+        }
+
         // Content is ready to show, call the public method now.
         console.assert(!this._hasContent());

trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js

@@ -528 +528 @@
             return;
 
+        if (parameters.message) {
+            this._showMessage(parameters.message);
+            return;
+        }
+
         var sourceCode = parameters.sourceCode;
         var content = sourceCode.content;
@@ -549 +554 @@
 
         this.repeatReveal = false;
+    }
+
+    _showMessage(message)
+    {
+        this.element.removeChildren();
+        this.element.appendChild(WI.createMessageTextView(message));
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js

@@ -215 +215 @@
         this._codeCoverageButtonNavigationItem.enabled = this._textEditor.canShowCoverageHints();
         this._codeCoverageButtonNavigationItem.activated = WI.settings.enableControlFlowProfiler.value;
-
-        if (!this._textEditor.string)
-            this.showGenericNoContentMessage();
     }