Changeset 205250 in webkit

Timestamp:

Aug 31, 2016 9:36:35 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[Fetch API] Blob type should be correctly set in case of empty body
​https://bugs.webkit.org/show_bug.cgi?id=161431

Patch by Youenn Fablet <​youenn@apple.com> on 2016-08-31
Reviewed by Alex Christensen.

Source/WebCore:

Tests: http/tests/fetch/fetch-as-blob-worker.html

http/tests/fetch/fetch-as-blob.html

• Modules/fetch/FetchBodyConsumer.cpp:

(WebCore::FetchBodyConsumer::takeAsBlob): Set blob type with contentType even if blob has no data.

• Modules/fetch/FetchBodyOwner.cpp:

(WebCore::FetchBodyOwner::blob): Ditto for empty bodies.

LayoutTests:

• http/tests/fetch/fetch-as-blob-expected.txt: Added.
• http/tests/fetch/fetch-as-blob-worker-expected.txt: Added.
• http/tests/fetch/fetch-as-blob-worker.html: Added.
• http/tests/fetch/fetch-as-blob.html: Added.
• http/tests/fetch/fetch-as-blob.js: Added.

(promise_test):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/fetch/fetch-as-blob-expected.txt (added)
• LayoutTests/http/tests/fetch/fetch-as-blob-worker-expected.txt (added)
• LayoutTests/http/tests/fetch/fetch-as-blob-worker.html (added)
• LayoutTests/http/tests/fetch/fetch-as-blob.html (added)
• LayoutTests/http/tests/fetch/fetch-as-blob.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp (modified) (1 diff)
• Source/WebCore/Modules/fetch/FetchBodyOwner.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-08-31  Youenn Fablet  <youenn@apple.com>
+
+        [Fetch API] Blob type should be correctly set in case of empty body
+        https://bugs.webkit.org/show_bug.cgi?id=161431
+
+        Reviewed by Alex Christensen.
+
+        * http/tests/fetch/fetch-as-blob-expected.txt: Added.
+        * http/tests/fetch/fetch-as-blob-worker-expected.txt: Added.
+        * http/tests/fetch/fetch-as-blob-worker.html: Added.
+        * http/tests/fetch/fetch-as-blob.html: Added.
+        * http/tests/fetch/fetch-as-blob.js: Added.
+        (promise_test):
+
 2016-08-31  Romain Bellessort  <romain.bellessort@crf.canon.fr>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-31  Youenn Fablet  <youenn@apple.com>
+
+        [Fetch API] Blob type should be correctly set in case of empty body
+        https://bugs.webkit.org/show_bug.cgi?id=161431
+
+        Reviewed by Alex Christensen.
+
+        Tests: http/tests/fetch/fetch-as-blob-worker.html
+               http/tests/fetch/fetch-as-blob.html
+
+        * Modules/fetch/FetchBodyConsumer.cpp:
+        (WebCore::FetchBodyConsumer::takeAsBlob): Set blob type with contentType even if blob has no data.
+        * Modules/fetch/FetchBodyOwner.cpp:
+        (WebCore::FetchBodyOwner::blob): Ditto for empty bodies.
+
 2016-08-31  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp

@@ -135 +135 @@
 {
     if (!m_buffer)
-        return Blob::create();
+        return Blob::create(Vector<uint8_t>(), m_contentType);
 
     // FIXME: We should try to move m_buffer to Blob without doing extra copy.

trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp

@@ -35 +35 @@
 #include "FetchLoader.h"
 #include "FetchResponseSource.h"
+#include "HTTPParsers.h"
 #include "JSBlob.h"
 #include "ResourceResponse.h"
@@ -88 +89 @@
 {
     if (m_body.isEmpty()) {
-        promise.resolve(Blob::create());
+        promise.resolve(Blob::create(Vector<uint8_t>(), Blob::normalizedContentType(extractMIMETypeFromMediaType(m_body.contentType()))));
         return;
     }