⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 242738 in webkit


Ignore:
Timestamp:
Mar 11, 2019, 2:19:11 PM (7 years ago)
Author:
Brent Fulgham
Message:

Remove obsolete runtime flag for StorageAccess API Prompt
​https://bugs.webkit.org/show_bug.cgi?id=195564
<rdar://problem/37279014>

Reviewed by Chris Dumez.

This bug tracks the work of removing the obsolete flag that had been used to optionally
prevent display of the StorageAccess API prompt. We have since shipped the final version
of this feature with an always-on prompt, and should have removed this runtime flag.

No test changes because this has no change in behavior. Tests already assume the prompt
behavior, and did not test turning the flag off.

Source/WebCore:

  • page/RuntimeEnabledFeatures.h:

(WebCore::RuntimeEnabledFeatures::setStorageAccessPromptsEnabled): Deleted.
(WebCore::RuntimeEnabledFeatures::storageAccessPromptsEnabled const): Deleted.

  • testing/InternalSettings.cpp:

(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setStorageAccessPromptsEnabled): Deleted.

  • testing/InternalSettings.h:

(): Deleted.

  • testing/InternalSettings.idl:

Source/WebKit:

  • NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:

(WebKit::ResourceLoadStatisticsDatabaseStore::requestStorageAccess):
(WebKit::ResourceLoadStatisticsDatabaseStore::grantStorageAccessInternal):

  • NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h:
  • NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:

(WebKit::ResourceLoadStatisticsMemoryStore::requestStorageAccess):
(WebKit::ResourceLoadStatisticsMemoryStore::grantStorageAccessInternal):

  • NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.h:
  • NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:

(WebKit::ResourceLoadStatisticsStore::debugModeEnabled const):
(WebKit::ResourceLoadStatisticsStore::storageAccessPromptsEnabled const): Deleted.
(WebKit::ResourceLoadStatisticsStore::setStorageAccessPromptsEnabled): Deleted.

  • NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:

(WebKit::WebResourceLoadStatisticsStore::requestStorageAccessGranted):
(WebKit::WebResourceLoadStatisticsStore::requestStorageAccess):

  • NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h:
  • NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::NetworkConnectionToWebProcess::requestStorageAccess):

  • NetworkProcess/NetworkConnectionToWebProcess.h:
  • NetworkProcess/NetworkConnectionToWebProcess.messages.in:
  • NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::requestStorageAccess):
(WebKit::NetworkProcess::requestStorageAccessGranted):

  • NetworkProcess/NetworkProcess.h:
  • NetworkProcess/NetworkProcess.messages.in:
  • Shared/WebPreferences.yaml:
  • UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetStorageAccessPromptsEnabled): Deleted.
(WKPreferencesGetStorageAccessPromptsEnabled): Deleted.

  • UIProcess/API/C/WKPreferencesRef.h:
  • UIProcess/API/Cocoa/WKPreferences.mm:

(-[WKPreferences _storageAccessPromptsEnabled]): Deleted.
(-[WKPreferences _setStorageAccessPromptsEnabled:]): Deleted.

  • UIProcess/API/Cocoa/WKPreferencesPrivate.h:
  • UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::requestStorageAccess):

  • UIProcess/Network/NetworkProcessProxy.h:
  • UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::requestStorageAccess):

  • UIProcess/WebsiteData/WebsiteDataStore.h:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::requestStorageAccess):

