Changeset 231910 in webkit

Timestamp:

May 17, 2018 11:16:56 AM (6 years ago)

Author:

Brent Fulgham

Message:

Storage Access API: Allow documents that have been granted storage access to also do a popup
​https://bugs.webkit.org/show_bug.cgi?id=185615
<rdar://problem/39105791>

Reviewed by Chris Dumez.

Source/WebCore:

• dom/Document.cpp:

(WebCore::Document::consumeTemporaryUserGesture): Added. Clear the document's active one-time user
activity (for window opening) state.
(WebCore::Document::enableTemporaryUserGesture): Added. Establish a new active one-time user
activity (for window opening) state.
(WebCore::Document::requestStorageAccess): If the user approves Storage Access, establish a new
UserInteraction scope, then resolve the promise. Also post a task to clear the one-time user
gesture state.

LayoutTests:

• http/tests/storageAccess/request-and-grant-storage-access-cross-origin-non-sandboxed-iframe-pop-window-expected.txt: Added.
• http/tests/storageAccess/request-and-grant-storage-access-cross-origin-non-sandboxed-iframe-pop-window.html: Added.
• http/tests/storageAccess/resources/request-storage-access-iframe-and-pop-window.html: Added.
• http/tests/storageAccess/resources/request-storage-access-second-window.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/storageAccess/request-and-grant-storage-access-cross-origin-non-sandboxed-iframe-pop-window-expected.txt (added)
• LayoutTests/http/tests/storageAccess/request-and-grant-storage-access-cross-origin-non-sandboxed-iframe-pop-window.html (added)
• LayoutTests/http/tests/storageAccess/resources/request-storage-access-iframe-and-pop-window.html (added)
• LayoutTests/http/tests/storageAccess/resources/request-storage-access-second-window.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (4 diffs)
• Source/WebCore/dom/Document.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-05-17  Brent Fulgham  <bfulgham@apple.com>
+
+        Storage Access API: Allow documents that have been granted storage access to also do a popup
+        https://bugs.webkit.org/show_bug.cgi?id=185615
+        <rdar://problem/39105791>
+
+        Reviewed by Chris Dumez.
+
+        * http/tests/storageAccess/request-and-grant-storage-access-cross-origin-non-sandboxed-iframe-pop-window-expected.txt: Added.
+        * http/tests/storageAccess/request-and-grant-storage-access-cross-origin-non-sandboxed-iframe-pop-window.html: Added.
+        * http/tests/storageAccess/resources/request-storage-access-iframe-and-pop-window.html: Added.
+        * http/tests/storageAccess/resources/request-storage-access-second-window.html: Added.
+
 2018-05-17  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-17  Brent Fulgham  <bfulgham@apple.com>
+
+        Storage Access API: Allow documents that have been granted storage access to also do a popup
+        https://bugs.webkit.org/show_bug.cgi?id=185615
+        <rdar://problem/39105791>
+
+        Reviewed by Chris Dumez.
+
+        * dom/Document.cpp:
+        (WebCore::Document::consumeTemporaryUserGesture): Added. Clear the document's active one-time user
+        activity (for window opening) state.
+        (WebCore::Document::enableTemporaryUserGesture): Added. Establish a new active one-time user
+        activity (for window opening) state.
+        (WebCore::Document::requestStorageAccess): If the user approves Storage Access, establish a new
+        UserInteraction scope, then resolve the promise. Also post a task to clear the one-time user
+        gesture state.
+
 2018-05-17  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -123 +123 @@
 #include "MediaQueryMatcher.h"
 #include "MessageEvent.h"
+#include "Microtasks.h"
 #include "MouseEventWithHitTestResults.h"
 #include "MutationEvent.h"
@@ -7610 +7611 @@
     }
 
-    page->chrome().client().requestStorageAccess(WTFMove(iframeHost), WTFMove(topHost), frameID.value(), pageID.value(), [documentReference = m_weakFactory.createWeakPtr(*this), promise = WTFMove(promise)] (bool wasGranted) {
+    page->chrome().client().requestStorageAccess(WTFMove(iframeHost), WTFMove(topHost), frameID.value(), pageID.value(), [documentReference = m_weakFactory.createWeakPtr(*this), promise = WTFMove(promise)] (bool wasGranted) mutable {
         Document* document = documentReference.get();
         if (!document)
@@ -7617 +7618 @@
         if (wasGranted) {
             document->setHasFrameSpecificStorageAccess(true);
+            MicrotaskQueue::mainThreadQueue().append(std::make_unique<VoidMicrotask>([documentReference = document->m_weakFactory.createWeakPtr(*document)] () {
+                if (auto* document = documentReference.get())
+                    document->enableTemporaryTimeUserGesture();
+            }));
             promise->resolve();
+            MicrotaskQueue::mainThreadQueue().append(std::make_unique<VoidMicrotask>([documentReference = WTFMove(documentReference)] () {
+                if (auto* document = documentReference.get())
+                    document->consumeTemporaryTimeUserGesture();
+            }));
         } else
             promise->reject();
@@ -7624 +7633 @@
     promise->reject();
 #endif
+}
+
+void Document::enableTemporaryTimeUserGesture()
+{
+    m_temporaryUserGesture = std::make_unique<UserGestureIndicator>(ProcessingUserGesture, this);
+}
+
+void Document::consumeTemporaryTimeUserGesture()
+{
+    m_temporaryUserGesture = nullptr;
 }
 

trunk/Source/WebCore/dom/Document.h

@@ -1430 +1430 @@
     String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String& challengeString, const URL&);
 
+    void consumeTemporaryTimeUserGesture();
+
 protected:
     enum ConstructionFlags { Synthesized = 1, NonRenderedPlaceholder = 1 << 1 };
@@ -1542 +1544 @@
 
     bool domainIsRegisterable(const String&) const;
+
+    void enableTemporaryTimeUserGesture();
 
     const Ref<Settings> m_settings;
@@ -1920 +1924 @@
     String m_primaryDomainRequestedPageSpecificStorageAccessWithUserInteraction { };
 #endif
+    
+    std::unique_ptr<UserGestureIndicator> m_temporaryUserGesture;
 };