Changeset 205251 in webkit

Timestamp:

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

Author:

commit-queue@webkit.org

Message:

[Fetch API] Response bodyUsed should check for its body disturbed state
​https://bugs.webkit.org/show_bug.cgi?id=161429

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

Source/WebCore:

Test: http/tests/fetch/bodyUsed-worker.html

Implementing bodyUsed as a JS Builtin.
This allows using directly @isReadableStreamDisturbed if response has a body.

Renaming isDisturbed to isDisturbedOrLocked to better match fetch spec terminology.

• Modules/fetch/FetchBodyOwner.cpp:

(WebCore::FetchBodyOwner::isDisturbedOrLocked): Renaming isDisturbed to isDisturbedOrLocked.
(WebCore::FetchBodyOwner::arrayBuffer): Ditto.
(WebCore::FetchBodyOwner::blob): Ditto.
(WebCore::FetchBodyOwner::formData): Ditto.
(WebCore::FetchBodyOwner::json): Ditto.
(WebCore::FetchBodyOwner::text): Ditto.
(WebCore::FetchBodyOwner::isDisturbed): Ditto.

• Modules/fetch/FetchBodyOwner.h:

(WebCore::FetchBodyOwner::isDisturbed): Ditto.

• Modules/fetch/FetchRequest.cpp:

(WebCore::FetchRequest::initializeWith): Ditto.
(WebCore::FetchRequest::clone): Ditto.

• Modules/fetch/FetchResponse.cpp:

(WebCore::FetchResponse::cloneForJS): Ditto.
(WebCore::FetchResponse::createReadableStreamSource): Only asserting for isDisturbed.

• Modules/fetch/FetchResponse.idl: Marking bodyUsed as JS builtin.
• Modules/fetch/FetchResponse.js: Adding bodyUsed.

(bodyUsed):
(clone):

LayoutTests:

• http/tests/fetch/bodyUsed-expected.txt: Added.
• http/tests/fetch/bodyUsed-worker-expected.txt: Added.
• http/tests/fetch/bodyUsed-worker.html: Added.
• http/tests/fetch/bodyUsed.js: Added.
• http/tests/fetch/window/body-mixin-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/fetch/bodyUsed-expected.txt (added)
• LayoutTests/http/tests/fetch/bodyUsed-worker-expected.txt (added)
• LayoutTests/http/tests/fetch/bodyUsed-worker.html (added)
• LayoutTests/http/tests/fetch/bodyUsed.html (added)
• LayoutTests/http/tests/fetch/bodyUsed.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/fetch/FetchBodyOwner.cpp (modified) (6 diffs)
• Source/WebCore/Modules/fetch/FetchBodyOwner.h (modified) (2 diffs)
• Source/WebCore/Modules/fetch/FetchRequest.cpp (modified) (2 diffs)
• Source/WebCore/Modules/fetch/FetchResponse.cpp (modified) (2 diffs)
• Source/WebCore/Modules/fetch/FetchResponse.idl (modified) (1 diff)
• Source/WebCore/Modules/fetch/FetchResponse.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-08-31  Youenn Fablet  <youenn@apple.com>
+
+        [Fetch API] Response bodyUsed should check for its body disturbed state
+        https://bugs.webkit.org/show_bug.cgi?id=161429
+
+        Reviewed by Alex Christensen.
+
+        * http/tests/fetch/bodyUsed-expected.txt: Added.
+        * http/tests/fetch/bodyUsed-worker-expected.txt: Added.
+        * http/tests/fetch/bodyUsed-worker.html: Added.
+        * http/tests/fetch/bodyUsed.js: Added.
+        * http/tests/fetch/window/body-mixin-expected.txt:
+
 2016-08-31  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-31  Youenn Fablet  <youenn@apple.com>
+
+        [Fetch API] Response bodyUsed should check for its body disturbed state
+        https://bugs.webkit.org/show_bug.cgi?id=161429
+
+        Reviewed by Alex Christensen.
+
+        Test: http/tests/fetch/bodyUsed-worker.html
+
+        Implementing bodyUsed as a JS Builtin.
+        This allows using directly @isReadableStreamDisturbed if response has a body.
+
+        Renaming isDisturbed to isDisturbedOrLocked to better match fetch spec terminology.
+
+        * Modules/fetch/FetchBodyOwner.cpp:
+        (WebCore::FetchBodyOwner::isDisturbedOrLocked): Renaming isDisturbed to isDisturbedOrLocked.
+        (WebCore::FetchBodyOwner::arrayBuffer): Ditto.
+        (WebCore::FetchBodyOwner::blob): Ditto.
+        (WebCore::FetchBodyOwner::formData): Ditto.
+        (WebCore::FetchBodyOwner::json): Ditto.
+        (WebCore::FetchBodyOwner::text): Ditto.
+        (WebCore::FetchBodyOwner::isDisturbed): Ditto.
+        * Modules/fetch/FetchBodyOwner.h:
+        (WebCore::FetchBodyOwner::isDisturbed): Ditto.
+        * Modules/fetch/FetchRequest.cpp:
+        (WebCore::FetchRequest::initializeWith): Ditto.
+        (WebCore::FetchRequest::clone): Ditto.
+        * Modules/fetch/FetchResponse.cpp:
+        (WebCore::FetchResponse::cloneForJS): Ditto.
+        (WebCore::FetchResponse::createReadableStreamSource): Only asserting for isDisturbed.
+        * Modules/fetch/FetchResponse.idl: Marking bodyUsed as JS builtin.
+        * Modules/fetch/FetchResponse.js: Adding bodyUsed.
+        (bodyUsed):
+        (clone):
+
 2016-08-31  Youenn Fablet  <youenn@apple.com>
 

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

