Attachment 350105 Details for Bug 189746 – Patch

[patch] Patch

bug-189746-20180919144522.patch (text/plain), 3.61 KB, created by Rob Buis on 2018-09-19 05:45:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2018-09-19 05:45:23 PDT

Size: 3.61 KB

patch

obsolete

>Subversion Revision: 236165
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 9fcb657142ed7fe2503cc27f7bdae634efdf21e4..bdbce5b8af7b9e476ec678b61dd41c076e883c1d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-09-19  Rob Buis  <rbuis@igalia.com>
>+
>+        [XHR] Response MIME type computation should return text/xml for non-http protocols
>+        https://bugs.webkit.org/show_bug.cgi?id=189746
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: fast/files/xhr-response-blob.html
>+
>+        * xml/XMLHttpRequest.cpp:
>+        (WebCore::XMLHttpRequest::responseMIMEType const):
>+
> 2018-09-19  Philippe Normand <pnormand@igalia.com>
> 
>         [GStreamer] Add support for AV1 decoding
>diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp
>index 631ba78b74cc4a8bf3dfa9ba81de98317c4621f9..d32e72d6d8cbf9c181ce09544dd44a5d13b46b8d 100644
>--- a/Source/WebCore/xml/XMLHttpRequest.cpp
>+++ b/Source/WebCore/xml/XMLHttpRequest.cpp
>@@ -856,8 +856,6 @@ String XMLHttpRequest::responseMIMEType() const
>     if (mimeType.isEmpty()) {
>         if (m_response.isHTTP())
>             mimeType = extractMIMETypeFromMediaType(m_response.httpHeaderField(HTTPHeaderName::ContentType));
>-        else
>-            mimeType = m_response.mimeType();
>         if (mimeType.isEmpty())
>             mimeType = "text/xml"_s;
>     }
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 82a8029240d8739436ddc6b1c38e6d5a961832ae..b1896ff6de29505f4e33c689b4fd6dbaf62a77d1 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-09-19  Rob Buis  <rbuis@igalia.com>
>+
>+        [XHR] Response MIME type computation should return text/xml for non-http protocols
>+        https://bugs.webkit.org/show_bug.cgi?id=189746
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/files/xhr-response-blob-expected.txt:
>+        * fast/files/xhr-response-blob.html:
>+
> 2018-09-19  Philippe Normand <pnormand@igalia.com>
> 
>         [GStreamer] Add support for AV1 decoding
>diff --git a/LayoutTests/fast/files/xhr-response-blob-expected.txt b/LayoutTests/fast/files/xhr-response-blob-expected.txt
>index 7a830172bfaf58981612895765279e87ceca7d2f..2b7f6f9399d7939af504bbea3f344127d2c6be99 100644
>--- a/LayoutTests/fast/files/xhr-response-blob-expected.txt
>+++ b/LayoutTests/fast/files/xhr-response-blob-expected.txt
>@@ -10,11 +10,11 @@ TEST COMPLETE
> PASS xhr.response is null
> PASS xhr.response is null
> PASS xhr.response instanceof Blob is true
>-PASS xhr.response.type is "text/plain"
>+PASS xhr.response.type is "text/xml"
> PASS xhr.responseType is "blob"
> PASS xhr.response is null
> PASS xhr.responseType is "blob"
> PASS xhr.response is null
> PASS xhr.response instanceof Blob is true
>-PASS xhr.response.type is "application/octet-stream"
>+PASS xhr.response.type is "text/xml"
> 
>diff --git a/LayoutTests/fast/files/xhr-response-blob.html b/LayoutTests/fast/files/xhr-response-blob.html
>index 18b353989498c95b05eb590d3c05cab086c1aa3d..6cae5cb2d7cd4e2441c80fe7c9a96d4a82c5fa30 100644
>--- a/LayoutTests/fast/files/xhr-response-blob.html
>+++ b/LayoutTests/fast/files/xhr-response-blob.html
>@@ -32,9 +32,9 @@ function testBlob(blobURL, blobType, doneFunction) {
>     }
> }
> 
>-testBlob("resources/UTF8.txt", "text/plain", function() {
>+testBlob("resources/UTF8.txt", "text/xml", function() {
>     testBlob("resources/does_not_exist.txt", "", function() {
>-        testBlob("resources/empty-file", "application/octet-stream", function() {
>+        testBlob("resources/empty-file", "text/xml", function() {
>             if (window.testRunner)
>                 testRunner.notifyDone();
>         })

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 189746: 350105 | 350110 | 350111 | 350113 | 350117 | 350125 | 350128