Attachment 339745 Details for Bug 185335 – Patch

[patch] Patch

bug-185335-20180507131414.patch (text/plain), 46.96 KB, created by Alex Christensen on 2018-05-07 13:14:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-05-07 13:14:15 PDT

Size: 46.96 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 231438)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,26 @@
>+2018-05-07  Brent Fulgham  <bfulgham@apple.com>
>+
>+        Add experimental feature to prompt for Storage Access API use
>+        https://bugs.webkit.org/show_bug.cgi?id=185335
>+        <rdar://problem/39994649>
>+
>+        Reviewed by Alex Christensen and Youenn Fablet.
>+
>+        Create a new experimental feature that gates the ability of WebKit clients to prompt the user when
>+        Storage Access API is invoked.
>+
>+        Currently this feature doesn't have any user-visible impact.
>+
>+        * page/RuntimeEnabledFeatures.h:
>+        (WebCore::RuntimeEnabledFeatures::setStorageAccessPromptsEnabled):
>+        (WebCore::RuntimeEnabledFeatures::storageAccessPromptsEnabled const):
>+        * testing/InternalSettings.cpp:
>+        (WebCore::InternalSettings::Backup::Backup):
>+        (WebCore::InternalSettings::Backup::restoreTo):
>+        (WebCore::InternalSettings::setStorageAccessPromptsEnabled):
>+        * testing/InternalSettings.h:
>+        * testing/InternalSettings.idl:
>+
> 2018-05-07  Eric Carlson  <eric.carlson@apple.com>
> 
>         Text track cue logging should include cue text
>Index: Source/WebCore/page/ChromeClient.h
>===================================================================
>--- Source/WebCore/page/ChromeClient.h	(revision 231438)
>+++ Source/WebCore/page/ChromeClient.h	(working copy)
>@@ -467,8 +467,9 @@ public:
>     virtual void reportProcessCPUTime(Seconds, ActivityStateForCPUSampling) { }
>     virtual RefPtr<Icon> createIconForFiles(const Vector<String>& /* filenames */) = 0;
> 
>-    virtual void hasStorageAccess(String&& /*subFrameHost*/, String&& /*topFrameHost*/, uint64_t /*frameID*/, uint64_t /*pageID*/, WTF::CompletionHandler<void (bool)>&& callback) { callback(false); }
>-    virtual void requestStorageAccess(String&& /*subFrameHost*/, String&& /*topFrameHost*/, uint64_t /*frameID*/, uint64_t /*pageID*/, WTF::CompletionHandler<void (bool)>&& callback) { callback(false); }
>+    virtual void hasStorageAccess(String&& /*subFrameHost*/, String&& /*topFrameHost*/, uint64_t /*frameID*/, uint64_t /*pageID*/, CompletionHandler<void(bool)>&& callback) { callback(false); }
>+    virtual void requestStorageAccess(String&& /*subFrameHost*/, String&& /*topFrameHost*/, uint64_t /*frameID*/, uint64_t /*pageID*/, CompletionHandler<void(bool)>&& callback) { callback(false); }
>+    virtual void didRequestStorageAccessConfirmation(String&& /*subFrameHost*/, String&& /*topFrameHost*/, uint64_t /*frameID*/, uint64_t /*pageID*/, CompletionHandler<void(bool)>&& callback) { callback(true); }
> 
>     virtual void didInsertMenuElement(HTMLMenuElement&) { }
>     virtual void didRemoveMenuElement(HTMLMenuElement&) { }
>Index: Source/WebCore/page/RuntimeEnabledFeatures.h
>===================================================================
>--- Source/WebCore/page/RuntimeEnabledFeatures.h	(revision 231438)
>+++ Source/WebCore/page/RuntimeEnabledFeatures.h	(working copy)
>@@ -256,6 +256,9 @@ public:
>     void setWebGLCompressedTextureASTCSupportEnabled(bool isEnabled) { m_isWebGLCompressedTextureASTCSupportEnabled = isEnabled; }
>     bool webGLCompressedTextureASTCSupportEnabled() const { return m_isWebGLCompressedTextureASTCSupportEnabled; }
> 
>+    void setStorageAccessPromptsEnabled(bool isEnabled)  { m_promptForStorageAccessAPIEnabled = isEnabled; }
>+    bool storageAccessPromptsEnabled() const { return m_promptForStorageAccessAPIEnabled; }
>+
>     WEBCORE_EXPORT static RuntimeEnabledFeatures& sharedFeatures();
> 
> private:
>@@ -394,6 +397,8 @@ private:
>     
>     bool m_isWebGLCompressedTextureASTCSupportEnabled { false };
> 
>+    bool m_promptForStorageAccessAPIEnabled { false };
>+
>     friend class WTF::NeverDestroyed<RuntimeEnabledFeatures>;
> };
> 
>Index: Source/WebCore/testing/InternalSettings.cpp
>===================================================================
>--- Source/WebCore/testing/InternalSettings.cpp	(revision 231438)
>+++ Source/WebCore/testing/InternalSettings.cpp	(working copy)
>@@ -122,6 +122,7 @@ InternalSettings::Backup::Backup(Setting
>     , m_shouldManageAudioSessionCategory(DeprecatedGlobalSettings::shouldManageAudioSessionCategory())
> #endif
>     , m_customPasteboardDataEnabled(RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled())
>+    , m_promptForStorageAccessAPIEnabled(RuntimeEnabledFeatures::sharedFeatures().storageAccessPromptsEnabled())
> {
> }
> 
>@@ -225,6 +226,8 @@ void InternalSettings::Backup::restoreTo
> #if USE(AUDIO_SESSION)
>     DeprecatedGlobalSettings::setShouldManageAudioSessionCategory(m_shouldManageAudioSessionCategory);
> #endif
>+
>+    RuntimeEnabledFeatures::sharedFeatures().setStorageAccessPromptsEnabled(m_promptForStorageAccessAPIEnabled);
> }
> 
> class InternalSettingsWrapper : public Supplement<Page> {
>@@ -776,6 +779,11 @@ void InternalSettings::setScreenCaptureE
> #endif
> }
> 
>+void InternalSettings::setStorageAccessPromptsEnabled(bool enabled)
>+{
>+    RuntimeEnabledFeatures::sharedFeatures().setStorageAccessPromptsEnabled(enabled);
>+}
>+    
> ExceptionOr<String> InternalSettings::userInterfaceDirectionPolicy()
> {
>     if (!m_page)
>Index: Source/WebCore/testing/InternalSettings.h
>===================================================================
>--- Source/WebCore/testing/InternalSettings.h	(revision 231438)
>+++ Source/WebCore/testing/InternalSettings.h	(working copy)
>@@ -127,6 +127,8 @@ public:
> 
>     static bool cssAnimationsAndCSSTransitionsBackedByWebAnimationsEnabled();
> 
>+    static void setStorageAccessPromptsEnabled(bool);
>+
> private:
>     explicit InternalSettings(Page*);
> 
>@@ -214,6 +216,7 @@ private:
>         bool m_shouldManageAudioSessionCategory;
> #endif
>         bool m_customPasteboardDataEnabled;
>+        bool m_promptForStorageAccessAPIEnabled { false };
>     };
> 
>     Page* m_page;
>Index: Source/WebCore/testing/InternalSettings.idl
>===================================================================
>--- Source/WebCore/testing/InternalSettings.idl	(revision 231438)
>+++ Source/WebCore/testing/InternalSettings.idl	(working copy)
>@@ -92,6 +92,7 @@ enum FontLoadTimingOverride { "Block", "
>     void setWebGPUEnabled(boolean enabled);
>     void setWebVREnabled(boolean enabled);
>     void setScreenCaptureEnabled(boolean enabled);
>+    void setStorageAccessPromptsEnabled(boolean enabled);
> 
>     [MayThrowException] DOMString userInterfaceDirectionPolicy();
>     [MayThrowException] void setUserInterfaceDirectionPolicy(DOMString policy);
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 231438)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,48 @@
>+2018-05-07  Brent Fulgham  <bfulgham@apple.com>
>+
>+        Add experimental feature to prompt for Storage Access API use
>+        https://bugs.webkit.org/show_bug.cgi?id=185335
>+        <rdar://problem/39994649>
>+
>+        Reviewed by Alex Christensen and Youenn Fablet.
>+
>+        Create a new experimental feature that gates the ability of WebKit clients to prompt the user when
>+        Storage Access API is invoked.
>+
>+        Currently this feature doesn't have any user-visible impact.
>+
>+        * Shared/API/APIObject.h:
>+        * Shared/API/c/WKBase.h:
>+        * Shared/WebPreferences.yaml:
>+        * UIProcess/API/APIUIClient.h:
>+        (API::UIClient::requestStorageAccessConfirm):
>+        * UIProcess/API/C/WKPage.cpp:
>+        (WebKit::RequestStorageAccessConfirmResultListener::create):
>+        (WebKit::RequestStorageAccessConfirmResultListener::~RequestStorageAccessConfirmResultListener):
>+        (WebKit::RequestStorageAccessConfirmResultListener::call):
>+        (WebKit::RequestStorageAccessConfirmResultListener::RequestStorageAccessConfirmResultListener):
>+        (WKPageRequestStorageAccessConfirmResultListenerGetTypeID):
>+        (WKPageRequestStorageAccessConfirmResultListenerCall):
>+        (WKPageSetPageUIClient):
>+        * UIProcess/API/C/WKPageUIClient.h:
>+        * UIProcess/API/Cocoa/WKPreferences.mm:
>+        (-[WKPreferences _storageAccessPromptsEnabled]):
>+        (-[WKPreferences _setStorageAccessPromptsEnabled:]):
>+        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
>+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
>+        * UIProcess/Cocoa/UIDelegate.h:
>+        * UIProcess/Cocoa/UIDelegate.mm:
>+        (WebKit::UIDelegate::setDelegate):
>+        (WebKit::UIDelegate::UIClient::requestStorageAccessConfirm):
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::requestStorageAccessConfirm):
>+        * UIProcess/WebPageProxy.h:
>+        * UIProcess/WebPageProxy.messages.in:
>+        * UIProcess/WebPreferences.cpp:
>+        (WebKit::WebPreferences::update):
>+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
>+        (WebKit::WebChromeClient::requestStorageAccess):
>+
> 2018-05-04  Tim Horton  <timothy_horton@apple.com>
> 
>         Shift to a lower-level framework for simplifying URLs
>Index: Source/WebKit/Shared/WebPreferences.yaml
>===================================================================
>--- Source/WebKit/Shared/WebPreferences.yaml	(revision 231438)
>+++ Source/WebKit/Shared/WebPreferences.yaml	(working copy)
>@@ -1259,3 +1259,11 @@ WebGLCompressedTextureASTCSupportEnabled
>   humanReadableDescription: "Support for ASTC compressed texture formats in WebGL"
>   category: experimental
>   webcoreBinding: RuntimeEnabledFeatures
>+
>+StorageAccessPromptsEnabled:
>+    type: bool
>+    defaultValue: false
>+    humanReadableName: "Prompt for Storage Access API Requests"
>+    humanReadableDescription: "Prompt the user when Storage Access API calls are made"
>+    category: experimental
>+    webcoreBinding: RuntimeEnabledFeatures
>Index: Source/WebKit/Shared/API/APIObject.h
>===================================================================
>--- Source/WebKit/Shared/API/APIObject.h	(revision 231438)
>+++ Source/WebKit/Shared/API/APIObject.h	(working copy)
>@@ -144,6 +144,7 @@ public:
>         ProcessPoolConfiguration,
>         PluginSiteDataManager,
>         Preferences,
>+        RequestStorageAccessConfirmResultListener,
>         ResourceLoadStatisticsStore,
>         RunBeforeUnloadConfirmPanelResultListener,
>         RunJavaScriptAlertResultListener,
>Index: Source/WebKit/Shared/API/c/WKBase.h
>===================================================================
>--- Source/WebKit/Shared/API/c/WKBase.h	(revision 231438)
>+++ Source/WebKit/Shared/API/c/WKBase.h	(working copy)
>@@ -125,6 +125,7 @@ typedef const struct OpaqueWKPageRunBefo
> typedef const struct OpaqueWKPageRunJavaScriptAlertResultListener* WKPageRunJavaScriptAlertResultListenerRef;
> typedef const struct OpaqueWKPageRunJavaScriptConfirmResultListener* WKPageRunJavaScriptConfirmResultListenerRef;
> typedef const struct OpaqueWKPageRunJavaScriptPromptResultListener* WKPageRunJavaScriptPromptResultListenerRef;
>+typedef const struct OpaqueWKPageRequestStorageAccessConfirmResultListener* WKPageRequestStorageAccessConfirmResultListenerRef;
> typedef const struct OpaqueWKResourceLoadStatisticsManager* WKResourceLoadStatisticsManagerRef;
> typedef const struct OpaqueWKTextChecker* WKTextCheckerRef;
> typedef const struct OpaqueWKSession* WKSessionRef;
>Index: Source/WebKit/UIProcess/WebPageProxy.cpp
>===================================================================
>--- Source/WebKit/UIProcess/WebPageProxy.cpp	(revision 231438)
>+++ Source/WebKit/UIProcess/WebPageProxy.cpp	(working copy)
>@@ -138,6 +138,7 @@
> #include <WebCore/PerformanceLoggingClient.h>
> #include <WebCore/PublicSuffix.h>
> #include <WebCore/RenderEmbeddedObject.h>
>+#include <WebCore/RuntimeEnabledFeatures.h>
> #include <WebCore/SSLKeyGenerator.h>
> #include <WebCore/SerializedCryptoKeyWrap.h>
> #include <WebCore/SharedBuffer.h>
>@@ -4270,6 +4271,24 @@ void WebPageProxy::runJavaScriptPrompt(u
>     });
> }
> 
>+void WebPageProxy::requestStorageAccessConfirm(uint64_t frameID, const String& requestingDomain, const String& currentDomain, uint64_t callbackIdentifier)
>+{
>+    WebFrameProxy* frame = m_process->webFrame(frameID);
>+    MESSAGE_CHECK(frame);
>+
>+    // Since runJavaScriptPrompt() can spin a nested run loop we need to turn off the responsiveness timer.
>+    m_process->responsivenessTimer().stop();
>+
>+    if (m_controlledByAutomation) {
>+        if (auto* automationSession = process().processPool().automationSession())
>+            automationSession->willShowJavaScriptDialog(*this);
>+    }
>+
>+    m_uiClient->requestStorageAccessConfirm(*this, *frame, requestingDomain, currentDomain, [this, protectedThis = makeRef(*this), callbackIdentifier](bool result) {
>+        m_process->send(Messages::WebPage::DidReceiveStorageAccessConfirmation(callbackIdentifier, result), m_pageID);
>+    });
>+}
>+    
> void WebPageProxy::setStatusText(const String& text)
> {
>     m_uiClient->setStatusText(this, text);
>Index: Source/WebKit/UIProcess/WebPageProxy.h
>===================================================================
>--- Source/WebKit/UIProcess/WebPageProxy.h	(revision 231438)
>+++ Source/WebKit/UIProcess/WebPageProxy.h	(working copy)
>@@ -1402,6 +1402,7 @@ private:
>     void runJavaScriptAlert(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, Ref<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply>&&);
>     void runJavaScriptConfirm(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, Ref<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply>&&);
>     void runJavaScriptPrompt(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, const String&, Ref<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply>&&);
>+    void requestStorageAccessConfirm(uint64_t frameID, const String& requestingDomain, const String& currentDomain, uint64_t callbackIdentifier);
>     void setStatusText(const String&);
>     void mouseDidMoveOverElement(WebHitTestResultData&&, uint32_t modifiers, UserData&&);
> 
>Index: Source/WebKit/UIProcess/WebPageProxy.messages.in
>===================================================================
>--- Source/WebKit/UIProcess/WebPageProxy.messages.in	(revision 231438)
>+++ Source/WebKit/UIProcess/WebPageProxy.messages.in	(working copy)
>@@ -28,6 +28,7 @@ messages -> WebPageProxy {
>     RunJavaScriptAlert(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, String message) -> () Delayed
>     RunJavaScriptConfirm(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, String message) -> (bool result) Delayed
>     RunJavaScriptPrompt(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, String message, String defaultValue) -> (String result) Delayed
>+    RequestStorageAccessConfirm(uint64_t frameID, String requestingDomain, String currentDomain, uint64_t callbackIdentifier)
>     MouseDidMoveOverElement(struct WebKit::WebHitTestResultData hitTestResultData, uint32_t modifiers, WebKit::UserData userData)
> 
> #if ENABLE(NETSCAPE_PLUGIN_API)
>Index: Source/WebKit/UIProcess/API/APIUIClient.h
>===================================================================
>--- Source/WebKit/UIProcess/API/APIUIClient.h	(revision 231438)
>+++ Source/WebKit/UIProcess/API/APIUIClient.h	(working copy)
>@@ -128,6 +128,7 @@ public:
>     virtual bool decidePolicyForUserMediaPermissionRequest(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, SecurityOrigin&, SecurityOrigin&, WebKit::UserMediaPermissionRequestProxy&) { return false; }
>     virtual bool checkUserMediaPermissionForOrigin(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, SecurityOrigin&, SecurityOrigin&, WebKit::UserMediaPermissionCheckProxy&) { return false; }
>     virtual void decidePolicyForNotificationPermissionRequest(WebKit::WebPageProxy&, SecurityOrigin&, Function<void(bool)>&& completionHandler) { completionHandler(false); }
>+    virtual void requestStorageAccessConfirm(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, const WTF::String& requestingDomain, const WTF::String& currentDomain, CompletionHandler<void(bool)>&& completionHandler) { completionHandler(true); }
> 
>     // Printing.
>     virtual float headerHeight(WebKit::WebPageProxy&, WebKit::WebFrameProxy&) { return 0; }
>Index: Source/WebKit/UIProcess/API/C/WKPage.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKPage.cpp	(revision 231438)
>+++ Source/WebKit/UIProcess/API/C/WKPage.cpp	(working copy)
>@@ -111,7 +111,7 @@ template<> struct ClientTraits<WKPagePol
> };
> 
> template<> struct ClientTraits<WKPageUIClientBase> {
>-    typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2, WKPageUIClientV3, WKPageUIClientV4, WKPageUIClientV5, WKPageUIClientV6, WKPageUIClientV7, WKPageUIClientV8, WKPageUIClientV9, WKPageUIClientV10, WKPageUIClientV11> Versions;
>+    typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2, WKPageUIClientV3, WKPageUIClientV4, WKPageUIClientV5, WKPageUIClientV6, WKPageUIClientV7, WKPageUIClientV8, WKPageUIClientV9, WKPageUIClientV10, WKPageUIClientV11, WKPageUIClientV12> Versions;
> };
> 
> #if ENABLE(CONTEXT_MENUS)
>@@ -1510,10 +1510,36 @@ private:
>     Function<void (const String&)> m_completionHandler;
> };
> 
>+class RequestStorageAccessConfirmResultListener : public API::ObjectImpl<API::Object::Type::RequestStorageAccessConfirmResultListener> {
>+public:
>+    static Ref<RequestStorageAccessConfirmResultListener> create(CompletionHandler<void(bool)>&& completionHandler)
>+    {
>+        return adoptRef(*new RequestStorageAccessConfirmResultListener(WTFMove(completionHandler)));
>+    }
>+    
>+    virtual ~RequestStorageAccessConfirmResultListener()
>+    {
>+    }
>+    
>+    void call(bool result)
>+    {
>+        m_completionHandler(result);
>+    }
>+    
>+private:
>+    explicit RequestStorageAccessConfirmResultListener(CompletionHandler<void(bool)>&& completionHandler)
>+        : m_completionHandler(WTFMove(completionHandler))
>+    {
>+    }
>+    
>+    CompletionHandler<void(bool)> m_completionHandler;
>+};
>+
> WK_ADD_API_MAPPING(WKPageRunBeforeUnloadConfirmPanelResultListenerRef, RunBeforeUnloadConfirmPanelResultListener)
> WK_ADD_API_MAPPING(WKPageRunJavaScriptAlertResultListenerRef, RunJavaScriptAlertResultListener)
> WK_ADD_API_MAPPING(WKPageRunJavaScriptConfirmResultListenerRef, RunJavaScriptConfirmResultListener)
> WK_ADD_API_MAPPING(WKPageRunJavaScriptPromptResultListenerRef, RunJavaScriptPromptResultListener)
>+WK_ADD_API_MAPPING(WKPageRequestStorageAccessConfirmResultListenerRef, RequestStorageAccessConfirmResultListener)
> 
> }
> 
>@@ -1557,6 +1583,16 @@ void WKPageRunJavaScriptPromptResultList
>     toImpl(listener)->call(toWTFString(result));
> }
> 
>+WKTypeID WKPageRequestStorageAccessConfirmResultListenerGetTypeID()
>+{
>+    return toAPI(RequestStorageAccessConfirmResultListener::APIType);
>+}
>+
>+void WKPageRequestStorageAccessConfirmResultListenerCall(WKPageRequestStorageAccessConfirmResultListenerRef listener, bool result)
>+{
>+    toImpl(listener)->call(result);
>+}
>+
> void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient)
> {
>     class UIClient : public API::Client<WKPageUIClientBase>, public API::UIClient {
>@@ -1982,6 +2018,17 @@ void WKPageSetPageUIClient(WKPageRef pag
>             m_client.decidePolicyForNotificationPermissionRequest(toAPI(&page), toAPI(&origin), toAPI(NotificationPermissionRequest::create(WTFMove(completionHandler)).ptr()), m_client.base.clientInfo);
>         }
> 
>+        void requestStorageAccessConfirm(WebPageProxy& page, WebFrameProxy& frame, const WTF::String& requestingDomain, const WTF::String& currentDomain, CompletionHandler<void(bool)>&& completionHandler) final
>+        {
>+            if (!m_client.requestStorageAccessConfirm) {
>+                completionHandler(true);
>+                return;
>+            }
>+
>+            auto listener = RequestStorageAccessConfirmResultListener::create(WTFMove(completionHandler));
>+            m_client.requestStorageAccessConfirm(toAPI(&page), toAPI(&frame), toAPI(requestingDomain.impl()), toAPI(currentDomain.impl()), toAPI(listener.ptr()), m_client.base.clientInfo);
>+        }
>+
>         // Printing.
>         float headerHeight(WebPageProxy& page, WebFrameProxy& frame) final
>         {
>Index: Source/WebKit/UIProcess/API/C/WKPageUIClient.h
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKPageUIClient.h	(revision 231438)
>+++ Source/WebKit/UIProcess/API/C/WKPageUIClient.h	(working copy)
>@@ -79,12 +79,16 @@ WK_EXPORT void WKPageRunJavaScriptConfir
> WK_EXPORT WKTypeID WKPageRunJavaScriptPromptResultListenerGetTypeID();
> WK_EXPORT void WKPageRunJavaScriptPromptResultListenerCall(WKPageRunJavaScriptPromptResultListenerRef listener, WKStringRef result);
> 
>+WK_EXPORT WKTypeID WKPageRequestStorageAccessConfirmResultListenerGetTypeID();
>+WK_EXPORT void WKPageRequestStorageAccessConfirmResultListenerCall(WKPageRequestStorageAccessConfirmResultListenerRef listener, bool result);
>+    
> typedef void (*WKPageUIClientCallback)(WKPageRef page, const void* clientInfo);
> typedef WKPageRef (*WKPageCreateNewPageCallback)(WKPageRef page, WKPageConfigurationRef configuration, WKNavigationActionRef navigationAction, WKWindowFeaturesRef windowFeatures, const void *clientInfo);
> typedef void (*WKPageRunBeforeUnloadConfirmPanelCallback)(WKPageRef page, WKStringRef message, WKFrameRef frame, WKPageRunBeforeUnloadConfirmPanelResultListenerRef listener, const void *clientInfo);
> typedef void (*WKPageRunJavaScriptAlertCallback)(WKPageRef page, WKStringRef alertText, WKFrameRef frame, WKSecurityOriginRef securityOrigin, WKPageRunJavaScriptAlertResultListenerRef listener, const void *clientInfo);
> typedef void (*WKPageRunJavaScriptConfirmCallback)(WKPageRef page, WKStringRef message, WKFrameRef frame, WKSecurityOriginRef securityOrigin, WKPageRunJavaScriptConfirmResultListenerRef listener, const void *clientInfo);
> typedef void (*WKPageRunJavaScriptPromptCallback)(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, WKSecurityOriginRef securityOrigin, WKPageRunJavaScriptPromptResultListenerRef listener, const void *clientInfo);
>+typedef void (*WKPageRequestStorageAccessConfirmCallback)(WKPageRef page, WKFrameRef frame, WKStringRef requestingDomain, WKStringRef currentDomain, WKPageRequestStorageAccessConfirmResultListenerRef listener, const void *clientInfo);
> typedef void (*WKPageTakeFocusCallback)(WKPageRef page, WKFocusDirection direction, const void *clientInfo);
> typedef void (*WKPageFocusCallback)(WKPageRef page, const void *clientInfo);
> typedef void (*WKPageUnfocusCallback)(WKPageRef page, const void *clientInfo);
>@@ -1033,6 +1037,107 @@ typedef struct WKPageUIClientV11 {
>     WKPageDidResignInputElementStrongPasswordAppearanceCallback         didResignInputElementStrongPasswordAppearance;
> } WKPageUIClientV11;
> 
>+typedef struct WKPageUIClientV12 {
>+    WKPageUIClientBase                                                  base;
>+    
>+    // Version 0.
>+    WKPageCreateNewPageCallback_deprecatedForUseWithV0                  createNewPage_deprecatedForUseWithV0;
>+    WKPageUIClientCallback                                              showPage;
>+    WKPageUIClientCallback                                              close;
>+    WKPageTakeFocusCallback                                             takeFocus;
>+    WKPageFocusCallback                                                 focus;
>+    WKPageUnfocusCallback                                               unfocus;
>+    WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0             runJavaScriptAlert_deprecatedForUseWithV0;
>+    WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0           runJavaScriptConfirm_deprecatedForUseWithV0;
>+    WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0            runJavaScriptPrompt_deprecatedForUseWithV0;
>+    WKPageSetStatusTextCallback                                         setStatusText;
>+    WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0        mouseDidMoveOverElement_deprecatedForUseWithV0;
>+    WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0     missingPluginButtonClicked_deprecatedForUseWithV0;
>+    WKPageDidNotHandleKeyEventCallback                                  didNotHandleKeyEvent;
>+    WKPageDidNotHandleWheelEventCallback                                didNotHandleWheelEvent;
>+    WKPageGetToolbarsAreVisibleCallback                                 toolbarsAreVisible;
>+    WKPageSetToolbarsAreVisibleCallback                                 setToolbarsAreVisible;
>+    WKPageGetMenuBarIsVisibleCallback                                   menuBarIsVisible;
>+    WKPageSetMenuBarIsVisibleCallback                                   setMenuBarIsVisible;
>+    WKPageGetStatusBarIsVisibleCallback                                 statusBarIsVisible;
>+    WKPageSetStatusBarIsVisibleCallback                                 setStatusBarIsVisible;
>+    WKPageGetIsResizableCallback                                        isResizable;
>+    WKPageSetIsResizableCallback                                        setIsResizable;
>+    WKPageGetWindowFrameCallback                                        getWindowFrame;
>+    WKPageSetWindowFrameCallback                                        setWindowFrame;
>+    WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6    runBeforeUnloadConfirmPanel_deprecatedForUseWithV6;
>+    WKPageUIClientCallback                                              didDraw;
>+    WKPageUIClientCallback                                              pageDidScroll;
>+    WKPageExceededDatabaseQuotaCallback                                 exceededDatabaseQuota;
>+    WKPageRunOpenPanelCallback                                          runOpenPanel;
>+    WKPageDecidePolicyForGeolocationPermissionRequestCallback           decidePolicyForGeolocationPermissionRequest;
>+    WKPageHeaderHeightCallback                                          headerHeight;
>+    WKPageFooterHeightCallback                                          footerHeight;
>+    WKPageDrawHeaderCallback                                            drawHeader;
>+    WKPageDrawFooterCallback                                            drawFooter;
>+    WKPagePrintFrameCallback                                            printFrame;
>+    WKPageUIClientCallback                                              runModal;
>+    void*                                                               unused1; // Used to be didCompleteRubberBandForMainFrame
>+    WKPageSaveDataToFileInDownloadsFolderCallback                       saveDataToFileInDownloadsFolder;
>+    void*                                                               shouldInterruptJavaScript_unavailable;
>+    
>+    // Version 1.
>+    WKPageCreateNewPageCallback_deprecatedForUseWithV1                  createNewPage_deprecatedForUseWithV1;
>+    WKPageMouseDidMoveOverElementCallback                               mouseDidMoveOverElement;
>+    WKPageDecidePolicyForNotificationPermissionRequestCallback          decidePolicyForNotificationPermissionRequest;
>+    WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1;
>+    
>+    // Version 2.
>+    WKPageShowColorPickerCallback                                       showColorPicker;
>+    WKPageHideColorPickerCallback                                       hideColorPicker;
>+    WKPageUnavailablePluginButtonClickedCallback                        unavailablePluginButtonClicked;
>+    
>+    // Version 3.
>+    WKPagePinnedStateDidChangeCallback                                  pinnedStateDidChange;
>+    
>+    // Version 4.
>+    void*                                                               unused2; // Used to be didBeginTrackingPotentialLongMousePress.
>+    void*                                                               unused3; // Used to be didRecognizeLongMousePress.
>+    void*                                                               unused4; // Used to be didCancelTrackingPotentialLongMousePress.
>+    WKPageIsPlayingAudioDidChangeCallback                               isPlayingAudioDidChange;
>+    
>+    // Version 5.
>+    WKPageDecidePolicyForUserMediaPermissionRequestCallback             decidePolicyForUserMediaPermissionRequest;
>+    WKPageDidClickAutoFillButtonCallback                                didClickAutoFillButton;
>+    WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5             runJavaScriptAlert_deprecatedForUseWithV5;
>+    WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm_deprecatedForUseWithV5;
>+    WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt_deprecatedForUseWithV5;
>+    WKPageMediaSessionMetadataDidChangeCallback                         mediaSessionMetadataDidChange;
>+    
>+    // Version 6.
>+    WKPageCreateNewPageCallback                                         createNewPage;
>+    WKPageRunJavaScriptAlertCallback                                    runJavaScriptAlert;
>+    WKPageRunJavaScriptConfirmCallback                                  runJavaScriptConfirm;
>+    WKPageRunJavaScriptPromptCallback                                   runJavaScriptPrompt;
>+    WKCheckUserMediaPermissionCallback                                  checkUserMediaPermissionForOrigin;
>+    
>+    // Version 7.
>+    WKPageRunBeforeUnloadConfirmPanelCallback                           runBeforeUnloadConfirmPanel;
>+    WKFullscreenMayReturnToInlineCallback                               fullscreenMayReturnToInline;
>+    
>+    // Version 8.
>+    WKRequestPointerLockCallback                                        requestPointerLock;
>+    WKDidLosePointerLockCallback                                        didLosePointerLock;
>+    
>+    // Version 9.
>+    WKHandleAutoplayEventCallback                                       handleAutoplayEvent;
>+    
>+    // Version 10.
>+    WKHasVideoInPictureInPictureDidChangeCallback                       hasVideoInPictureInPictureDidChange;
>+    WKDidExceedBackgroundResourceLimitWhileInForegroundCallback         didExceedBackgroundResourceLimitWhileInForeground;
>+    
>+    // Version 11.
>+    WKPageDidResignInputElementStrongPasswordAppearanceCallback         didResignInputElementStrongPasswordAppearance;
>+
>+    // Version 12.
>+    WKPageRequestStorageAccessConfirmCallback                           requestStorageAccessConfirm;
>+} WKPageUIClientV12;
>+
> #ifdef __cplusplus
> }
> #endif
>Index: Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKPreferences.cpp	(revision 231438)
>+++ Source/WebKit/UIProcess/API/C/WKPreferences.cpp	(working copy)
>@@ -194,6 +194,16 @@ bool WKPreferencesGetJavaScriptCanOpenWi
>     return toImpl(preferencesRef)->javaScriptCanOpenWindowsAutomatically();
> }
> 
>+void WKPreferencesSetStorageAccessPromptsEnabled(WKPreferencesRef preferencesRef, bool enabled)
>+{
>+    toImpl(preferencesRef)->setStorageAccessPromptsEnabled(enabled);
>+}
>+
>+bool WKPreferencesGetStorageAccessPromptsEnabled(WKPreferencesRef preferencesRef)
>+{
>+    return toImpl(preferencesRef)->storageAccessPromptsEnabled();
>+}
>+
> void WKPreferencesSetHyperlinkAuditingEnabled(WKPreferencesRef preferencesRef, bool hyperlinkAuditingEnabled)
> {
>     toImpl(preferencesRef)->setHyperlinkAuditingEnabled(hyperlinkAuditingEnabled);
>Index: Source/WebKit/UIProcess/API/C/WKPreferencesRef.h
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKPreferencesRef.h	(revision 231438)
>+++ Source/WebKit/UIProcess/API/C/WKPreferencesRef.h	(working copy)
>@@ -108,6 +108,10 @@ WK_EXPORT bool WKPreferencesGetJavaEnabl
> WK_EXPORT void WKPreferencesSetJavaScriptCanOpenWindowsAutomatically(WKPreferencesRef preferences, bool javaScriptCanOpenWindowsAutomatically);
> WK_EXPORT bool WKPreferencesGetJavaScriptCanOpenWindowsAutomatically(WKPreferencesRef preferences);
> 
>+// Defaults to false.
>+WK_EXPORT void WKPreferencesSetStorageAccessPromptsEnabled(WKPreferencesRef preferencesRef, bool enabled);
>+WK_EXPORT bool WKPreferencesGetStorageAccessPromptsEnabled(WKPreferencesRef preferencesRef);
>+
> // Defaults to true.
> WK_EXPORT void WKPreferencesSetHyperlinkAuditingEnabled(WKPreferencesRef preferences, bool hyperlinkAuditingEnabled);
> WK_EXPORT bool WKPreferencesGetHyperlinkAuditingEnabled(WKPreferencesRef preferences);
>Index: Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm	(revision 231438)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm	(working copy)
>@@ -129,6 +129,16 @@ - (void)setJavaScriptCanOpenWindowsAutom
>     _preferences->setJavaScriptCanOpenWindowsAutomatically(javaScriptCanOpenWindowsAutomatically);
> }
> 
>+- (BOOL)_storageAccessPromptsEnabled
>+{
>+    return _preferences->storageAccessPromptsEnabled();
>+}
>+
>+- (void)_setStorageAccessPromptsEnabled:(BOOL)enabled
>+{
>+    _preferences->setStorageAccessPromptsEnabled(enabled);
>+}
>+
> #pragma mark OS X-specific methods
> 
> #if PLATFORM(MAC)
>Index: Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h	(revision 231438)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h	(working copy)
>@@ -136,6 +136,8 @@ typedef NS_ENUM(NSInteger, _WKEditableLi
> 
> @property (nonatomic, setter=_setShouldEnableTextAutosizingBoost:) BOOL _shouldEnableTextAutosizingBoost WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> 
>+@property (nonatomic, setter=_setStorageAccessPromptsEnabled:) BOOL _storageAccessPromptsEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
>+
> #if !TARGET_OS_IPHONE
> @property (nonatomic, setter=_setWebGLEnabled:) BOOL _webGLEnabled WK_API_AVAILABLE(macosx(10.13.4));
> @property (nonatomic, setter=_setJavaEnabledForLocalFiles:) BOOL _javaEnabledForLocalFiles WK_API_AVAILABLE(macosx(10.13.4));
>Index: Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h	(revision 231438)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h	(working copy)
>@@ -116,6 +116,8 @@ struct UIEdgeInsets;
> 
> - (void)_webView:(WKWebView *)webView didResignInputElementStrongPasswordAppearanceWithUserInfo:(id <NSSecureCoding>)userInfo WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> 
>+- (void)_webView:(WKWebView *)webView requestStorageAccessPanelForDomain:(NSString *)requestingDomain underCurrentDomain:(NSString *)currentDomain completionHandler:(void (^)(BOOL result))completionHandler WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
>+
> #if TARGET_OS_IPHONE
> - (BOOL)_webView:(WKWebView *)webView shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element WK_API_AVAILABLE(ios(9.0));
> - (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(NSArray<_WKElementAction *> *)defaultActions;
>Index: Source/WebKit/UIProcess/Cocoa/UIDelegate.h
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/UIDelegate.h	(revision 231438)
>+++ Source/WebKit/UIProcess/Cocoa/UIDelegate.h	(working copy)
>@@ -88,6 +88,7 @@ private:
>         void runJavaScriptAlert(WebPageProxy*, const WTF::String&, WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void()>&& completionHandler) final;
>         void runJavaScriptConfirm(WebPageProxy*, const WTF::String&, WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void(bool)>&& completionHandler) final;
>         void runJavaScriptPrompt(WebPageProxy*, const WTF::String&, const WTF::String&, WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void(const WTF::String&)>&&) final;
>+        void requestStorageAccessConfirm(WebPageProxy&, WebFrameProxy&, const WTF::String& requestingDomain, const WTF::String& currentDomain, CompletionHandler<void(bool)>&&) final;
>         void decidePolicyForGeolocationPermissionRequest(WebPageProxy&, WebFrameProxy&, API::SecurityOrigin&, Function<void(bool)>&) final;
>         bool canRunBeforeUnloadConfirmPanel() const final;
>         void runBeforeUnloadConfirmPanel(WebPageProxy*, const WTF::String&, WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void(bool)>&& completionHandler) final;
>@@ -156,6 +157,7 @@ private:
>         bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1;
>         bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
>         bool webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler : 1;
>+        bool webViewRequestStorageAccessPanelForTopPrivatelyControlledDomainUnderFirstPartyTopPrivatelyControlledDomainCompletionHandler : 1;
>         bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
>         bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1;
>         bool webViewDidResignInputElementStrongPasswordAppearanceWithUserInfo : 1;
>Index: Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/UIDelegate.mm	(revision 231438)
>+++ Source/WebKit/UIProcess/Cocoa/UIDelegate.mm	(working copy)
>@@ -102,6 +102,7 @@ void UIDelegate::setDelegate(id <WKUIDel
>     m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:)];
>     m_delegateMethods.webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:)];
>     m_delegateMethods.webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:)];
>+    m_delegateMethods.webViewRequestStorageAccessPanelForTopPrivatelyControlledDomainUnderFirstPartyTopPrivatelyControlledDomainCompletionHandler = [delegate respondsToSelector:@selector(_webView:requestStorageAccessPanelForDomain:underCurrentDomain:completionHandler:)];
>     m_delegateMethods.webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(_webView:runBeforeUnloadConfirmPanelWithMessage:initiatedByFrame:completionHandler:)];
>     m_delegateMethods.webViewRequestGeolocationPermissionForFrameDecisionHandler = [delegate respondsToSelector:@selector(_webView:requestGeolocationPermissionForFrame:decisionHandler:)];
>     m_delegateMethods.webViewDidResignInputElementStrongPasswordAppearanceWithUserInfo = [delegate respondsToSelector:@selector(_webView:didResignInputElementStrongPasswordAppearanceWithUserInfo:)];
>@@ -328,6 +329,28 @@ void UIDelegate::UIClient::runJavaScript
>     }).get()];
> }
> 
>+void UIDelegate::UIClient::requestStorageAccessConfirm(WebPageProxy&, WebFrameProxy&, const WTF::String& requestingDomain, const WTF::String& currentDomain, CompletionHandler<void(bool)>&& completionHandler)
>+{
>+    if (!m_uiDelegate.m_delegateMethods.webViewRequestStorageAccessPanelForTopPrivatelyControlledDomainUnderFirstPartyTopPrivatelyControlledDomainCompletionHandler) {
>+        completionHandler(true);
>+        return;
>+    }
>+
>+    auto delegate = m_uiDelegate.m_delegate.get();
>+    if (!delegate) {
>+        completionHandler(true);
>+        return;
>+    }
>+    
>+    auto checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(_webView:requestStorageAccessPanelForDomain:underCurrentDomain:completionHandler:));
>+    [(id <WKUIDelegatePrivate>)delegate _webView:m_uiDelegate.m_webView requestStorageAccessPanelForDomain:requestingDomain underCurrentDomain:currentDomain completionHandler:BlockPtr<void(BOOL)>::fromCallable([completionHandler = WTFMove(completionHandler), checker = WTFMove(checker)](BOOL result) {
>+        if (checker->completionHandlerHasBeenCalled())
>+            return;
>+        completionHandler(result);
>+        checker->didCallCompletionHandler();
>+    }).get()];
>+}
>+
> void UIDelegate::UIClient::decidePolicyForGeolocationPermissionRequest(WebKit::WebPageProxy&, WebKit::WebFrameProxy& frame, API::SecurityOrigin& securityOrigin, Function<void(bool)>& completionHandler)
> {
>     if (!m_uiDelegate.m_delegateMethods.webViewRequestGeolocationPermissionForFrameDecisionHandler)
>Index: Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
>===================================================================
>--- Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp	(revision 231438)
>+++ Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp	(working copy)
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2010-2017 Apple Inc. All rights reserved.
>+ * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
>  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
>  *
>  * Redistribution and use in source and binary forms, with or without
>@@ -1289,9 +1289,14 @@ void WebChromeClient::hasStorageAccess(S
>     m_page.hasStorageAccess(WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, pageID, WTFMove(callback));
> }
> 
>-void WebChromeClient::requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void (bool)>&& callback)
>+void WebChromeClient::requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& completionHandler)
> {
>-    m_page.requestStorageAccess(WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, pageID, WTFMove(callback));
>+    m_page.requestStorageAccess(WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, pageID, WTFMove(completionHandler));
>+}
>+
>+void WebChromeClient::didRequestStorageAccessConfirmation(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& completionHandler)
>+{
>+    m_page.didRequestStorageAccessConfirmation(WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, pageID, WTFMove(completionHandler));
> }
> #endif
> 
>Index: Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h
>===================================================================
>--- Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h	(revision 231438)
>+++ Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h	(working copy)
>@@ -352,8 +352,9 @@ private:
>     void didInvalidateDocumentMarkerRects() final;
> 
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>-    void hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void (bool)>&&) final;
>-    void requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void (bool)>&&) final;
>+    void hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&) final;
>+    void requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&) final;
>+    void didRequestStorageAccessConfirmation(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&) final;
> #endif
> 
>     String m_cachedToolTip;
>Index: Source/WebKit/WebProcess/WebPage/WebPage.cpp
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/WebPage.cpp	(revision 231438)
>+++ Source/WebKit/WebProcess/WebPage/WebPage.cpp	(working copy)
>@@ -3614,6 +3614,28 @@ void WebPage::didReceiveNotificationPerm
>     notificationPermissionRequestManager()->didReceiveNotificationPermissionDecision(notificationID, allowed);
> }
> 
>+void WebPage::didRequestStorageAccessConfirmation(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& completionHandler)
>+{
>+    if (!RuntimeEnabledFeatures::sharedFeatures().storageAccessPromptsEnabled())
>+        return completionHandler(true);
>+
>+    static uint64_t currentHandlerIdentifier = 0;
>+    uint64_t identifier = ++currentHandlerIdentifier;
>+    
>+    ASSERT(!m_requestStorageAccessCallbacks.contains(identifier));
>+    m_requestStorageAccessCallbacks.set(identifier, WTFMove(completionHandler));
>+    
>+    send(Messages::WebPageProxy::RequestStorageAccessConfirm(frameID, subFrameHost, topFrameHost, identifier));
>+}
>+
>+void WebPage::didReceiveStorageAccessConfirmation(uint64_t callbackIdentifier, bool confirmedAccess)
>+{
>+    if (auto completionHandler = m_requestStorageAccessCallbacks.take(callbackIdentifier))
>+        completionHandler(confirmedAccess);
>+    else
>+        ASSERT_NOT_REACHED();
>+}
>+
> #if ENABLE(MEDIA_STREAM)
> 
> #if !PLATFORM(IOS)
>Index: Source/WebKit/WebProcess/WebPage/WebPage.h
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/WebPage.h	(revision 231438)
>+++ Source/WebKit/WebProcess/WebPage/WebPage.h	(working copy)
>@@ -1052,10 +1052,12 @@ public:
>     void flushPendingEditorStateUpdate();
> 
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>-    void hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void (bool)>&& callback);
>-    void requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void (bool)>&& callback);
>+    void hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& callback);
>+    void requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&);
>     void storageAccessResponse(bool wasGranted, uint64_t contextId);
> #endif
>+    void didRequestStorageAccessConfirmation(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&);
>+    void didReceiveStorageAccessConfirmation(uint64_t callbackIdentifier, bool didConfirm);
> 
> #if ENABLE(ATTACHMENT_ELEMENT)
>     void insertAttachment(const String& identifier, const WebCore::AttachmentDisplayOptions&, const String& filename, std::optional<String> contentType, const IPC::DataReference&, CallbackID);
>@@ -1707,7 +1709,8 @@ private:
>     HashMap<String, RefPtr<WebURLSchemeHandlerProxy>> m_schemeToURLSchemeHandlerProxyMap;
>     HashMap<uint64_t, WebURLSchemeHandlerProxy*> m_identifierToURLSchemeHandlerProxyMap;
> 
>-    HashMap<uint64_t, WTF::Function<void (bool granted)>> m_storageAccessResponseCallbackMap;
>+    HashMap<uint64_t, Function<void(bool)>> m_storageAccessResponseCallbackMap;
>+    HashMap<uint64_t, CompletionHandler<void(bool)>> m_requestStorageAccessCallbacks;
> 
> #if ENABLE(APPLICATION_MANIFEST)
>     HashMap<uint64_t, uint64_t> m_applicationManifestFetchCallbackMap;
>Index: Source/WebKit/WebProcess/WebPage/WebPage.messages.in
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/WebPage.messages.in	(revision 231438)
>+++ Source/WebKit/WebProcess/WebPage/WebPage.messages.in	(working copy)
>@@ -327,6 +327,8 @@ messages -> WebPage LegacyReceiver {
>     # Notification
>     DidReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed)
> 
>+    DidReceiveStorageAccessConfirmation(uint64_t callbackIdentifier, bool didConfirm)
>+
>     # Printing.
>     BeginPrinting(uint64_t frameID, struct WebKit::PrintInfo printInfo)
>     EndPrinting()

Actions: View | Formatted Diff | Diff

Attachments on bug 185335: 339616 | 339651 | 339652 | 339655 | 339659 | 339693 | 339697 | 339700 | 339735 | 339742 | 339745 | 339755 | 339766