Diff
Modified: trunk/Source/WebCore/ChangeLog (242737 => 242738)
--- trunk/Source/WebCore/ChangeLog 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebCore/ChangeLog 2019-03-11 21:19:11 UTC (rev 242738)
@@ -1,3 +1,29 @@
+2019-03-11 Brent Fulgham <[email protected]>
+
+ 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.
+
+ * 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:
+
2019-03-11 Eric Carlson <[email protected]>
Add web audio release logging
Modified: trunk/Source/WebCore/page/RuntimeEnabledFeatures.h (242737 => 242738)
--- trunk/Source/WebCore/page/RuntimeEnabledFeatures.h 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebCore/page/RuntimeEnabledFeatures.h 2019-03-11 21:19:11 UTC (rev 242738)
@@ -160,9 +160,6 @@
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; }
-
void setServerTimingEnabled(bool isEnabled) { m_isServerTimingEnabled = isEnabled; }
bool serverTimingEnabled() const { return m_isServerTimingEnabled; }
@@ -399,7 +396,6 @@
bool m_isRestrictedHTTPResponseAccess { true };
bool m_crossOriginResourcePolicyEnabled { true };
bool m_isWebGLCompressedTextureASTCSupportEnabled { false };
- bool m_promptForStorageAccessAPIEnabled { false };
bool m_isServerTimingEnabled { false };
bool m_experimentalPlugInSandboxProfilesEnabled { false };
bool m_disabledAdaptationsMetaTagEnabled { false };
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (242737 => 242738)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2019-03-11 21:19:11 UTC (rev 242738)
@@ -123,7 +123,6 @@
, m_shouldManageAudioSessionCategory(DeprecatedGlobalSettings::shouldManageAudioSessionCategory())
#endif
, m_customPasteboardDataEnabled(RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled())
- , m_promptForStorageAccessAPIEnabled(RuntimeEnabledFeatures::sharedFeatures().storageAccessPromptsEnabled())
{
}
@@ -228,8 +227,6 @@
#if USE(AUDIO_SESSION)
DeprecatedGlobalSettings::setShouldManageAudioSessionCategory(m_shouldManageAudioSessionCategory);
#endif
-
- RuntimeEnabledFeatures::sharedFeatures().setStorageAccessPromptsEnabled(m_promptForStorageAccessAPIEnabled);
}
class InternalSettingsWrapper : public Supplement<Page> {
@@ -790,11 +787,6 @@
#endif
}
-void InternalSettings::setStorageAccessPromptsEnabled(bool enabled)
-{
- RuntimeEnabledFeatures::sharedFeatures().setStorageAccessPromptsEnabled(enabled);
-}
-
ExceptionOr<String> InternalSettings::userInterfaceDirectionPolicy()
{
if (!m_page)
Modified: trunk/Source/WebCore/testing/InternalSettings.h (242737 => 242738)
--- trunk/Source/WebCore/testing/InternalSettings.h 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2019-03-11 21:19:11 UTC (rev 242738)
@@ -129,8 +129,6 @@
static bool webAnimationsCSSIntegrationEnabled();
- static void setStorageAccessPromptsEnabled(bool);
-
private:
explicit InternalSettings(Page*);
@@ -219,7 +217,6 @@
bool m_shouldManageAudioSessionCategory;
#endif
bool m_customPasteboardDataEnabled;
- bool m_promptForStorageAccessAPIEnabled { false };
};
Page* m_page;
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (242737 => 242738)
--- trunk/Source/WebCore/testing/InternalSettings.idl 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2019-03-11 21:19:11 UTC (rev 242738)
@@ -94,7 +94,6 @@
void setWebMetalEnabled(boolean enabled);
void setWebVREnabled(boolean enabled);
void setScreenCaptureEnabled(boolean enabled);
- void setStorageAccessPromptsEnabled(boolean enabled);
[MayThrowException] DOMString userInterfaceDirectionPolicy();
[MayThrowException] void setUserInterfaceDirectionPolicy(DOMString policy);
Modified: trunk/Source/WebKit/ChangeLog (242737 => 242738)
--- trunk/Source/WebKit/ChangeLog 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/ChangeLog 2019-03-11 21:19:11 UTC (rev 242738)
@@ -1,3 +1,61 @@
+2019-03-11 Brent Fulgham <[email protected]>
+
+ 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.
+
+ * 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):
+
2019-03-11 Alex Christensen <[email protected]>
Add a WKContentRuleList variant that uses copied memory instead of mmap'd shared memory for class A containerized apps
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp 2019-03-11 21:19:11 UTC (rev 242738)
@@ -745,7 +745,7 @@
});
}
-void ResourceLoadStatisticsDatabaseStore::requestStorageAccess(SubFrameDomain&& subFrameDomain, TopFrameDomain&& topFrameDomain, FrameID frameID, PageID pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
+void ResourceLoadStatisticsDatabaseStore::requestStorageAccess(SubFrameDomain&& subFrameDomain, TopFrameDomain&& topFrameDomain, FrameID frameID, PageID pageID, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
{
ASSERT(!RunLoop::isMain());
@@ -771,8 +771,8 @@
break;
};
- auto userWasPromptedEarlier = promptEnabled && hasUserGrantedStorageAccessThroughPrompt(subFrameStatus.second, topFrameDomain);
- if (promptEnabled && !userWasPromptedEarlier) {
+ auto userWasPromptedEarlier = hasUserGrantedStorageAccessThroughPrompt(subFrameStatus.second, topFrameDomain);
+ if (!userWasPromptedEarlier) {
#if !RELEASE_LOG_DISABLED
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());
#endif
@@ -839,8 +839,7 @@
return;
}
- // FIXME: Remove m_storageAccessPromptsEnabled check if prompting is no longer experimental.
- if (userWasPromptedNowOrEarlier && storageAccessPromptsEnabled()) {
+ if (userWasPromptedNowOrEarlier) {
#ifndef NDEBUG
auto subFrameStatus = ensureResourceStatisticsForRegistrableDomain(subFrameDomain);
ASSERT(subFrameStatus.first == AddedRecord::No);
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h 2019-03-11 21:19:11 UTC (rev 242738)
@@ -91,7 +91,7 @@
void calculateAndSubmitTelemetry() const override;
void hasStorageAccess(const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(bool)>&&) override;
- void requestStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&) override;
+ void requestStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, CompletionHandler<void(StorageAccessStatus)>&&) override;
void grantStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, bool userWasPromptedNow, CompletionHandler<void(bool)>&&) override;
void logFrameNavigation(const NavigatedToDomain&, const TopFrameDomain&, const NavigatedFromDomain&, bool isRedirect, bool isMainFrame) override;
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp 2019-03-11 21:19:11 UTC (rev 242738)
@@ -225,7 +225,7 @@
});
}
-void ResourceLoadStatisticsMemoryStore::requestStorageAccess(SubFrameDomain&& subFrameDomain, TopFrameDomain&& topFrameDomain, FrameID frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
+void ResourceLoadStatisticsMemoryStore::requestStorageAccess(SubFrameDomain&& subFrameDomain, TopFrameDomain&& topFrameDomain, FrameID frameID, uint64_t pageID, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
{
ASSERT(!RunLoop::isMain());
@@ -246,18 +246,19 @@
return;
}
- auto userWasPromptedEarlier = promptEnabled && hasUserGrantedStorageAccessThroughPrompt(subFrameStatistic, topFrameDomain);
- if (promptEnabled && !userWasPromptedEarlier) {
+ auto userWasPromptedEarlier = hasUserGrantedStorageAccessThroughPrompt(subFrameStatistic, topFrameDomain);
+ if (!userWasPromptedEarlier) {
#if !RELEASE_LOG_DISABLED
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());
#endif
completionHandler(StorageAccessStatus::RequiresUserPrompt);
return;
- } else if (userWasPromptedEarlier) {
+ }
+
#if !RELEASE_LOG_DISABLED
+ if (userWasPromptedEarlier)
RELEASE_LOG_INFO_IF(debugLoggingEnabled(), ResourceLoadStatisticsDebug, "Storage access was granted to %{public}s under %{public}s.", subFrameDomain.string().utf8().data(), topFrameDomain.string().utf8().data());
#endif
- }
subFrameStatistic.timesAccessedAsFirstPartyDueToStorageAccessAPI++;
@@ -308,8 +309,7 @@
return;
}
- // FIXME: Remove m_storageAccessPromptsEnabled check if prompting is no longer experimental.
- if (userWasPromptedNowOrEarlier && storageAccessPromptsEnabled()) {
+ if (userWasPromptedNowOrEarlier) {
auto& subFrameStatistic = ensureResourceStatisticsForRegistrableDomain(subFrameDomain);
ASSERT(subFrameStatistic.hadUserInteraction);
ASSERT(subFrameStatistic.storageAccessUnderTopFrameDomains.contains(topFrameDomain));
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.h (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.h 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.h 2019-03-11 21:19:11 UTC (rev 242738)
@@ -96,7 +96,7 @@
void calculateAndSubmitTelemetry() const override;
void hasStorageAccess(const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(bool)>&&) override;
- void requestStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&) override;
+ void requestStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, CompletionHandler<void(StorageAccessStatus)>&&) override;
void grantStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, bool userWasPromptedNow, CompletionHandler<void(bool)>&&) override;
void logFrameNavigation(const NavigatedToDomain&, const TopFrameDomain&, const NavigatedFromDomain&, bool isRedirect, bool isMainFrame) override;
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h 2019-03-11 21:19:11 UTC (rev 242738)
@@ -158,7 +158,7 @@
void setPrevalentResourceForDebugMode(const RegistrableDomain&);
virtual void hasStorageAccess(const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(bool)>&&) = 0;
- virtual void requestStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&) = 0;
+ virtual void requestStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, CompletionHandler<void(StorageAccessStatus)>&&) = 0;
virtual void grantStorageAccess(SubFrameDomain&&, TopFrameDomain&&, FrameID, PageID, bool userWasPromptedNow, CompletionHandler<void(bool)>&&) = 0;
virtual void logFrameNavigation(const NavigatedToDomain&, const TopFrameDomain&, const NavigatedFromDomain&, bool isRedirect, bool isMainFrame) = 0;
@@ -231,12 +231,10 @@
const RegistrableDomain& debugStaticPrevalentResource() const { return m_debugStaticPrevalentResource; }
bool debugLoggingEnabled() const { return m_debugLoggingEnabled; };
bool debugModeEnabled() const { return m_debugModeEnabled; }
- bool storageAccessPromptsEnabled() const { return m_storageAccessPromptsEnabled; }
static constexpr unsigned maxNumberOfRecursiveCallsInRedirectTraceBack { 50 };
private:
- void setStorageAccessPromptsEnabled(bool enabled) { m_storageAccessPromptsEnabled = enabled; }
bool shouldRemoveDataRecords() const;
void setDebugLogggingEnabled(bool enabled) { m_debugLoggingEnabled = enabled; }
void setDataRecordsBeingRemoved(bool);
@@ -266,7 +264,6 @@
const RegistrableDomain m_debugStaticPrevalentResource { URL { URL(), "https://3rdpartytestwebkit.org"_s } };
bool m_debugLoggingEnabled { false };
bool m_debugModeEnabled { false };
- bool m_storageAccessPromptsEnabled { false };
bool m_dataRecordsBeingRemoved { false };
ShouldIncludeLocalhost m_shouldIncludeLocalhost { ShouldIncludeLocalhost::Yes };
};
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp 2019-03-11 21:19:11 UTC (rev 242738)
@@ -320,9 +320,9 @@
callback(false);
}
-void WebResourceLoadStatisticsStore::requestStorageAccessGranted(const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(bool)>&& completionHandler)
+void WebResourceLoadStatisticsStore::requestStorageAccessGranted(const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& completionHandler)
{
- auto statusHandler = [this, protectedThis = makeRef(*this), subFrameDomain = subFrameDomain.isolatedCopy(), topFrameDomain = topFrameDomain.isolatedCopy(), promptEnabled, frameID, pageID, completionHandler = WTFMove(completionHandler)](StorageAccessStatus status) mutable {
+ auto statusHandler = [this, protectedThis = makeRef(*this), subFrameDomain = subFrameDomain.isolatedCopy(), topFrameDomain = topFrameDomain.isolatedCopy(), frameID, pageID, completionHandler = WTFMove(completionHandler)](StorageAccessStatus status) mutable {
switch (status) {
case StorageAccessStatus::CannotRequestAccess:
completionHandler(false);
@@ -329,7 +329,6 @@
return;
case StorageAccessStatus::RequiresUserPrompt:
{
- ASSERT_UNUSED(promptEnabled, promptEnabled);
CompletionHandler<void(bool)> requestConfirmationCompletionHandler = [this, protectedThis = protectedThis.copyRef(), subFrameDomain, topFrameDomain, frameID, pageID, completionHandler = WTFMove(completionHandler)] (bool userDidGrantAccess) mutable {
if (userDidGrantAccess)
grantStorageAccess(subFrameDomain, topFrameDomain, frameID, pageID, userDidGrantAccess, WTFMove(completionHandler));
@@ -345,10 +344,10 @@
}
};
- requestStorageAccess(subFrameDomain, topFrameDomain, frameID, pageID, promptEnabled, WTFMove(statusHandler));
+ requestStorageAccess(subFrameDomain, topFrameDomain, frameID, pageID, WTFMove(statusHandler));
}
-void WebResourceLoadStatisticsStore::requestStorageAccess(const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
+void WebResourceLoadStatisticsStore::requestStorageAccess(const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
{
if (subFrameDomain == topFrameDomain) {
completionHandler(StorageAccessStatus::HasAccess);
@@ -355,7 +354,7 @@
return;
}
- postTask([this, subFrameDomain = subFrameDomain.isolatedCopy(), topFrameDomain = topFrameDomain.isolatedCopy(), frameID, pageID, promptEnabled, completionHandler = WTFMove(completionHandler)]() mutable {
+ postTask([this, subFrameDomain = subFrameDomain.isolatedCopy(), topFrameDomain = topFrameDomain.isolatedCopy(), frameID, pageID, completionHandler = WTFMove(completionHandler)]() mutable {
if (!m_statisticsStore) {
postTaskReply([completionHandler = WTFMove(completionHandler)]() mutable {
completionHandler(StorageAccessStatus::CannotRequestAccess);
@@ -364,7 +363,7 @@
}
if (m_statisticsStore) {
- m_statisticsStore->requestStorageAccess(WTFMove(subFrameDomain), WTFMove(topFrameDomain), frameID.value(), pageID, promptEnabled, [completionHandler = WTFMove(completionHandler)](StorageAccessStatus status) mutable {
+ m_statisticsStore->requestStorageAccess(WTFMove(subFrameDomain), WTFMove(topFrameDomain), frameID.value(), pageID, [completionHandler = WTFMove(completionHandler)](StorageAccessStatus status) mutable {
postTaskReply([completionHandler = WTFMove(completionHandler), status]() mutable {
completionHandler(status);
});
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h 2019-03-11 21:19:11 UTC (rev 242738)
@@ -112,8 +112,8 @@
void hasHadUserInteraction(const RegistrableDomain&, CompletionHandler<void(bool)>&&);
void hasStorageAccess(const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(bool)>&& callback);
bool hasStorageAccessForFrame(const SubFrameDomain&, const TopFrameDomain&, FrameID, PageID);
- void requestStorageAccess(const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&);
- void requestStorageAccessGranted(const SubFrameDomain&, const TopFrameDomain&, FrameID, PageID, bool promptEnabled, CompletionHandler<void(bool)>&&);
+ void requestStorageAccess(const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(StorageAccessStatus)>&&);
+ void requestStorageAccessGranted(const SubFrameDomain&, const TopFrameDomain&, FrameID, PageID, CompletionHandler<void(bool)>&&);
void requestUpdate();
void setLastSeen(const RegistrableDomain&, Seconds, CompletionHandler<void()>&&);
void setPrevalentResource(const RegistrableDomain&, CompletionHandler<void()>&&);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2019-03-11 21:19:11 UTC (rev 242738)
@@ -645,9 +645,9 @@
networkProcess().hasStorageAccess(sessionID, subFrameDomain, topFrameDomain, frameID, pageID, WTFMove(completionHandler));
}
-void NetworkConnectionToWebProcess::requestStorageAccess(PAL::SessionID sessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(bool)>&& completionHandler)
+void NetworkConnectionToWebProcess::requestStorageAccess(PAL::SessionID sessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& completionHandler)
{
- networkProcess().requestStorageAccessGranted(sessionID, subFrameDomain, topFrameDomain, frameID, pageID, promptEnabled, WTFMove(completionHandler));
+ networkProcess().requestStorageAccessGranted(sessionID, subFrameDomain, topFrameDomain, frameID, pageID, WTFMove(completionHandler));
}
#endif
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2019-03-11 21:19:11 UTC (rev 242738)
@@ -208,7 +208,7 @@
void logSubresourceRedirect(PAL::SessionID, const RegistrableDomain& sourceDomain, const RegistrableDomain& targetDomain);
void requestResourceLoadStatisticsUpdate();
void hasStorageAccess(PAL::SessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&);
- void requestStorageAccess(PAL::SessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, bool prompt, CompletionHandler<void(bool)>&&);
+ void requestStorageAccess(PAL::SessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&);
#endif
void addOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2019-03-11 21:19:11 UTC (rev 242738)
@@ -64,7 +64,7 @@
LogSubresourceRedirect(PAL::SessionID sessionID, WebCore::RegistrableDomain sourceDomain, WebCore::RegistrableDomain targetDomain)
RequestResourceLoadStatisticsUpdate();
HasStorageAccess(PAL::SessionID sessionID, WebCore::RegistrableDomain subFrameDomain, WebCore::RegistrableDomain topFrameDomain, uint64_t frameID, uint64_t pageID) -> (bool hasStorageAccess) Async
- RequestStorageAccess(PAL::SessionID sessionID, WebCore::RegistrableDomain subFrameDomain, WebCore::RegistrableDomain topFrameDomain, uint64_t frameID, uint64_t pageID, bool prompt) -> (bool accessGranted) Async
+ RequestStorageAccess(PAL::SessionID sessionID, WebCore::RegistrableDomain subFrameDomain, WebCore::RegistrableDomain topFrameDomain, uint64_t frameID, uint64_t pageID) -> (bool accessGranted) Async
#endif
AddOriginAccessWhitelistEntry(String sourceOrigin, String destinationProtocol, String destinationHost, bool allowDestinationSubdomains);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-03-11 21:19:11 UTC (rev 242738)
@@ -977,11 +977,11 @@
}
}
-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)
+void NetworkProcess::requestStorageAccess(PAL::SessionID sessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
{
if (auto* networkSession = this->networkSession(sessionID)) {
if (auto* resourceLoadStatistics = networkSession->resourceLoadStatistics())
- resourceLoadStatistics->requestStorageAccess(subFrameDomain, topFrameDomain, frameID.value(), pageID, promptEnabled, WTFMove(completionHandler));
+ resourceLoadStatistics->requestStorageAccess(subFrameDomain, topFrameDomain, frameID.value(), pageID, WTFMove(completionHandler));
else
completionHandler(StorageAccessStatus::CannotRequestAccess);
} else {
@@ -990,11 +990,11 @@
}
}
-void NetworkProcess::requestStorageAccessGranted(PAL::SessionID sessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(bool)>&& completionHandler)
+void NetworkProcess::requestStorageAccessGranted(PAL::SessionID sessionID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& completionHandler)
{
if (auto* networkSession = this->networkSession(sessionID)) {
if (auto* resourceLoadStatistics = networkSession->resourceLoadStatistics())
- resourceLoadStatistics->requestStorageAccessGranted(subFrameDomain, topFrameDomain, frameID, pageID, promptEnabled, WTFMove(completionHandler));
+ resourceLoadStatistics->requestStorageAccessGranted(subFrameDomain, topFrameDomain, frameID, pageID, WTFMove(completionHandler));
else
completionHandler(false);
} else {
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-03-11 21:19:11 UTC (rev 242738)
@@ -231,8 +231,8 @@
void logUserInteraction(PAL::SessionID, const TopFrameDomain&, CompletionHandler<void()>&&);
void removeAllStorageAccess(PAL::SessionID, CompletionHandler<void()>&&);
void removePrevalentDomains(PAL::SessionID, const Vector<RegistrableDomain>&);
- void requestStorageAccess(PAL::SessionID, const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&);
- void requestStorageAccessGranted(PAL::SessionID, const SubFrameDomain&, const TopFrameDomain&, FrameID, PageID, bool promptEnabled, CompletionHandler<void(bool)>&&);
+ void requestStorageAccess(PAL::SessionID, const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(StorageAccessStatus)>&&);
+ void requestStorageAccessGranted(PAL::SessionID, const SubFrameDomain&, const TopFrameDomain&, FrameID, PageID, CompletionHandler<void(bool)>&&);
void resetCacheMaxAgeCapForPrevalentResources(PAL::SessionID, CompletionHandler<void()>&&);
void resetParametersToDefaultValues(PAL::SessionID, CompletionHandler<void()>&&);
void scheduleClearInMemoryAndPersistent(PAL::SessionID, Optional<WallTime> modifiedSince, ShouldGrandfatherStatistics, CompletionHandler<void()>&&);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (242737 => 242738)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2019-03-11 21:19:11 UTC (rev 242738)
@@ -107,7 +107,7 @@
LogUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain topFrameDomain) -> () Async
RemoveAllStorageAccess(PAL::SessionID sessionID) -> () Async
RemovePrevalentDomains(PAL::SessionID sessionID, Vector<WebCore::RegistrableDomain> domainsWithInteraction)
- 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
+ RequestStorageAccess(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain, WebCore::RegistrableDomain topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID) -> (enum:uint8_t WebKit::StorageAccessStatus storageAccessStatus) Async
ResetParametersToDefaultValues(PAL::SessionID sessionID) -> () Async
ScheduleClearInMemoryAndPersistent(PAL::SessionID sessionID, Optional<WallTime> modifiedSince, enum:bool WebKit::ShouldGrandfatherStatistics shouldGrandfather) -> () Async
ScheduleCookieBlockingUpdate(PAL::SessionID sessionID) -> () Async
Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (242737 => 242738)
--- trunk/Source/WebKit/Shared/WebPreferences.yaml 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml 2019-03-11 21:19:11 UTC (rev 242738)
@@ -1162,11 +1162,6 @@
type: bool
defaultValue: true
-StorageAccessPromptsEnabled:
- type: bool
- defaultValue: true
- webcoreBinding: RuntimeEnabledFeatures
-
LinkPreloadEnabled:
type: bool
defaultValue: true
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp (242737 => 242738)
--- trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp 2019-03-11 21:19:11 UTC (rev 242738)
@@ -208,16 +208,6 @@
return toImpl(preferencesRef)->_javascript_CanOpenWindowsAutomatically();
}
-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);
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h (242737 => 242738)
--- trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h 2019-03-11 21:19:11 UTC (rev 242738)
@@ -108,10 +108,6 @@
WK_EXPORT void WKPreferencesSetJavaScriptCanOpenWindowsAutomatically(WKPreferencesRef preferences, bool _javascript_CanOpenWindowsAutomatically);
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);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm (242737 => 242738)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2019-03-11 21:19:11 UTC (rev 242738)
@@ -128,16 +128,6 @@
_preferences->setJavaScriptCanOpenWindowsAutomatically(_javascript_CanOpenWindowsAutomatically);
}
-- (BOOL)_storageAccessPromptsEnabled
-{
- return _preferences->storageAccessPromptsEnabled();
-}
-
-- (void)_setStorageAccessPromptsEnabled:(BOOL)enabled
-{
- _preferences->setStorageAccessPromptsEnabled(enabled);
-}
-
#pragma mark OS X-specific methods
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h (242737 => 242738)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2019-03-11 21:19:11 UTC (rev 242738)
@@ -144,7 +144,6 @@
@property (nonatomic, getter=_isSafeBrowsingEnabled, setter=_setSafeBrowsingEnabled:) BOOL _safeBrowsingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
-@property (nonatomic, setter=_setStorageAccessPromptsEnabled:) BOOL _storageAccessPromptsEnabled WK_API_AVAILABLE(macosx(10.14), ios(12.0));
@property (nonatomic, setter=_setColorFilterEnabled:) BOOL _colorFilterEnabled WK_API_AVAILABLE(macosx(10.14), ios(12.0));
@property (nonatomic, setter=_setPunchOutWhiteBackgroundsInDarkMode:) BOOL _punchOutWhiteBackgroundsInDarkMode WK_API_AVAILABLE(macosx(10.14), ios(12.0));
@property (nonatomic, setter=_setLowPowerVideoAudioBufferSizeEnabled:) BOOL _lowPowerVideoAudioBufferSizeEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (242737 => 242738)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2019-03-11 21:19:11 UTC (rev 242738)
@@ -734,7 +734,7 @@
sendWithAsyncReply(Messages::NetworkProcess::HasStorageAccess(sessionID, resourceDomain, topFrameDomain, frameID, pageID), WTFMove(completionHandler));
}
-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)
+void NetworkProcessProxy::requestStorageAccess(PAL::SessionID sessionID, const RegistrableDomain& resourceDomain, const RegistrableDomain& topFrameDomain, Optional<uint64_t> frameID, uint64_t pageID, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
{
if (!canSendMessage()) {
completionHandler(StorageAccessStatus::CannotRequestAccess);
@@ -741,7 +741,7 @@
return;
}
- sendWithAsyncReply(Messages::NetworkProcess::RequestStorageAccess(sessionID, resourceDomain, topFrameDomain, frameID, pageID, promptEnabled), WTFMove(completionHandler));
+ sendWithAsyncReply(Messages::NetworkProcess::RequestStorageAccess(sessionID, resourceDomain, topFrameDomain, frameID, pageID), WTFMove(completionHandler));
}
void NetworkProcessProxy::requestStorageAccessConfirm(uint64_t pageID, uint64_t frameID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, CompletionHandler<void(bool)>&& completionHandler)
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (242737 => 242738)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2019-03-11 21:19:11 UTC (rev 242738)
@@ -129,7 +129,7 @@
void getAllStorageAccessEntries(PAL::SessionID, CompletionHandler<void(Vector<String> domains)>&&);
void grantStorageAccess(PAL::SessionID, const RegistrableDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, bool userWasPrompted, CompletionHandler<void(bool)>&&);
void hasStorageAccess(PAL::SessionID, const RegistrableDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(bool)>&&);
- void requestStorageAccess(PAL::SessionID, const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&);
+ void requestStorageAccess(PAL::SessionID, const SubFrameDomain&, const TopFrameDomain&, Optional<FrameID>, PageID, CompletionHandler<void(StorageAccessStatus)>&&);
void requestStorageAccessConfirm(PageID, FrameID, const SubFrameDomain&, const TopFrameDomain&, CompletionHandler<void(bool)>&&);
void resetParametersToDefaultValues(PAL::SessionID, CompletionHandler<void()>&&);
void removeAllStorageAccess(PAL::SessionID, CompletionHandler<void()>&&);
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (242737 => 242738)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2019-03-11 21:19:11 UTC (rev 242738)
@@ -1653,7 +1653,7 @@
networkProcess->hasStorageAccess(m_sessionID, RegistrableDomain::uncheckedCreateFromHost(subFrameHost), RegistrableDomain::uncheckedCreateFromHost(topFrameHost), frameID, pageID, WTFMove(completionHandler));
}
-void WebsiteDataStore::requestStorageAccess(const String& subFrameHost, const String& topFrameHost, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
+void WebsiteDataStore::requestStorageAccess(const String& subFrameHost, const String& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
{
if (!resourceLoadStatisticsEnabled()) {
completionHandler(StorageAccessStatus::CannotRequestAccess);
@@ -1667,7 +1667,7 @@
}
if (auto networkProcess = webPage->process().processPool().networkProcess())
- networkProcess->requestStorageAccess(m_sessionID, RegistrableDomain::uncheckedCreateFromHost(subFrameHost), RegistrableDomain::uncheckedCreateFromHost(topFrameHost), frameID, pageID, promptEnabled, WTFMove(completionHandler));
+ networkProcess->requestStorageAccess(m_sessionID, RegistrableDomain::uncheckedCreateFromHost(subFrameHost), RegistrableDomain::uncheckedCreateFromHost(topFrameHost), frameID, pageID, WTFMove(completionHandler));
}
void WebsiteDataStore::grantStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, bool userWasPrompted, CompletionHandler<void(bool)>&& completionHandler)
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (242737 => 242738)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2019-03-11 21:19:11 UTC (rev 242738)
@@ -165,7 +165,7 @@
void setStatisticsTestingCallback(WTF::Function<void(const String&)>&& callback) { m_statisticsTestingCallback = WTFMove(callback); }
void setVeryPrevalentResource(const URL&, CompletionHandler<void()>&&);
void hasStorageAccess(const String& subFrameHost, const String& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&);
- void requestStorageAccess(const String& subFrameHost, const String& topFrameHost, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&);
+ void requestStorageAccess(const String& subFrameHost, const String& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(StorageAccessStatus)>&&);
void grantStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, bool userWasPrompted, CompletionHandler<void(bool)>&&);
void setSubframeUnderTopFrameDomain(const URL& subframe, const URL& topFrame);
void resetCrossSiteLoadsWithLinkDecorationForTesting(CompletionHandler<void()>&&);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (242737 => 242738)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-03-11 20:35:21 UTC (rev 242737)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-03-11 21:19:11 UTC (rev 242738)
@@ -6336,8 +6336,7 @@
void WebPage::requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, CompletionHandler<void(bool)>&& completionHandler)
{
- bool promptEnabled = RuntimeEnabledFeatures::sharedFeatures().storageAccessPromptsEnabled();
- WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::RequestStorageAccess(sessionID(), RegistrableDomain::uncheckedCreateFromHost(subFrameHost), RegistrableDomain::uncheckedCreateFromHost(topFrameHost), frameID, m_pageID, promptEnabled), WTFMove(completionHandler));
+ WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::RequestStorageAccess(sessionID(), RegistrableDomain::uncheckedCreateFromHost(subFrameHost), RegistrableDomain::uncheckedCreateFromHost(topFrameHost), frameID, m_pageID), WTFMove(completionHandler));
}
#endif
