Changeset 247533 in webkit

Timestamp:

Jul 17, 2019 1:39:29 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: application/xml content not shown
​https://bugs.webkit.org/show_bug.cgi?id=199861

Patch by Olivier Blin <Olivier Blin> on 2019-07-17
Reviewed by Devin Rousso.

Source/WebInspectorUI:

application/xml content from XHR requests was not shown in the
inspector, an error message was displayed instead.

application/xml content should be treated as text, since
application/xml is the standard mimetype for XML content.
Apache serves XML content with the application/xml mimetype by
default.

• UserInterface/Base/MIMETypeUtilities.js:

(WI.fileExtensionForMIMEType):
Report "xml" extension for "application/xml" mimetype.
(WI.shouldTreatMIMETypeAsText):
Treat XML files as text.

LayoutTests:

• inspector/unit-tests/mimetype-utilities-expected.txt:
• inspector/unit-tests/mimetype-utilities.html:

Test for shouldTreatMIMETypeAsText.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/unit-tests/mimetype-utilities-expected.txt (modified) (1 diff)
• LayoutTests/inspector/unit-tests/mimetype-utilities.html (modified) (1 diff)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-07-17  Olivier Blin  <olivier.blin@softathome.com>
+
+        Web Inspector: application/xml content not shown
+        https://bugs.webkit.org/show_bug.cgi?id=199861
+
+        Reviewed by Devin Rousso.
+
+        * inspector/unit-tests/mimetype-utilities-expected.txt:
+        * inspector/unit-tests/mimetype-utilities.html:
+        Test for shouldTreatMIMETypeAsText.
+
 2019-07-17  Daniel Bates  <dabates@apple.com>
 

trunk/LayoutTests/inspector/unit-tests/mimetype-utilities-expected.txt

@@ -39 +39 @@
 PASS: "image/svg+xml" should be treated as text.
 PASS: "text/x-coffeescript" should be treated as text.
+PASS: "application/xml" should be treated as text.
 PASS: "image/jpeg" should not be treated as text.
 PASS: "image/png" should not be treated as text.

trunk/LayoutTests/inspector/unit-tests/mimetype-utilities.html

@@ -72 +72 @@
             expectText("image/svg+xml");
             expectText("text/x-coffeescript");
+            expectText("application/xml");
 
             expectNotText("image/jpeg");

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-07-17  Olivier Blin  <olivier.blin@softathome.com>
+
+        Web Inspector: application/xml content not shown
+        https://bugs.webkit.org/show_bug.cgi?id=199861
+
+        Reviewed by Devin Rousso.
+
+        application/xml content from XHR requests was not shown in the
+        inspector, an error message was displayed instead.
+
+        application/xml content should be treated as text, since
+        application/xml is the standard mimetype for XML content.
+        Apache serves XML content with the application/xml mimetype by
+        default.
+
+        * UserInterface/Base/MIMETypeUtilities.js:
+        (WI.fileExtensionForMIMEType):
+        Report "xml" extension for "application/xml" mimetype.
+        (WI.shouldTreatMIMETypeAsText):
+        Treat XML files as text.
+
 2019-07-16  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js

@@ -171 +171 @@
         "text/html": "html",
         "application/xhtml+xml": "xhtml",
+        "application/xml": "xml",
         "text/xml": "xml",
 
@@ -316 +317 @@
         return true;
 
-    // Various media text mime types.
     let extension = WI.fileExtensionForMIMEType(mimeType);
-    if (extension === "m3u8" || extension === "m3u")
+    if (extension === "xml")
         return true;
 
@@ -324 +324 @@
     if (extension === "js" || extension === "json")
         return true;
+
+    // Various media text mime types.
+    if (extension === "m3u8" || extension === "m3u")
+        return true;
+
     if (mimeType.startsWith("application/"))
-        return mimeType.endsWith("script") || mimeType.endsWith("json");
+        return mimeType.endsWith("script") || mimeType.endsWith("json") || mimeType.endsWith("xml");
 
     return false;