Location:
trunk/Source
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r242734 r242738  
     12019-03-11  Brent Fulgham  <bfulgham@apple.com>
     2
     3        Remove obsolete runtime flag for StorageAccess API Prompt
     4        https://bugs.webkit.org/show_bug.cgi?id=195564
     5        <rdar://problem/37279014>
     6
     7        Reviewed by Chris Dumez.
     8
     9        This bug tracks the work of removing the obsolete flag that had been used to optionally
     10        prevent display of the StorageAccess API prompt. We have since shipped the final version
     11        of this feature with an always-on prompt, and should have removed this runtime flag.
     12
     13        No test changes because this has no change in behavior. Tests already assume the prompt
     14        behavior, and did not test turning the flag off.
     15
     16        * page/RuntimeEnabledFeatures.h:
     17        (WebCore::RuntimeEnabledFeatures::setStorageAccessPromptsEnabled): Deleted.
     18        (WebCore::RuntimeEnabledFeatures::storageAccessPromptsEnabled const): Deleted.
     19        * testing/InternalSettings.cpp:
     20        (WebCore::InternalSettings::Backup::Backup):
     21        (WebCore::InternalSettings::Backup::restoreTo):
     22        (WebCore::InternalSettings::setStorageAccessPromptsEnabled): Deleted.
     23        * testing/InternalSettings.h:
     24        (): Deleted.
     25        * testing/InternalSettings.idl:
     26
    1272019-03-11  Eric Carlson  <eric.carlson@apple.com>
    228

  • trunk/Source/WebCore/page/RuntimeEnabledFeatures.h

    r242609 r242738  
    160160    void setWebGLCompressedTextureASTCSupportEnabled(bool isEnabled) { m_isWebGLCompressedTextureASTCSupportEnabled = isEnabled; }
    161161    bool webGLCompressedTextureASTCSupportEnabled() const { return m_isWebGLCompressedTextureASTCSupportEnabled; }
    162 
    163     void setStorageAccessPromptsEnabled(bool isEnabled)  { m_promptForStorageAccessAPIEnabled = isEnabled; }
    164     bool storageAccessPromptsEnabled() const { return m_promptForStorageAccessAPIEnabled; }
    165162
    166163    void setServerTimingEnabled(bool isEnabled) { m_isServerTimingEnabled = isEnabled; }
    … …  
    400397    bool m_crossOriginResourcePolicyEnabled { true };
    401398    bool m_isWebGLCompressedTextureASTCSupportEnabled { false };
    402     bool m_promptForStorageAccessAPIEnabled { false };
    403399    bool m_isServerTimingEnabled { false };
    404400    bool m_experimentalPlugInSandboxProfilesEnabled { false };

  • trunk/Source/WebCore/testing/InternalSettings.cpp

    r240644 r242738  
    124124#endif
    125125    , m_customPasteboardDataEnabled(RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled())
    126     , m_promptForStorageAccessAPIEnabled(RuntimeEnabledFeatures::sharedFeatures().storageAccessPromptsEnabled())
    127126{
    128127}
    … …  
    229228    DeprecatedGlobalSettings::setShouldManageAudioSessionCategory(m_shouldManageAudioSessionCategory);
    230229#endif
    231 
    232     RuntimeEnabledFeatures::sharedFeatures().setStorageAccessPromptsEnabled(m_promptForStorageAccessAPIEnabled);
    233230}
    234231
    … …  
    791788}
    792789
    793 void InternalSettings::setStorageAccessPromptsEnabled(bool enabled)
    794 {
    795     RuntimeEnabledFeatures::sharedFeatures().setStorageAccessPromptsEnabled(enabled);
    796 }
    797    
    798790ExceptionOr<String> InternalSettings::userInterfaceDirectionPolicy()
    799791{

  • trunk/Source/WebCore/testing/InternalSettings.h

    r237156 r242738  
    130130    static bool webAnimationsCSSIntegrationEnabled();
    131131
    132     static void setStorageAccessPromptsEnabled(bool);
    133 
    134132private:
    135133    explicit InternalSettings(Page*);
    … …  
    220218#endif
    221219        bool m_customPasteboardDataEnabled;
    222         bool m_promptForStorageAccessAPIEnabled { false };
    223220    };
    224221

  • trunk/Source/WebCore/testing/InternalSettings.idl

    r237156 r242738  
    9595    void setWebVREnabled(boolean enabled);
    9696    void setScreenCaptureEnabled(boolean enabled);
    97     void setStorageAccessPromptsEnabled(boolean enabled);
    9897
    9998    [MayThrowException] DOMString userInterfaceDirectionPolicy();

  • trunk/Source/WebKit/ChangeLog

    r242735 r242738  
     12019-03-11  Brent Fulgham  <bfulgham@apple.com>
     2
     3        Remove obsolete runtime flag for StorageAccess API Prompt
     4        https://bugs.webkit.org/show_bug.cgi?id=195564
     5        <rdar://problem/37279014>
     6
     7        Reviewed by Chris Dumez.
     8
     9        This bug tracks the work of removing the obsolete flag that had been used to optionally
     10        prevent display of the StorageAccess API prompt. We have since shipped the final version
     11        of this feature with an always-on prompt, and should have removed this runtime flag.
     12
     13        No test changes because this has no change in behavior. Tests already assume the prompt
     14        behavior, and did not test turning the flag off.
     15
     16        * NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:
     17        (WebKit::ResourceLoadStatisticsDatabaseStore::requestStorageAccess):
     18        (WebKit::ResourceLoadStatisticsDatabaseStore::grantStorageAccessInternal):
     19        * NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h:
     20        * NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:
     21        (WebKit::ResourceLoadStatisticsMemoryStore::requestStorageAccess):
     22        (WebKit::ResourceLoadStatisticsMemoryStore::grantStorageAccessInternal):
     23        * NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.h:
     24        * NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
     25        (WebKit::ResourceLoadStatisticsStore::debugModeEnabled const):
     26        (WebKit::ResourceLoadStatisticsStore::storageAccessPromptsEnabled const): Deleted.
     27        (WebKit::ResourceLoadStatisticsStore::setStorageAccessPromptsEnabled): Deleted.
     28        * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
     29        (WebKit::WebResourceLoadStatisticsStore::requestStorageAccessGranted):
     30        (WebKit::WebResourceLoadStatisticsStore::requestStorageAccess):
     31        * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h:
     32        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
     33        (WebKit::NetworkConnectionToWebProcess::requestStorageAccess):
     34        * NetworkProcess/NetworkConnectionToWebProcess.h:
     35        * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
     36        * NetworkProcess/NetworkProcess.cpp:
     37        (WebKit::NetworkProcess::requestStorageAccess):
     38        (WebKit::NetworkProcess::requestStorageAccessGranted):
     39        * NetworkProcess/NetworkProcess.h:
     40        * NetworkProcess/NetworkProcess.messages.in:
     41        * Shared/WebPreferences.yaml:
     42        * UIProcess/API/C/WKPreferences.cpp:
     43        (WKPreferencesSetStorageAccessPromptsEnabled): Deleted.
     44        (WKPreferencesGetStorageAccessPromptsEnabled): Deleted.
     45        * UIProcess/API/C/WKPreferencesRef.h:
     46        * UIProcess/API/Cocoa/WKPreferences.mm:
     47        (-[WKPreferences _storageAccessPromptsEnabled]): Deleted.
     48        (-[WKPreferences _setStorageAccessPromptsEnabled:]): Deleted.
     49        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
     50        * UIProcess/Network/NetworkProcessProxy.cpp:
     51        (WebKit::NetworkProcessProxy::requestStorageAccess):
     52        * UIProcess/Network/NetworkProcessProxy.h:
     53        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
     54        (WebKit::WebsiteDataStore::requestStorageAccess):
     55        * UIProcess/WebsiteData/WebsiteDataStore.h:
     56        * WebProcess/WebPage/WebPage.cpp:
     57        (WebKit::WebPage::requestStorageAccess):
     58
    1592019-03-11  Alex Christensen  <achristensen@webkit.org>
    260

  • trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp

    r242712 r242738  
    746746}
    747747
    748 void ResourceLoadStatisticsDatabaseStore::requestStorageAccess(SubFrameDomain&& subFrameDomain, TopFrameDomain&& topFrameDomain, FrameID frameID, PageID pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
     748void ResourceLoadStatisticsDatabaseStore::requestStorageAccess(SubFrameDomain&& subFrameDomain, TopFrameDomain&& topFrameDomain, FrameID frameID, PageID pageID, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
    749749{
    750750    ASSERT(!RunLoop::isMain());
    … …  
    772772    };
    773773
    774     auto userWasPromptedEarlier = promptEnabled && hasUserGrantedStorageAccessThroughPrompt(subFrameStatus.second, topFrameDomain);
    775     if (promptEnabled && !userWasPromptedEarlier) {
     774    auto userWasPromptedEarlier = hasUserGrantedStorageAccessThroughPrompt(subFrameStatus.second, topFrameDomain);
     775    if (!userWasPromptedEarlier) {
    776776#if !RELEASE_LOG_DISABLED
    777777        RELEASE_LOG_INFO_IF(debugLoggingEnabled(), ResourceLoadStatisticsDebug, "About to ask the user whether they want to grant storage access to %{public}s under %{public}s or not.", subFrameDomain.string().utf8().data(), topFrameDomain.string().utf8().data());
    … …  
    840840    }
    841841
    842     // FIXME: Remove m_storageAccessPromptsEnabled check if prompting is no longer experimental.
    843     if (userWasPromptedNowOrEarlier && storageAccessPromptsEnabled()) {
     842    if (userWasPromptedNowOrEarlier) {
    844843#ifndef NDEBUG
    845844        auto subFrameStatus = ensureResourceStatisticsForRegistrableDomain(subFrameDomain);

  • trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h

    r242712 r242738  
    9292
    9393    void hasStorageAccess(const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(bool)>&&) override;
    94     void requestStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&) override;
     94    void requestStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, CompletionHandler<void(StorageAccessStatus)>&&) override;
    9595    void grantStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, bool userWasPromptedNow, CompletionHandler<void(bool)>&&) override;
    9696

  • trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp

    r242712 r242738  
    226226}
    227227
    228 void ResourceLoadStatisticsMemoryStore::requestStorageAccess(SubFrameDomain&& subFrameDomain, TopFrameDomain&& topFrameDomain, FrameID frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
     228void ResourceLoadStatisticsMemoryStore::requestStorageAccess(SubFrameDomain&& subFrameDomain, TopFrameDomain&& topFrameDomain, FrameID frameID, uint64_t pageID, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
    229229{
    230230    ASSERT(!RunLoop::isMain());
    … …  
    247247    }
    248248
    249     auto userWasPromptedEarlier = promptEnabled && hasUserGrantedStorageAccessThroughPrompt(subFrameStatistic, topFrameDomain);
    250     if (promptEnabled && !userWasPromptedEarlier) {
     249    auto userWasPromptedEarlier = hasUserGrantedStorageAccessThroughPrompt(subFrameStatistic, topFrameDomain);
     250    if (!userWasPromptedEarlier) {
    251251#if !RELEASE_LOG_DISABLED
    252252        RELEASE_LOG_INFO_IF(debugLoggingEnabled(), ResourceLoadStatisticsDebug, "About to ask the user whether they want to grant storage access to %{public}s under %{public}s or not.", subFrameDomain.string().utf8().data(), topFrameDomain.string().utf8().data());
    … …  
    254254        completionHandler(StorageAccessStatus::RequiresUserPrompt);
    255255        return;
    256     } else if (userWasPromptedEarlier) {
     256    }
     257
    257258#if !RELEASE_LOG_DISABLED
     259    if (userWasPromptedEarlier)
    258260        RELEASE_LOG_INFO_IF(debugLoggingEnabled(), ResourceLoadStatisticsDebug, "Storage access was granted to %{public}s under %{public}s.", subFrameDomain.string().utf8().data(), topFrameDomain.string().utf8().data());
    259261#endif
    260     }
    261262
    262263    subFrameStatistic.timesAccessedAsFirstPartyDueToStorageAccessAPI++;
    … …  
    309310    }
    310311
    311     // FIXME: Remove m_storageAccessPromptsEnabled check if prompting is no longer experimental.
    312     if (userWasPromptedNowOrEarlier && storageAccessPromptsEnabled()) {
     312    if (userWasPromptedNowOrEarlier) {
    313313        auto& subFrameStatistic = ensureResourceStatisticsForRegistrableDomain(subFrameDomain);
    314314        ASSERT(subFrameStatistic.hadUserInteraction);

  • trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.h

    r242712 r242738  
    9797
    9898    void hasStorageAccess(const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(bool)>&&) override;
    99     void requestStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&) override;
     99    void requestStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, CompletionHandler<void(StorageAccessStatus)>&&) override;
    100100    void grantStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, bool userWasPromptedNow, CompletionHandler<void(bool)>&&) override;
    101101

  • trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h

    r242712 r242738  
    159159
    160160    virtual void hasStorageAccess(const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(bool)>&&) = 0;
    161     virtual void requestStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&) = 0;
     161    virtual void requestStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, CompletionHandler<void(StorageAccessStatus)>&&) = 0;
    162162    virtual void grantStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, bool userWasPromptedNow, CompletionHandler<void(bool)>&&) = 0;
    163163
    … …  
    232232    bool debugLoggingEnabled() const { return m_debugLoggingEnabled; };
    233233    bool debugModeEnabled() const { return m_debugModeEnabled; }
    234     bool storageAccessPromptsEnabled() const { return m_storageAccessPromptsEnabled; }
    235234
    236235    static constexpr unsigned maxNumberOfRecursiveCallsInRedirectTraceBack { 50 };
    237236
    238237private:
    239     void setStorageAccessPromptsEnabled(bool enabled) { m_storageAccessPromptsEnabled  = enabled; }
    240238    bool shouldRemoveDataRecords() const;
    241239    void setDebugLogggingEnabled(bool enabled) { m_debugLoggingEnabled  = enabled; }
    … …  
    267265    bool m_debugLoggingEnabled { false };
    268266    bool m_debugModeEnabled { false };
    269     bool m_storageAccessPromptsEnabled { false };
    270267    bool m_dataRecordsBeingRemoved { false };
    271268    ShouldIncludeLocalhost m_shouldIncludeLocalhost { ShouldIncludeLocalhost::Yes };

  • trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp

    r242712 r242738  
    321321}
    322322
    323 void WebResourceLoadStatisticsStore::requestStorageAccessGranted(const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(bool)>&& completionHandler)
    324 {
    325     auto statusHandler = [this, protectedThis = makeRef(*this), subFrameDomain = subFrameDomain.isolatedCopy(), topFrameDomain = topFrameDomain.isolatedCopy(), promptEnabled, frameID, pageID, completionHandler = WTFMove(completionHandler)](StorageAccessStatus status) mutable {
     323void WebResourceLoadStatisticsStore::requestStorageAccessGranted(const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& completionHandler)
     324{
     325    auto statusHandler = [this, protectedThis = makeRef(*this), subFrameDomain = subFrameDomain.isolatedCopy(), topFrameDomain = topFrameDomain.isolatedCopy(), frameID, pageID, completionHandler = WTFMove(completionHandler)](StorageAccessStatus status) mutable {
    326326        switch (status) {
    327327        case StorageAccessStatus::CannotRequestAccess:
    … …  
    330330        case StorageAccessStatus::RequiresUserPrompt:
    331331            {
    332             ASSERT_UNUSED(promptEnabled, promptEnabled);
    333332            CompletionHandler<void(bool)> requestConfirmationCompletionHandler = [this, protectedThis = protectedThis.copyRef(), subFrameDomain, topFrameDomain, frameID, pageID, completionHandler = WTFMove(completionHandler)] (bool userDidGrantAccess) mutable {
    334333                if (userDidGrantAccess)
    … …  
    346345    };
    347346
    348     requestStorageAccess(subFrameDomain, topFrameDomain, frameID, pageID, promptEnabled, WTFMove(statusHandler));
    349 }
    350 
    351 void WebResourceLoadStatisticsStore::requestStorageAccess(const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
     347    requestStorageAccess(subFrameDomain, topFrameDomain, frameID, pageID, WTFMove(statusHandler));
     348}
     349
     350void WebResourceLoadStatisticsStore::requestStorageAccess(const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
    352351{
    353352    if (subFrameDomain == topFrameDomain) {
    … …  
    356355    }
    357356
    358     postTask([this, subFrameDomain = subFrameDomain.isolatedCopy(), topFrameDomain = topFrameDomain.isolatedCopy(), frameID, pageID, promptEnabled, completionHandler = WTFMove(completionHandler)]() mutable {
     357    postTask([this, subFrameDomain = subFrameDomain.isolatedCopy(), topFrameDomain = topFrameDomain.isolatedCopy(), frameID, pageID, completionHandler = WTFMove(completionHandler)]() mutable {
    359358        if (!m_statisticsStore) {
    360359            postTaskReply([completionHandler = WTFMove(completionHandler)]() mutable {
    … …  
    365364
    366365        if (m_statisticsStore) {
    367             m_statisticsStore->requestStorageAccess(WTFMove(subFrameDomain), WTFMove(topFrameDomain), frameID.value(), pageID, promptEnabled, [completionHandler = WTFMove(completionHandler)](StorageAccessStatus status) mutable {
     366            m_statisticsStore->requestStorageAccess(WTFMove(subFrameDomain), WTFMove(topFrameDomain), frameID.value(), pageID, [completionHandler = WTFMove(completionHandler)](StorageAccessStatus status) mutable {
    368367                postTaskReply([completionHandler = WTFMove(completionHandler), status]() mutable {
    369368                    completionHandler(status);

  • trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h

    r242712 r242738  
    113113    void hasStorageAccess(const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(bool)>&& callback);
    114114    bool hasStorageAccessForFrame(const SubFrameDomain&, const TopFrameDomain&, FrameID, PageID);
    115     void requestStorageAccess(const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&);
    116     void requestStorageAccessGranted(const SubFrameDomain&, const TopFrameDomain&, FrameID, PageID, bool promptEnabled, CompletionHandler<void(bool)>&&);
     115    void requestStorageAccess(const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(StorageAccessStatus)>&&);
     116    void requestStorageAccessGranted(const SubFrameDomain&, const TopFrameDomain&, FrameID, PageID, CompletionHandler<void(bool)>&&);
    117117    void requestUpdate();
    118118    void setLastSeen(const RegistrableDomain&, Seconds, CompletionHandler<void()>&&);

  • trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp

    r242503 r242738  
    646646}
    647647
    648 void NetworkConnectionToWebProcess::requestStorageAccess(PAL::SessionID sessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(bool)>&& completionHandler)
    649 {
    650     networkProcess().requestStorageAccessGranted(sessionID, subFrameDomain, topFrameDomain, frameID, pageID, promptEnabled, WTFMove(completionHandler));
     648void NetworkConnectionToWebProcess::requestStorageAccess(PAL::SessionID sessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& completionHandler)
     649{
     650    networkProcess().requestStorageAccessGranted(sessionID, subFrameDomain, topFrameDomain, frameID, pageID, WTFMove(completionHandler));
    651651}
    652652#endif

  • trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h

    r242288 r242738  
    209209    void requestResourceLoadStatisticsUpdate();
    210210    void hasStorageAccess(PAL::SessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&);
    211     void requestStorageAccess(PAL::SessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, bool prompt, CompletionHandler<void(bool)>&&);
     211    void requestStorageAccess(PAL::SessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&);
    212212#endif
    213213

  • trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in

    r242288 r242738  
    6565    RequestResourceLoadStatisticsUpdate();
    6666    HasStorageAccess(PAL::SessionID sessionID, WebCore::RegistrableDomain subFrameDomain, WebCore::RegistrableDomain topFrameDomain, uint64_t frameID, uint64_t pageID) -> (bool hasStorageAccess) Async
    67     RequestStorageAccess(PAL::SessionID sessionID, WebCore::RegistrableDomain subFrameDomain, WebCore::RegistrableDomain topFrameDomain, uint64_t frameID, uint64_t pageID, bool prompt) -> (bool accessGranted) Async
     67    RequestStorageAccess(PAL::SessionID sessionID, WebCore::RegistrableDomain subFrameDomain, WebCore::RegistrableDomain topFrameDomain, uint64_t frameID, uint64_t pageID) -> (bool accessGranted) Async
    6868#endif
    6969

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

    r242712 r242738  
    978978}
    979979
    980 void NetworkProcess::requestStorageAccess(PAL::SessionID sessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
    981 {
    982     if (auto* networkSession = this->networkSession(sessionID)) {
    983         if (auto* resourceLoadStatistics = networkSession->resourceLoadStatistics())
    984             resourceLoadStatistics->requestStorageAccess(subFrameDomain, topFrameDomain, frameID.value(), pageID, promptEnabled, WTFMove(completionHandler));
     980void NetworkProcess::requestStorageAccess(PAL::SessionID sessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
     981{
     982    if (auto* networkSession = this->networkSession(sessionID)) {
     983        if (auto* resourceLoadStatistics = networkSession->resourceLoadStatistics())
     984            resourceLoadStatistics->requestStorageAccess(subFrameDomain, topFrameDomain, frameID.value(), pageID, WTFMove(completionHandler));
    985985        else
    986986            completionHandler(StorageAccessStatus::CannotRequestAccess);
    … …  
    991991}
    992992
    993 void NetworkProcess::requestStorageAccessGranted(PAL::SessionID sessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(bool)>&& completionHandler)
    994 {
    995     if (auto* networkSession = this->networkSession(sessionID)) {
    996         if (auto* resourceLoadStatistics = networkSession->resourceLoadStatistics())
    997             resourceLoadStatistics->requestStorageAccessGranted(subFrameDomain, topFrameDomain, frameID, pageID, promptEnabled, WTFMove(completionHandler));
     993void NetworkProcess::requestStorageAccessGranted(PAL::SessionID sessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& completionHandler)
     994{
     995    if (auto* networkSession = this->networkSession(sessionID)) {
     996        if (auto* resourceLoadStatistics = networkSession->resourceLoadStatistics())
     997            resourceLoadStatistics->requestStorageAccessGranted(subFrameDomain, topFrameDomain, frameID, pageID, WTFMove(completionHandler));
    998998        else
    999999            completionHandler(false);

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

    r242712 r242738  
    232232    void removeAllStorageAccess(PAL::SessionID, CompletionHandler<void()>&&);
    233233    void removePrevalentDomains(PAL::SessionID, const Vector<RegistrableDomain>&);
    234     void requestStorageAccess(PAL::SessionID, const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&);
    235     void requestStorageAccessGranted(PAL::SessionID, const SubFrameDomain&, const TopFrameDomain&, FrameID, PageID, bool promptEnabled, CompletionHandler<void(bool)>&&);
     234    void requestStorageAccess(PAL::SessionID, const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(StorageAccessStatus)>&&);
     235    void requestStorageAccessGranted(PAL::SessionID, const SubFrameDomain&, const TopFrameDomain&, FrameID, PageID, CompletionHandler<void(bool)>&&);
    236236    void resetCacheMaxAgeCapForPrevalentResources(PAL::SessionID, CompletionHandler<void()>&&);
    237237    void resetParametersToDefaultValues(PAL::SessionID, CompletionHandler<void()>&&);

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in

    r242712 r242738  
    108108    RemoveAllStorageAccess(PAL::SessionID sessionID) -> () Async
    109109    RemovePrevalentDomains(PAL::SessionID sessionID, Vector<WebCore::RegistrableDomain> domainsWithInteraction)
    110     RequestStorageAccess(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain, WebCore::RegistrableDomain topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID, bool promptEnabled) -> (enum:uint8_t WebKit::StorageAccessStatus storageAccessStatus) Async
     110    RequestStorageAccess(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain, WebCore::RegistrableDomain topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID) -> (enum:uint8_t WebKit::StorageAccessStatus storageAccessStatus) Async
    111111    ResetParametersToDefaultValues(PAL::SessionID sessionID) -> () Async
    112112    ScheduleClearInMemoryAndPersistent(PAL::SessionID sessionID, Optional<WallTime> modifiedSince, enum:bool WebKit::ShouldGrandfatherStatistics shouldGrandfather) -> () Async

  • trunk/Source/WebKit/Shared/WebPreferences.yaml

    r242664 r242738  
    11631163  defaultValue: true
    11641164
    1165 StorageAccessPromptsEnabled:
    1166   type: bool
    1167   defaultValue: true
    1168   webcoreBinding: RuntimeEnabledFeatures
    1169 
    11701165LinkPreloadEnabled:
    11711166  type: bool

  • trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp

    r242621 r242738  
    209209}
    210210
    211 void WKPreferencesSetStorageAccessPromptsEnabled(WKPreferencesRef preferencesRef, bool enabled)
    212 {
    213     toImpl(preferencesRef)->setStorageAccessPromptsEnabled(enabled);
    214 }
    215 
    216 bool WKPreferencesGetStorageAccessPromptsEnabled(WKPreferencesRef preferencesRef)
    217 {
    218     return toImpl(preferencesRef)->storageAccessPromptsEnabled();
    219 }
    220 
    221211void WKPreferencesSetHyperlinkAuditingEnabled(WKPreferencesRef preferencesRef, bool hyperlinkAuditingEnabled)
    222212{

  • trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h

    r238909 r242738  
    109109WK_EXPORT bool WKPreferencesGetJavaScriptCanOpenWindowsAutomatically(WKPreferencesRef preferences);
    110110
    111 // Defaults to false.
    112 WK_EXPORT void WKPreferencesSetStorageAccessPromptsEnabled(WKPreferencesRef preferencesRef, bool enabled);
    113 WK_EXPORT bool WKPreferencesGetStorageAccessPromptsEnabled(WKPreferencesRef preferencesRef);
    114 
    115111// Defaults to true.
    116112WK_EXPORT void WKPreferencesSetHyperlinkAuditingEnabled(WKPreferencesRef preferences, bool hyperlinkAuditingEnabled);

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm

    r242621 r242738  
    129129}
    130130
    131 - (BOOL)_storageAccessPromptsEnabled
    132 {
    133     return _preferences->storageAccessPromptsEnabled();
    134 }
    135 
    136 - (void)_setStorageAccessPromptsEnabled:(BOOL)enabled
    137 {
    138     _preferences->setStorageAccessPromptsEnabled(enabled);
    139 }
    140 
    141131#pragma mark OS X-specific methods
    142132

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h

    r242621 r242738  
    145145@property (nonatomic, getter=_isSafeBrowsingEnabled, setter=_setSafeBrowsingEnabled:) BOOL _safeBrowsingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    146146
    147 @property (nonatomic, setter=_setStorageAccessPromptsEnabled:) BOOL _storageAccessPromptsEnabled WK_API_AVAILABLE(macosx(10.14), ios(12.0));
    148147@property (nonatomic, setter=_setColorFilterEnabled:) BOOL _colorFilterEnabled WK_API_AVAILABLE(macosx(10.14), ios(12.0));
    149148@property (nonatomic, setter=_setPunchOutWhiteBackgroundsInDarkMode:) BOOL _punchOutWhiteBackgroundsInDarkMode WK_API_AVAILABLE(macosx(10.14), ios(12.0));

  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

    r242712 r242738  
    735735}
    736736
    737 void NetworkProcessProxy::requestStorageAccess(PAL::SessionID sessionID, const RegistrableDomain& resourceDomain, const RegistrableDomain& topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
     737void NetworkProcessProxy::requestStorageAccess(PAL::SessionID sessionID, const RegistrableDomain& resourceDomain, const RegistrableDomain& topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
    738738{
    739739    if (!canSendMessage()) {
    … …  
    742742    }
    743743
    744     sendWithAsyncReply(Messages::NetworkProcess::RequestStorageAccess(sessionID, resourceDomain, topFrameDomain, frameID, pageID, promptEnabled), WTFMove(completionHandler));
     744    sendWithAsyncReply(Messages::NetworkProcess::RequestStorageAccess(sessionID, resourceDomain, topFrameDomain, frameID, pageID), WTFMove(completionHandler));
    745745}
    746746

  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h

    r242712 r242738  
    130130    void grantStorageAccess(PAL::SessionID, const RegistrableDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, bool userWasPrompted, CompletionHandler<void(bool)>&&);
    131131    void hasStorageAccess(PAL::SessionID, const RegistrableDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(bool)>&&);
    132     void requestStorageAccess(PAL::SessionID, const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&);
     132    void requestStorageAccess(PAL::SessionID, const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(StorageAccessStatus)>&&);
    133133    void requestStorageAccessConfirm(PageID, FrameID, const SubFrameDomain&, const TopFrameDomain&, CompletionHandler<void(bool)>&&);
    134134    void resetParametersToDefaultValues(PAL::SessionID, CompletionHandler<void()>&&);

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

    r242712 r242738  
    16541654}
    16551655
    1656 void WebsiteDataStore::requestStorageAccess(const String& subFrameHost, const String& topFrameHost, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
     1656void WebsiteDataStore::requestStorageAccess(const String& subFrameHost, const String& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
    16571657{
    16581658    if (!resourceLoadStatisticsEnabled()) {
    … …  
    16681668
    16691669    if (auto networkProcess = webPage->process().processPool().networkProcess())
    1670         networkProcess->requestStorageAccess(m_sessionID, RegistrableDomain::uncheckedCreateFromHost(subFrameHost), RegistrableDomain::uncheckedCreateFromHost(topFrameHost), frameID, pageID, promptEnabled, WTFMove(completionHandler));
     1670        networkProcess->requestStorageAccess(m_sessionID, RegistrableDomain::uncheckedCreateFromHost(subFrameHost), RegistrableDomain::uncheckedCreateFromHost(topFrameHost), frameID, pageID, WTFMove(completionHandler));
    16711671}
    16721672

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

    r242712 r242738  
    166166    void setVeryPrevalentResource(const URL&, CompletionHandler<void()>&&);
    167167    void hasStorageAccess(const String& subFrameHost, const String& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&);
    168     void requestStorageAccess(const String& subFrameHost, const String& topFrameHost, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&);
     168    void requestStorageAccess(const String& subFrameHost, const String& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(StorageAccessStatus)>&&);
    169169    void grantStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, bool userWasPrompted, CompletionHandler<void(bool)>&&);
    170170    void setSubframeUnderTopFrameDomain(const URL& subframe, const URL& topFrame);

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r242735 r242738  
    63376337void WebPage::requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, CompletionHandler<void(bool)>&& completionHandler)
    63386338{
    6339     bool promptEnabled = RuntimeEnabledFeatures::sharedFeatures().storageAccessPromptsEnabled();
    6340     WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::RequestStorageAccess(sessionID(), RegistrableDomain::uncheckedCreateFromHost(subFrameHost), RegistrableDomain::uncheckedCreateFromHost(topFrameHost), frameID, m_pageID, promptEnabled), WTFMove(completionHandler));
     6339    WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::RequestStorageAccess(sessionID(), RegistrableDomain::uncheckedCreateFromHost(subFrameHost), RegistrableDomain::uncheckedCreateFromHost(topFrameHost), frameID, m_pageID), WTFMove(completionHandler));
    63416340}
    63426341#endif
Note: See TracChangeset for help on using the changeset viewer.