Changeset 243757 in webkit

Timestamp:

Apr 2, 2019, 1:48:19 PM (7 years ago)

Author:

Chris Dumez

Message:

[Fetch API] Allow used body replacement in Request constructor
​https://bugs.webkit.org/show_bug.cgi?id=183703
<rdar://problem/49425609>

Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

Rebaseline WPT test now that one more check is passing.

• web-platform-tests/fetch/api/request/request-disturbed-expected.txt:

Source/WebCore:

Allow used body replacement in Request constructor as per:

• ​https://github.com/whatwg/fetch/pull/675

No new tests, rebaseline existing test.

• Modules/fetch/FetchRequest.cpp:

(WebCore::FetchRequest::initializeWith):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/fetch/FetchRequest.cpp (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2019-04-02  Chris Dumez  <cdumez@apple.com>
+
+        [Fetch API] Allow used body replacement in Request constructor
+        https://bugs.webkit.org/show_bug.cgi?id=183703
+        <rdar://problem/49425609>
+
+        Reviewed by Youenn Fablet.
+
+        Rebaseline WPT test now that one more check is passing.
+
+        * web-platform-tests/fetch/api/request/request-disturbed-expected.txt:
+
 2019-04-02  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed-expected.txt

@@ -4 +4 @@
 PASS Check cloning a disturbed request 
 PASS Check creating a new request from a disturbed request 
-FAIL Check creating a new request with a new body from a disturbed request Request input is disturbed or locked.
+PASS Check creating a new request with a new body from a disturbed request 
 FAIL Input request used for creating new request became disturbed assert_equals: body should not change expected object "[object ReadableStream]" but got object "[object ReadableStream]"
 FAIL Input request used for creating new request became disturbed even if body is not used assert_true: bodyUsed is true when request is disturbed expected true got false

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-02  Chris Dumez  <cdumez@apple.com>
+
+        [Fetch API] Allow used body replacement in Request constructor
+        https://bugs.webkit.org/show_bug.cgi?id=183703
+        <rdar://problem/49425609>
+
+        Reviewed by Youenn Fablet.
+
+        Allow used body replacement in Request constructor as per:
+        - https://github.com/whatwg/fetch/pull/675
+
+        No new tests, rebaseline existing test.
+
+        * Modules/fetch/FetchRequest.cpp:
+        (WebCore::FetchRequest::initializeWith):
+
 2019-04-02  Chris Dumez  <cdumez@apple.com>
 

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

@@ -204 +204 @@
 ExceptionOr<void> FetchRequest::initializeWith(FetchRequest& input, Init&& init)
 {
-    if (input.isDisturbedOrLocked())
-        return Exception {TypeError, "Request input is disturbed or locked."_s };
-
     m_request = input.m_request;
     m_options = input.m_options;
@@ -241 +238 @@
             return setBodyResult.releaseException();
     } else {
+        if (input.isDisturbedOrLocked())
+            return Exception { TypeError, "Request input is disturbed or locked."_s };
+
         auto setBodyResult = setBody(input);
         if (setBodyResult.hasException())