Attachment 372989 Details for Bug 198029 – Patch

[patch] Patch

patch.txt (text/plain), 4.96 KB, created by Nikita Vasilyev on 2019-06-26 18:43:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nikita Vasilyev

Created: 2019-06-26 18:43:18 PDT

Size: 4.96 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index bf69d8096db..dd21fdbc562 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,26 @@
>+2019-06-26  Nikita Vasilyev  <nvasilyev@apple.com>
>+
>+        Web Inspector: Display "about:blank" for about:blank iframes instead of an error
>+        https://bugs.webkit.org/show_bug.cgi?id=198029
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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/Resource.js:
>+        (WI.Resource.prototype.requestContentFromBackend):
>+        * UserInterface/Models/SourceCode.js:
>+        (WI.SourceCode.prototype._processContent):
>+        (WI.SourceCode):
>+        * UserInterface/Views/ResourceContentView.js:
>+        (WI.ResourceContentView.prototype._contentAvailable):
>+
>+        * UserInterface/Views/ContextMenuUtilities.js:
>+        (WI.appendContextMenuItemsForSourceCode):
>+        Don't append "Save File" for "about:blank" resources.
>+
> 2019-06-21  Matt Baker  <mattbaker@apple.com>
> 
>         Web Inspector: remove unused DataGrid style .force-focus
>diff --git a/Source/WebInspectorUI/UserInterface/Models/Resource.js b/Source/WebInspectorUI/UserInterface/Models/Resource.js
>index e931c127481..e98797d1410 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/Resource.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/Resource.js
>@@ -819,6 +819,13 @@ WI.Resource = class Resource extends WI.SourceCode
> 
>     requestContentFromBackend()
>     {
>+        if (this._url === "about:blank") {
>+            return Promise.resolve({
>+                content: "",
>+                message: WI.unlocalizedString("about:blank")
>+            });
>+        }
>+
>         // 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.
>         if (this._requestIdentifier)
>diff --git a/Source/WebInspectorUI/UserInterface/Models/SourceCode.js b/Source/WebInspectorUI/UserInterface/Models/SourceCode.js
>index 834333641ac..c28139fc012 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/SourceCode.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/SourceCode.js
>@@ -197,6 +197,7 @@ WI.SourceCode = class SourceCode extends WI.Object
>         let rawContent = parameters.content || parameters.body || parameters.text || parameters.scriptSource;
>         let content = rawContent;
>         let error = parameters.error;
>+        let message = parameters.message;
>         if (parameters.base64Encoded)
>             content = content ? decodeBase64ToBlob(content, this.mimeType) : "";
> 
>@@ -212,6 +213,7 @@ WI.SourceCode = class SourceCode extends WI.Object
> 
>         return Promise.resolve({
>             error,
>+            message,
>             sourceCode: this,
>             content,
>             rawContent,
>diff --git a/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js b/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js
>index 3e395c515a3..0f8e7f21e08 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js
>@@ -66,15 +66,17 @@ WI.appendContextMenuItemsForSourceCode = function(contextMenu, sourceCodeOrLocat
>         }
>     }
> 
>-    contextMenu.appendItem(WI.UIString("Save File"), () => {
>-        sourceCode.requestContent().then(() => {
>-            const forceSaveAs = true;
>-            WI.FileUtilities.save({
>-                url: sourceCode.url || "",
>-                content: sourceCode.content
>-            }, forceSaveAs);
>+    if (sourceCodeOrLocation.url !== "about:blank") {
>+        contextMenu.appendItem(WI.UIString("Save File"), () => {
>+            sourceCode.requestContent().then(() => {
>+                const forceSaveAs = true;
>+                WI.FileUtilities.save({
>+                    url: sourceCode.url || "",
>+                    content: sourceCode.content
>+                }, forceSaveAs);
>+            });
>         });
>-    });
>+    }
> 
>     contextMenu.appendSeparator();
> 
>diff --git a/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js b/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js
>index ef4867a3f53..9bb31b3fc5d 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js
>@@ -135,6 +135,11 @@ WI.ResourceContentView = class ResourceContentView extends WI.ContentView
>             return;
>         }
> 
>+        if (parameters.message) {
>+            this.showMessage(parameters.message);
>+            return;
>+        }
>+
>         // Content is ready to show, call the public method now.
>         console.assert(!this._hasContent());
>         console.assert(parameters.sourceCode === this._resource);

Flags:

hi: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 198029: 370230 | 370231 | 370232 | 372981 | 372982 | 372985 | 372989 | 373590 | 373900 | 374642 | 374709