@@ -59 +59 @@
 }
 
-bool FetchBodyOwner::isDisturbed() const
+bool FetchBodyOwner::isDisturbedOrLocked() const
 {
     if (m_isDisturbed)
@@ -78 +78 @@
         return;
     }
-    if (isDisturbed()) {
+    if (isDisturbedOrLocked()) {
         promise.reject(TypeError);
         return;
@@ -92 +92 @@
         return;
     }
-    if (isDisturbed()) {
+    if (isDisturbedOrLocked()) {
         promise.reject(TypeError);
         return;
@@ -106 +106 @@
         return;
     }
-    if (isDisturbed()) {
+    if (isDisturbedOrLocked()) {
         promise.reject(TypeError);
         return;
@@ -120 +120 @@
         return;
     }
-    if (isDisturbed()) {
+    if (isDisturbedOrLocked()) {
         promise.reject(TypeError);
         return;
@@ -134 +134 @@
         return;
     }
-    if (isDisturbed()) {
+    if (isDisturbedOrLocked()) {
         promise.reject(TypeError);
         return;

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

@@ -45 +45 @@
 
     // Exposed Body API
-    bool isDisturbed() const;
+    bool isDisturbed() const { return m_isDisturbed; };
 
     void arrayBuffer(DeferredWrapper&&);
@@ -52 +52 @@
     void json(DeferredWrapper&&);
     void text(DeferredWrapper&&);
+
+    bool isDisturbedOrLocked() const;
 
     void loadBlob(Blob&, FetchBodyConsumer*);

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

@@ -244 +244 @@
 FetchHeaders* FetchRequest::initializeWith(FetchRequest& input, const Dictionary& init, ExceptionCode& ec)
 {
-    if (input.isDisturbed()) {
+    if (input.isDisturbedOrLocked()) {
         ec = TypeError;
         return nullptr;
@@ -309 +309 @@
 RefPtr<FetchRequest> FetchRequest::clone(ScriptExecutionContext& context, ExceptionCode& ec)
 {
-    if (isDisturbed()) {
+    if (isDisturbedOrLocked()) {
         ec = TypeError;
         return nullptr;

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

@@ -98 +98 @@
 {
     ASSERT(scriptExecutionContext());
-    ASSERT(!isDisturbed());
+    ASSERT(!isDisturbedOrLocked());
     return adoptRef(*new FetchResponse(*scriptExecutionContext(), FetchBody(m_body), FetchHeaders::create(headers()), ResourceResponse(m_response)));
 }
@@ -271 +271 @@
 {
     ASSERT(!m_readableStreamSource);
-    ASSERT(!isDisturbed());
+    ASSERT(!m_isDisturbed);
 
     if (body().isEmpty())

trunk/Source/WebCore/Modules/fetch/FetchResponse.idl

@@ -55 +55 @@
 
     // Copy of FetchBody IDL as we want to implement some of these as built-ins.
-    [ImplementedAs=isDisturbed] readonly attribute boolean bodyUsed;
+    [JSBuiltin] readonly attribute boolean bodyUsed;
     [JSBuiltin] Promise arrayBuffer();
     [JSBuiltin] Promise blob();

trunk/Source/WebCore/Modules/fetch/FetchResponse.js

@@ -61 +61 @@
 }
 
+function bodyUsed()
+{
+   if (!(this instanceof @Response))
+        throw @makeGetterTypeError("Response", "bodyUsed");
+
+    if (this.@body)
+        return @isReadableStreamDisturbed(this.@body);
+
+    return @Response.prototype.@isDisturbed.@call(this);
+}
+
 function body()
 {
@@ -84 +95 @@
         throw @makeThisTypeError("Response", "clone");
 
-    if (@Response.prototype.@isDisturbed.@call(this))
+    if (@Response.prototype.@isDisturbed.@call(this) || (this.@body && @isReadableStreamLocked(this.@body)))
         throw new @TypeError("Cannot clone a disturbed Response");