Diff
Modified: branches/safari-613-branch/LayoutTests/ChangeLog (288560 => 288561)
--- branches/safari-613-branch/LayoutTests/ChangeLog 2022-01-25 17:36:35 UTC (rev 288560)
+++ branches/safari-613-branch/LayoutTests/ChangeLog 2022-01-25 17:48:16 UTC (rev 288561)
@@ -1,3 +1,7 @@
+2022-01-24 Russell Epstein <repst...@apple.com>
+
+ Revert r282746. rdar://problem/87732806
+
2022-01-24 Alan Coon <alanc...@apple.com>
Cherry-pick r288429. rdar://problem/86612099
Deleted: branches/safari-613-branch/LayoutTests/http/tests/webshare/resources/webshare-postmessage.html (288560 => 288561)
--- branches/safari-613-branch/LayoutTests/http/tests/webshare/resources/webshare-postmessage.html 2022-01-25 17:36:35 UTC (rev 288560)
+++ branches/safari-613-branch/LayoutTests/http/tests/webshare/resources/webshare-postmessage.html 2022-01-25 17:48:16 UTC (rev 288561)
@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<meta viewport="width=device-width, initial-scale=1.0" />
-<style>
- html {
- height: 100%;
- margin: 0;
- padding: 0;
- }
- body {
- margin: 0;
- padding: 0;
- display: grid;
- }
- button {
- height: 100vh;
- width: 100%;
- border: 1px solid black;
- }
-</style>
-<body>
- <button id="share-button">SHARE!</button>
- <script>
- window.addEventListener(
- "message",
- async (event) => {
- const shareButton = document.getElementById("share-button");
- const { action } = event.data;
- let result = null;
- let exceptionMessage;
- let exceptionName;
- switch (action) {
- case "call canShare()":
- try {
- result = navigator.canShare({ text: "some text" });
- } catch (e) {
- exceptionMessage = e.message;
- exceptionName = e.name;
- }
- break;
- case "call share()":
- await userActivationFromParent(shareButton, event);
- try {
- await navigator.share({ text: "some text" });
- result = "share completed";
- } catch (e) {
- result = "threw";
- exceptionMessage = e.message;
- exceptionName = e.name;
- }
- break;
- default:
- throw new Error(`Unknown action: ${action}`);
- }
- event.source.postMessage(
- { action, result, exceptionMessage, exceptionName },
- event.origin
- );
- },
- { once: true }
- );
-
- function userActivationFromParent(shareButton, event) {
- return new Promise((resolve) => {
- shareButton.addEventListener("click", resolve, { once: true });
- event.source.postMessage("activate me!", event.origin);
- });
- }
- </script>
-</body>
Deleted: branches/safari-613-branch/LayoutTests/http/tests/webshare/webshare-allow-attribute-canShare.https-expected.txt (288560 => 288561)
--- branches/safari-613-branch/LayoutTests/http/tests/webshare/webshare-allow-attribute-canShare.https-expected.txt 2022-01-25 17:36:35 UTC (rev 288560)
+++ branches/safari-613-branch/LayoutTests/http/tests/webshare/webshare-allow-attribute-canShare.https-expected.txt 2022-01-25 17:48:16 UTC (rev 288561)
@@ -1,18 +0,0 @@
-CONSOLE MESSAGE: Feature policy 'WebShare' check failed for iframe with origin 'https://localhost:8443' and allow attribute ''.
-CONSOLE MESSAGE: Feature policy 'WebShare' check failed for iframe with origin 'https://localhost:8443' and allow attribute 'web-share 'none''.
-CONSOLE MESSAGE: Feature policy 'WebShare' check failed for iframe with origin 'https://127.0.0.1:8443' and allow attribute 'web-share 'none''.
-CONSOLE MESSAGE: Feature policy 'WebShare' check failed for iframe with origin 'https://localhost:8443' and allow attribute 'web-share 'self''.
-CONSOLE MESSAGE: Feature policy 'WebShare' check failed for iframe with origin 'https://127.0.0.1:8443' and allow attribute 'web-share https://localhost:8443'.
-PASS iframe src: "https://localhost:8443/webshare/resources/webshare-postmessage.html" with allow="" MUST NOT be allowed to call canShare().
-PASS iframe src: "https://127.0.0.1:8443/webshare/resources/webshare-postmessage.html" with allow="" is allowed to call canShare().
-PASS iframe src: "https://localhost:8443/webshare/resources/webshare-postmessage.html" with allow="web-share" is allowed to call canShare().
-PASS iframe src: "https://127.0.0.1:8443/webshare/resources/webshare-postmessage.html" with allow="web-share" is allowed to call canShare().
-PASS iframe src: "https://localhost:8443/webshare/resources/webshare-postmessage.html" with allow="web-share *" is allowed to call canShare().
-PASS iframe src: "https://127.0.0.1:8443/webshare/resources/webshare-postmessage.html" with allow="web-share *" is allowed to call canShare().
-PASS iframe src: "https://localhost:8443/webshare/resources/webshare-postmessage.html" with allow="web-share 'none'" MUST NOT be allowed to call canShare().
-PASS iframe src: "https://127.0.0.1:8443/webshare/resources/webshare-postmessage.html" with allow="web-share 'none'" MUST NOT be allowed to call canShare().
-PASS iframe src: "https://localhost:8443/webshare/resources/webshare-postmessage.html" with allow="web-share 'self'" MUST NOT be allowed to call canShare().
-PASS iframe src: "https://127.0.0.1:8443/webshare/resources/webshare-postmessage.html" with allow="web-share 'self'" is allowed to call canShare().
-PASS iframe src: "https://localhost:8443/webshare/resources/webshare-postmessage.html" with allow="web-share https://localhost:8443" is allowed to call canShare().
-PASS iframe src: "https://127.0.0.1:8443/webshare/resources/webshare-postmessage.html" with allow="web-share https://localhost:8443" MUST NOT be allowed to call canShare().
-
Deleted: branches/safari-613-branch/LayoutTests/http/tests/webshare/webshare-allow-attribute-canShare.https.html (288560 => 288561)
--- branches/safari-613-branch/LayoutTests/http/tests/webshare/webshare-allow-attribute-canShare.https.html 2022-01-25 17:36:35 UTC (rev 288560)
+++ branches/safari-613-branch/LayoutTests/http/tests/webshare/webshare-allow-attribute-canShare.https.html 2022-01-25 17:48:16 UTC (rev 288561)
@@ -1,109 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>
- Test allow attribute with "web-share" and canShare() method
- </title>
- <meta name="viewport" content="initial-scale=5, width=device-width" />
- <script src=""
- <script>
- testRunner?.dumpAsText();
- testRunner?.waitUntilDone();
-
- function waitFor(target, eventName) {
- return new Promise((resolve) => {
- target.addEventListener(eventName, resolve, { once: true });
- });
- }
-
- window.addEventListener("load", async () => {
- for (const iframe of document.querySelectorAll("iframe")) {
- const { enabled, src } = iframe.dataset;
- const isAllowed = enabled === "true";
- const action = "" canShare()";
- iframe.contentWindow.postMessage({ action }, "*");
- const { data } = await waitFor(window, "message");
- const { exceptionMessage, exceptionName, result } = data;
-
- const msg = `iframe src: "${iframe.src}" with allow="${
- iframe.allow
- }" ${
- isAllowed ? "is allowed to" : "MUST NOT be allowed to"
- } ${action}. ${exceptionName ?? ""} ${exceptionMessage ?? ""}`;
-
- switch (result) {
- case true:
- isAllowed ? testPassed(msg) : testFailed(msg);
- break;
- case false:
- !isAllowed ? testPassed(msg) : testFailed(msg);
- break;
- default:
- testFailed(msg + ` - result was: ${result}`);
- }
- }
- testRunner.notifyDone();
- });
- </script>
- </head>
- <body>
- <iframe
- data-enabled="false"
- src=""
- ></iframe>
- <iframe
- data-enabled="true"
- src=""
- ></iframe>
- <iframe
- allow="web-share"
- data-enabled="true"
- src=""
- ></iframe>
- <iframe
- allow="web-share"
- data-enabled="true"
- src=""
- ></iframe>
- <iframe
- allow="web-share *"
- data-enabled="true"
- src=""
- ></iframe>
- <iframe
- allow="web-share *"
- data-enabled="true"
- src=""
- ></iframe>
- <iframe
- allow="web-share 'none'"
- data-enabled="false"
- src=""
- ></iframe>
- <iframe
- allow="web-share 'none'"
- data-enabled="false"
- src=""
- ></iframe>
- <iframe
- allow="web-share 'self'"
- data-enabled="false"
- src=""
- ></iframe>
- <iframe
- allow="web-share 'self'"
- data-enabled="true"
- src=""
- ></iframe>
- <iframe
- allow="web-share https://localhost:8443"
- data-enabled="true"
- src=""
- ></iframe>
- <iframe
- allow="web-share https://localhost:8443"
- data-enabled="false"
- src=""
- ></iframe>
- </body>
-</html>
Deleted: branches/safari-613-branch/LayoutTests/http/tests/webshare/webshare-allow-attribute-share.https-expected.txt (288560 => 288561)
--- branches/safari-613-branch/LayoutTests/http/tests/webshare/webshare-allow-attribute-share.https-expected.txt 2022-01-25 17:36:35 UTC (rev 288560)
+++ branches/safari-613-branch/LayoutTests/http/tests/webshare/webshare-allow-attribute-share.https-expected.txt 2022-01-25 17:48:16 UTC (rev 288561)
@@ -1,18 +0,0 @@
-CONSOLE MESSAGE: Feature policy 'WebShare' check failed for iframe with origin 'https://localhost:8443' and allow attribute ''.
-CONSOLE MESSAGE: Feature policy 'WebShare' check failed for iframe with origin 'https://localhost:8443' and allow attribute 'web-share 'none''.
-CONSOLE MESSAGE: Feature policy 'WebShare' check failed for iframe with origin 'https://127.0.0.1:8443' and allow attribute 'web-share 'none''.
-CONSOLE MESSAGE: Feature policy 'WebShare' check failed for iframe with origin 'https://localhost:8443' and allow attribute 'web-share 'self''.
-CONSOLE MESSAGE: Feature policy 'WebShare' check failed for iframe with origin 'https://127.0.0.1:8443' and allow attribute 'web-share https://localhost:8443'.
-PASS iframe src: "https://localhost:8443/webshare/resources/webshare-postmessage.html" with allow="" MUST NOT be allowed to call share(). NotAllowedError Third-party iframes are not allowed to call share() unless explicitly allowed via Feature-Policy (web-share)
-PASS iframe src: "https://127.0.0.1:8443/webshare/resources/webshare-postmessage.html" with allow="" is allowed to call share().
-PASS iframe src: "https://localhost:8443/webshare/resources/webshare-postmessage.html" with allow="web-share" is allowed to call share().
-PASS iframe src: "https://127.0.0.1:8443/webshare/resources/webshare-postmessage.html" with allow="web-share" is allowed to call share().
-PASS iframe src: "https://localhost:8443/webshare/resources/webshare-postmessage.html" with allow="web-share *" is allowed to call share().
-PASS iframe src: "https://127.0.0.1:8443/webshare/resources/webshare-postmessage.html" with allow="web-share *" is allowed to call share().
-PASS iframe src: "https://localhost:8443/webshare/resources/webshare-postmessage.html" with allow="web-share 'none'" MUST NOT be allowed to call share(). NotAllowedError Third-party iframes are not allowed to call share() unless explicitly allowed via Feature-Policy (web-share)
-PASS iframe src: "https://127.0.0.1:8443/webshare/resources/webshare-postmessage.html" with allow="web-share 'none'" MUST NOT be allowed to call share(). NotAllowedError Third-party iframes are not allowed to call share() unless explicitly allowed via Feature-Policy (web-share)
-PASS iframe src: "https://localhost:8443/webshare/resources/webshare-postmessage.html" with allow="web-share 'self'" MUST NOT be allowed to call share(). NotAllowedError Third-party iframes are not allowed to call share() unless explicitly allowed via Feature-Policy (web-share)
-PASS iframe src: "https://127.0.0.1:8443/webshare/resources/webshare-postmessage.html" with allow="web-share 'self'" is allowed to call share().
-PASS iframe src: "https://localhost:8443/webshare/resources/webshare-postmessage.html" with allow="web-share https://localhost:8443" is allowed to call share().
-PASS iframe src: "https://127.0.0.1:8443/webshare/resources/webshare-postmessage.html" with allow="web-share https://localhost:8443" MUST NOT be allowed to call share(). NotAllowedError Third-party iframes are not allowed to call share() unless explicitly allowed via Feature-Policy (web-share)
-
Deleted: branches/safari-613-branch/LayoutTests/http/tests/webshare/webshare-allow-attribute-share.https.html (288560 => 288561)
--- branches/safari-613-branch/LayoutTests/http/tests/webshare/webshare-allow-attribute-share.https.html 2022-01-25 17:36:35 UTC (rev 288560)
+++ branches/safari-613-branch/LayoutTests/http/tests/webshare/webshare-allow-attribute-share.https.html 2022-01-25 17:48:16 UTC (rev 288561)
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>
- Test allow attribute with "web-share" and share() method
- </title>
- <meta name="viewport" content="initial-scale=1, width=device-width" />
- <script src=""
- <script src=""
- <script>
- testRunner?.dumpAsText();
- testRunner?.waitUntilDone();
-
- function waitFor(target, eventName) {
- return new Promise((resolve) => {
- target.addEventListener(eventName, resolve, { once: true });
- });
- }
-
- function userActivation(element) {
- const promise = UIHelper.isIOSFamily()
- ? UIHelper.tapElement(element)
- : UIHelper.activateElement(element);
- return promise;
- }
-
- const iframeDetails = [
- {
- enabled: "false",
- src: "https://localhost:8443/webshare/resources/webshare-postmessage.html",
- },
- {
- enabled: "true",
- src: "./resources/webshare-postmessage.html",
- },
- {
- allow: "web-share",
- enabled: "true",
- src: "https://localhost:8443/webshare/resources/webshare-postmessage.html",
- },
- {
- allow: "web-share",
- enabled: "true",
- src: "./resources/webshare-postmessage.html",
- },
- {
- allow: "web-share *",
- enabled: "true",
- src: "https://localhost:8443/webshare/resources/webshare-postmessage.html",
- },
- {
- allow: "web-share *",
- enabled: "true",
- src: "./resources/webshare-postmessage.html",
- },
- {
- allow: "web-share 'none'",
- enabled: "false",
- src: "https://localhost:8443/webshare/resources/webshare-postmessage.html",
- },
- {
- allow: "web-share 'none'",
- enabled: "false",
- src: "./resources/webshare-postmessage.html",
- },
- {
- allow: "web-share 'self'",
- enabled: "false",
- src: "https://localhost:8443/webshare/resources/webshare-postmessage.html",
- },
- {
- allow: "web-share 'self'",
- enabled: "true",
- src: "./resources/webshare-postmessage.html",
- },
- {
- allow: "web-share https://localhost:8443",
- enabled: "true",
- src: "https://localhost:8443/webshare/resources/webshare-postmessage.html",
- },
- {
- allow: "web-share https://localhost:8443",
- enabled: "false",
- src: "./resources/webshare-postmessage.html",
- },
- ];
-
- async function loadIframe(details) {
- const iframe = document.createElement("iframe");
- if (details.hasOwnProperty("allow")) {
- iframe.setAttribute("allow", details.allow);
- }
- iframe.dataset.enabled = details.enabled;
- iframe.src = ""
- document.body.appendChild(iframe);
- await waitFor(iframe, "load");
- return iframe;
- }
-
- async function runTests () {
- for (const details of iframeDetails) {
- const iframe = await loadIframe(details);
- const { enabled } = iframe.dataset;
- const isAllowed = enabled === "true";
- const action = "" share()";
- iframe.contentWindow.postMessage({ action }, "*");
- const { data: activateMe } = await waitFor(window, "message");
- if (activateMe !== "activate me!") {
- throw new Error("Expected an activate request:" + activateMe);
- }
- await userActivation(iframe);
- const { data } = await waitFor(window, "message");
- const { exceptionMessage, exceptionName, result } = data;
- const msg = `iframe src: "${iframe.src}" with allow="${
- iframe.allow
- }" ${
- isAllowed ? "is allowed to" : "MUST NOT be allowed to"
- } ${action}. ${exceptionName ?? ""} ${exceptionMessage ?? ""}`;
- switch (result) {
- case "share completed":
- isAllowed ? testPassed(msg) : testFailed(msg);
- break;
- case "threw":
- if (
- !isAllowed &&
- exceptionName === "NotAllowedError" &&
- exceptionMessage.endsWith("Feature-Policy (web-share)")
- ) {
- testPassed(msg);
- } else {
- testFailed(msg);
- }
- break;
- default:
- testFailed(msg + ` - result was: ${result}`);
- }
- iframe.remove();
- }
- testRunner.notifyDone();
- }
- </script>
- </head>
- <body _onload_="runTests()">
-</html>
Modified: branches/safari-613-branch/LayoutTests/platform/mac-wk1/TestExpectations (288560 => 288561)
--- branches/safari-613-branch/LayoutTests/platform/mac-wk1/TestExpectations 2022-01-25 17:36:35 UTC (rev 288560)
+++ branches/safari-613-branch/LayoutTests/platform/mac-wk1/TestExpectations 2022-01-25 17:48:16 UTC (rev 288561)
@@ -1447,85 +1447,3 @@
webkit.org/b/230425 printing/allowed-breaks.html [ Pass Failure ]
-webkit.org/b/231102 [ BigSur ] printing/css2.1/page-break-after-000.html [ Pass Failure ]
-
-# webkit.org/b/214448 Web Share API is not implemented for mac-wk1
-http/tests/webshare/ [ Skip ]
-
-webkit.org/b/230729 [ Catalina Release ] imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html [ Pass Failure ]
-
-#WebGL Tests Timing Out on Catalina Debug WK1 EWS webkit.org/b/230774
-[ Catalina Debug ] webgl/1.0.3/conformance/canvas/drawingbuffer-static-canvas-test.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance/ogles/GL/inversesqrt/inversesqrt_001_to_006.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/1.0.3/conformance/ogles/GL/notEqual/notEqual_009_to_012.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance/ogles/GL/step/step_001_to_006.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/1.0.3/conformance/ogles/GL/exp/exp_001_to_008.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/1.0.3/conformance/ogles/GL/struct/struct_049_to_056.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance2/textures/webgl_canvas/tex-2d-r8ui-red_integer-unsigned_byte.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/1.0.3/conformance/canvas/viewport-unchanged-upon-resize.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance2/textures/image_bitmap_from_blob/tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance2/textures/canvas/tex-2d-rg8-rg-unsigned_byte.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba5551.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance2/textures/image_bitmap_from_image_data/tex-2d-rgb5_a1-rgba-unsigned_byte.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/max-active-contexts-gc.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/1.0.3/conformance/extensions/ext-sRGB.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance/glsl/misc/shader-with-undefined-preprocessor-symbol.frag.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance2/misc/expando-loss-2.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance/ogles/GL/gl_FragCoord/gl_FragCoord_001_to_003.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance2/textures/image_data/tex-2d-r11f_g11f_b10f-rgb-half_float.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance/extensions/get-extension.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance2/textures/canvas/tex-2d-r11f_g11f_b10f-rgb-half_float.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/webgl2-primitive-restart.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/1.0.3/conformance/programs/program-test.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/pending/conformance/glsl/misc/swizzle-as-lvalue.html [ Pass Timeout ]
-[ Catalina Debug ] webgl/2.0.0/conformance/rendering/draw-elements-out-of-bounds.html [ Pass Timeout ]
-
-webkit.org/b/230777 [ Catalina Debug ] transitions/transition-end-event-destroy-renderer.html [ Pass Crash ]
-
-webkit.org/b/230808 [ Catalina Debug ] media/modern-media-controls/media-controls/media-controls-placard-compressed-metrics.html [ Pass Crash ]
-
-webkit.org/b/230831 [ Catalina Debug ] storage/websql/multiple-transactions-on-different-handles.html [ Pass Crash ]
-
-webkit.org/b/230833 [ Catalina Debug ] performance-api/performance-observer-order.html [ Pass Crash ]
-
-webkit.org/b/230835 [ Catalina BigSur Debug ] webgl/2.0.y/conformance/extensions/webgl-compressed-texture-s3tc-srgb.html [ Pass Crash ]
-webkit.org/b/230835 [ Catalina BigSur Debug ] webgl/1.0.3/conformance/extensions/oes-texture-float.html [ Pass Crash ]
-webkit.org/b/230835 [ Catalina BigSur Debug ] webgl/2.0.0/conformance/extensions/ext-blend-minmax.html [ Pass Crash ]
-
-webkit.org/b/230842 [ Catalina BigSur Debug ] media/track/audio-track.html [ Pass Crash ]
-
-webkit.org/b/230844 [ Catalina Debug ] storage/indexeddb/mozilla/cursor-mutation.html [ Pass Crash ]
-
-webkit.org/b/230846 [ Catalina Debug ] svg/filters/big-height-filter.svg [ Pass Crash ]
-
-webkit.org/b/230848 [ Catalina BigSur Debug ] webrtc/datachannel/datachannel-gc.html [ Pass Crash ]
-
-webkit.org/b/230905 [ Catalina BigSur ] imported/w3c/web-platform-tests/css/css-cascade/layer-counter-style-override.html [ Pass Failure ]
-
-webkit.org/b/231684 [ Catalina Debug ] requestidlecallback/requestidlecallback-document-gc.html [ Pass Crash ]
-
-webkit.org/b/232277 [ Catalina ] imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html [ Pass Failure ]
-webkit.org/b/232277 [ Catalina ] imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-different-load.html [ Pass Failure ]
-
-webkit.org/b/232315 [ Catalina Debug ] media/track/track-disabled.html [ Pass Crash ]
-
-webkit.org/b/232446 [ Catalina Debug ] media/track/track-element-dom-change-crash.html [ Pass Crash ]
-
-webkit.org/b/232585 [ Catalina Debug ] media/track/track-element-load-event.html [ Pass Crash ]
-
-# DumpRenderTree doesn't invoke inspector instrumentation when repainting.
-webkit.org/b/232852 inspector/page/setShowPaintRects.html [ Skip ]
-
-# The DocumentTimeline.maximumFrameRate property which this test is about is only available in WK2.
-webanimations/frame-rate/document-timeline-maximum-frame-rate.html [ Skip ]
-
-webkit.org/b/231918 imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus-multiple-times.html [ Pass Failure ]
-
-# webkit.org/b/234105 Skip 2 imported/w3c/web-platform-tests/speech-api/SpeechSynthesis in mac wk1.
-[ Catalina+ ] imported/w3c/web-platform-tests/speech-api/SpeechSynthesis-speak-events.html [ Skip ]
-[ Catalina+ ] imported/w3c/web-platform-tests/speech-api/SpeechSynthesis-pause-resume.tentative.html [ Skip ]
-
-fast/scrolling/rtl-scrollbars-alternate-iframe-body-dir-attr-does-not-update-scrollbar-placement.html [ ImageOnlyFailure ]
-
Modified: branches/safari-613-branch/LayoutTests/platform/win/TestExpectations (288560 => 288561)
--- branches/safari-613-branch/LayoutTests/platform/win/TestExpectations 2022-01-25 17:36:35 UTC (rev 288560)
+++ branches/safari-613-branch/LayoutTests/platform/win/TestExpectations 2022-01-25 17:48:16 UTC (rev 288561)
@@ -153,7 +153,7 @@
http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-when-private-browsing-enabled.py [ Skip ]
http/tests/navigation/ping-attribute/area-cross-origin.html [ Skip ]
http/tests/navigation/ping-attribute/anchor-cross-origin.html [ Skip ]
-http/tests/referrer-policy/no-referrer-when-downgrade/ [ Skip ]
+http/tests/referrer-policy/no-referrer-when-downgrade/ [ Skip ]
http/tests/referrer-policy/unsafe-url/cross-origin-http-http.html [ Skip ]
http/tests/referrer-policy/unsafe-url/cross-origin-http.https.html [ Skip ]
http/tests/referrer-policy-img/no-referrer-when-downgrade/ [ Skip ]
@@ -4745,38 +4745,4 @@
webkit.org/b/231690 fast/text/hanging-punctuation-allow-end-basic.html [ ImageOnlyFailure ]
webkit.org/b/229594 js/dfg-int16array.html [ Pass Crash ]
-webkit.org/b/229594 js/dfg-int32array-overflow-values.html [ Pass Crash ]
-webkit.org/b/229594 js/dfg-int8array.html [ Pass Crash ]
-webkit.org/b/229594 js/dfg-uint32array-overflow-values.html [ Pass Crash ]
-webkit.org/b/229594 js/dfg-uint8clampedarray.html [ Pass Crash ]
-webkit.org/b/229594 js/dfg-float64array.html [ Pass Crash ]
-# webkit.org/b/214448 Web Share API is not implemented in the Windows port
-http/tests/webshare/ [ Skip ]
-
-webkit.org/b/230727 fast/images/exif-orientation-composited.html [ Pass ImageOnlyFailure ]
-
-webkit.org/b/230838 svg/as-background-image/svg-as-background-body.html [ Pass Crash ]
-
-webkit.org/b/231921 http/wpt/webxr/xrHandInput_gc.html [ Pass Failure ]
-
-webkit.org/b/232188 fast/ruby/generated-before-counter-doesnt-crash.html [ Pass Failure ]
-
-webkit.org/b/232317 js/function-apply-aliased.html [ Pass Crash ]
-
-webkit.org/b/232319 fast/ruby/before-block-doesnt-crash.html [ Pass Failure ]
-
-webkit.org/b/232321 imported/mozilla/svg/viewBox-and-pattern-03.svg [ Pass Crash ]
-
-webkit.org/b/232703 webanimations/no-style-updates-for-animated-sibling-elements-accelerated.html [ Failure ]
-
-webkit.org/b/233887 webanimations/custom-effect [ Failure ]
-
-# OT-SVG is not implemented on Windows.
-fast/text/otsvg-canvas.html [ ImageOnlyFailure ]
-
-# The DocumentTimeline.maximumFrameRate property which this test is about is not available on Windows.
-webanimations/frame-rate/document-timeline-maximum-frame-rate.html [ Skip ]
-
-pointerevents/mouse/pointer-button-and-buttons.html [ Failure ]
-pointerevents/mouse/pointer-capture.html [ Failure ]
Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (288560 => 288561)
--- branches/safari-613-branch/Source/WebCore/ChangeLog 2022-01-25 17:36:35 UTC (rev 288560)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog 2022-01-25 17:48:16 UTC (rev 288561)
@@ -1,3 +1,7 @@
+2022-01-24 Russell Epstein <repst...@apple.com>
+
+ Revert r282746. rdar://problem/87732806
+
2022-01-24 Alan Coon <alanc...@apple.com>
Cherry-pick r288441. rdar://problem/87707090
Modified: branches/safari-613-branch/Source/WebCore/html/FeaturePolicy.cpp (288560 => 288561)
--- branches/safari-613-branch/Source/WebCore/html/FeaturePolicy.cpp 2022-01-25 17:36:35 UTC (rev 288560)
+++ branches/safari-613-branch/Source/WebCore/html/FeaturePolicy.cpp 2022-01-25 17:48:16 UTC (rev 288561)
@@ -57,8 +57,6 @@
return "SyncXHR";
case FeaturePolicy::Type::Fullscreen:
return "Fullscreen";
- case FeaturePolicy::Type::WebShare:
- return "WebShare";
#if ENABLE(DEVICE_ORIENTATION)
case FeaturePolicy::Type::Gyroscope:
return "Gyroscope";
@@ -182,7 +180,6 @@
bool isPaymentInitialized = false;
bool isSyncXHRInitialized = false;
bool isFullscreenInitialized = false;
- bool isWebShareInitialized = false;
#if ENABLE(DEVICE_ORIENTATION)
bool isGyroscopeInitialized = false;
bool isAccelerometerInitialized = false;
@@ -236,11 +233,6 @@
updateList(document, policy.m_fullscreenRule, item.substring(11));
continue;
}
- if (item.startsWith("web-share")) {
- isWebShareInitialized = true;
- updateList(document, policy.m_webShareRule, item.substring(10));
- continue;
- }
#if ENABLE(DEVICE_ORIENTATION)
if (item.startsWith("gyroscope")) {
isGyroscopeInitialized = true;
@@ -287,8 +279,6 @@
policy.m_geolocationRule.allowedList.add(document.securityOrigin().data());
if (!isPaymentInitialized)
policy.m_paymentRule.allowedList.add(document.securityOrigin().data());
- if (!isWebShareInitialized)
- policy.m_webShareRule.allowedList.add(document.securityOrigin().data());
#if ENABLE(DEVICE_ORIENTATION)
if (!isGyroscopeInitialized)
policy.m_gyroscopeRule.allowedList.add(document.securityOrigin().data());
@@ -346,8 +336,6 @@
return isAllowedByFeaturePolicy(m_syncXHRRule, origin);
case Type::Fullscreen:
return isAllowedByFeaturePolicy(m_fullscreenRule, origin);
- case Type::WebShare:
- return isAllowedByFeaturePolicy(m_webShareRule, origin);
#if ENABLE(DEVICE_ORIENTATION)
case Type::Gyroscope:
return isAllowedByFeaturePolicy(m_gyroscopeRule, origin);
Modified: branches/safari-613-branch/Source/WebCore/html/FeaturePolicy.h (288560 => 288561)
--- branches/safari-613-branch/Source/WebCore/html/FeaturePolicy.h 2022-01-25 17:36:35 UTC (rev 288560)
+++ branches/safari-613-branch/Source/WebCore/html/FeaturePolicy.h 2022-01-25 17:48:16 UTC (rev 288561)
@@ -47,7 +47,6 @@
Payment,
SyncXHR,
Fullscreen,
- WebShare,
#if ENABLE(DEVICE_ORIENTATION)
Gyroscope,
Accelerometer,
@@ -77,8 +76,6 @@
AllowRule m_paymentRule;
AllowRule m_syncXHRRule;
AllowRule m_fullscreenRule;
- AllowRule m_webShareRule;
-
#if ENABLE(DEVICE_ORIENTATION)
AllowRule m_gyroscopeRule;
AllowRule m_accelerometerRule;
Modified: branches/safari-613-branch/Source/WebCore/page/Navigator.cpp (288560 => 288561)
--- branches/safari-613-branch/Source/WebCore/page/Navigator.cpp 2022-01-25 17:36:35 UTC (rev 288560)
+++ branches/safari-613-branch/Source/WebCore/page/Navigator.cpp 2022-01-25 17:48:16 UTC (rev 288561)
@@ -30,7 +30,6 @@
#include "DOMPlugin.h"
#include "DOMPluginArray.h"
#include "Document.h"
-#include "FeaturePolicy.h"
#include "Frame.h"
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
@@ -131,9 +130,6 @@
if (!document.isFullyActive())
return false;
- if (!isFeaturePolicyAllowedByDocumentAndAllOwners(FeaturePolicy::Type::WebShare, document, LogFeaturePolicyFailure::Yes))
- return false;
-
bool hasShareableTitleOrText = !data.title.isNull() || !data.text.isNull();
bool hasShareableURL = !!shareableURLForShareData(document, data);
#if ENABLE(FILE_SHARE)
@@ -152,11 +148,6 @@
return;
}
- if (!isFeaturePolicyAllowedByDocumentAndAllOwners(FeaturePolicy::Type::WebShare, document, LogFeaturePolicyFailure::Yes)) {
- promise->reject(NotAllowedError, "Third-party iframes are not allowed to call share() unless explicitly allowed via Feature-Policy (web-share)"_s);
- return;
- }
-
if (m_hasPendingShare) {
promise->reject(NotAllowedError);
return;
@@ -183,7 +174,7 @@
if (document.settings().webShareFileAPIEnabled() && !data.files.isEmpty()) {
if (m_loader)
m_loader->cancel();
-
+
m_loader = ShareDataReader::create([this, promise = WTFMove(promise)] (ExceptionOr<ShareDataWithParsedURL&> readData) mutable {
showShareData(readData, WTFMove(promise));
});
