Changeset 281126 in webkit

Timestamp:

Aug 16, 2021 9:32:23 PM (11 months ago)

Author:

Devin Rousso

Message:

Web Share CanShare() should be called after transient activation check
​https://bugs.webkit.org/show_bug.cgi?id=229132

Reviewed by Tim Horton.

LayoutTests/imported/w3c:

• web-platform-tests/web-share/share-consume-activation.https-expected.txt:

Source/WebCore:

Test: web-platform-tests/web-share/share-consume-activation.https.html

• page/Navigator.cpp:

(WebCore::Navigator::share):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-share/share-consume-activation.https-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/Navigator.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-08-16  Devin Rousso  <drousso@apple.com>
+
+        Web Share CanShare() should be called after transient activation check
+        https://bugs.webkit.org/show_bug.cgi?id=229132
+
+        Reviewed by Tim Horton.
+
+        * web-platform-tests/web-share/share-consume-activation.https-expected.txt:
+
 2021-08-16  Alex Christensen  <achristensen@webkit.org>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/web-share/share-consume-activation.https-expected.txt

@@ -1 +1 @@
 
-FAIL Calling share consumes user activation promise_rejects_dom: function "function () { throw e }" threw object "TypeError: Type error" that is not a DOMException NotAllowedError: property "code" is equal to undefined, expected 0
+PASS Calling share consumes user activation
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-16  Devin Rousso  <drousso@apple.com>
+
+        Web Share CanShare() should be called after transient activation check
+        https://bugs.webkit.org/show_bug.cgi?id=229132
+
+        Reviewed by Tim Horton.
+
+        Test: web-platform-tests/web-share/share-consume-activation.https.html
+
+        * page/Navigator.cpp:
+        (WebCore::Navigator::share):
+
 2021-08-16  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/page/Navigator.cpp

@@ -144 +144 @@
 void Navigator::share(Document& document, const ShareData& data, Ref<DeferredPromise>&& promise)
 {
+    if (m_hasPendingShare) {
+        promise->reject(NotAllowedError);
+        return;
+    }
+
+    auto* window = this->window();
+    if (!window || !window->consumeTransientActivation()) {
+        promise->reject(NotAllowedError);
+        return;
+    }
+
     if (!canShare(document, data)) {
         promise->reject(TypeError);
-        return;
-    }
-
-    auto* window = this->window();
-    // Note that the specification does not indicate we should consume user activation. We are intentionally stricter here.
-    if (!window || !window->consumeTransientActivation() || m_hasPendingShare) {
-        promise->reject(NotAllowedError);
         return;
     }