Changeset 279490 in webkit

Timestamp:

Jul 1, 2021, 6:03:53 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Align beacon CORS mode with Chrome and Firefox
​https://bugs.webkit.org/show_bug.cgi?id=227590

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-07-01
Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

• web-platform-tests/beacon/beacon-cors.https.window-expected.txt:

Source/WebCore:

This follows ​https://w3c.github.io/beacon/#sec-processing-model step 6.3.
Now we pass a WPT test that Chrome and Firefox already passed.

• Modules/beacon/NavigatorBeacon.cpp:

(WebCore::NavigatorBeacon::sendBeacon):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/beacon/beacon-cors.https.window-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/beacon/NavigatorBeacon.cpp (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-07-01  Alex Christensen  <achristensen@webkit.org>
+
+        Align beacon CORS mode with Chrome and Firefox
+        https://bugs.webkit.org/show_bug.cgi?id=227590
+
+        Reviewed by Chris Dumez.
+
+        * web-platform-tests/beacon/beacon-cors.https.window-expected.txt:
+
 2021-07-01  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/beacon/beacon-cors.https.window-expected.txt

@@ -2 +2 @@
 PASS /common/redirect.py does not support CORS
 PASS cross-origin, CORS-safelisted: type = string
-FAIL cross-origin, CORS-safelisted: type = arraybuffer assert_true: timeout expected true got false
+PASS cross-origin, CORS-safelisted: type = arraybuffer
 PASS cross-origin, CORS-safelisted: type = form
-FAIL cross-origin, CORS-safelisted: type = blob assert_true: timeout expected true got false
+PASS cross-origin, CORS-safelisted: type = blob
 PASS cross-origin, non-CORS-safelisted: failure case (with redirect)
 PASS cross-origin, non-CORS-safelisted: failure case (without redirect)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-07-01  Alex Christensen  <achristensen@webkit.org>
+
+        Align beacon CORS mode with Chrome and Firefox
+        https://bugs.webkit.org/show_bug.cgi?id=227590
+
+        Reviewed by Chris Dumez.
+
+        This follows https://w3c.github.io/beacon/#sec-processing-model step 6.3.
+        Now we pass a WPT test that Chrome and Firefox already passed.
+
+        * Modules/beacon/NavigatorBeacon.cpp:
+        (WebCore::NavigatorBeacon::sendBeacon):
+
 2021-07-01  Amir Mark Jr  <amir_mark@apple.com>
 

trunk/Source/WebCore/Modules/beacon/NavigatorBeacon.cpp

@@ -131 +131 @@
 
     if (body) {
-        options.mode = FetchOptions::Mode::Cors;
+        options.mode = FetchOptions::Mode::NoCors;
         String mimeType;
         auto result = FetchBody::extract(WTFMove(body.value()), mimeType);
@@ -143 +143 @@
         if (!mimeType.isEmpty()) {
             request.setHTTPContentType(mimeType);
-            if (isCrossOriginSafeRequestHeader(HTTPHeaderName::ContentType, mimeType))
-                options.mode = FetchOptions::Mode::NoCors;
+            if (!isCrossOriginSafeRequestHeader(HTTPHeaderName::ContentType, mimeType))
+                options.mode = FetchOptions::Mode::Cors;
         }
     }