Modified: branches/safari-606-branch/Source/WebKit/ChangeLog (235794 => 235795)
--- branches/safari-606-branch/Source/WebKit/ChangeLog 2018-09-07 20:07:44 UTC (rev 235794)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog 2018-09-07 20:07:47 UTC (rev 235795)
@@ -1,5 +1,32 @@
2018-09-06 Babak Shafiei <[email protected]>
+ Cherry-pick r235209. rdar://problem/44169451
+
+ The Storage Access API prompt should show the eTLD+1s, not the full host names
+ https://bugs.webkit.org/show_bug.cgi?id=188830
+ <rdar://problem/43380645>
+
+ Reviewed by Brent Fulgham.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::requestStorageAccess):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235209 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-08-22 John Wilander <[email protected]>
+
+ The Storage Access API prompt should show the eTLD+1s, not the full host names
+ https://bugs.webkit.org/show_bug.cgi?id=188830
+ <rdar://problem/43380645>
+
+ Reviewed by Brent Fulgham.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::requestStorageAccess):
+
+2018-09-06 Babak Shafiei <[email protected]>
+
Cherry-pick r235145. rdar://problem/44169453
Storage Access API: The call to ResourceLoadStatisticsMemoryStore::grantStorageAccessInternal() should send eTLD+1s, not full host names
Modified: branches/safari-606-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (235794 => 235795)
--- branches/safari-606-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-09-07 20:07:44 UTC (rev 235794)
+++ branches/safari-606-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-09-07 20:07:47 UTC (rev 235795)
@@ -140,6 +140,7 @@
#include <WebCore/PerformanceLoggingClient.h>
#include <WebCore/PublicSuffix.h>
#include <WebCore/RenderEmbeddedObject.h>
+#include <WebCore/ResourceLoadStatistics.h>
#include <WebCore/SSLKeyGenerator.h>
#include <WebCore/SerializedCryptoKeyWrap.h>
#include <WebCore/SharedBuffer.h>
@@ -7679,7 +7680,7 @@
return;
case StorageAccessStatus::RequiresUserPrompt:
ASSERT_UNUSED(promptEnabled, promptEnabled);
- m_uiClient->requestStorageAccessConfirm(*this, m_process->webFrame(frameID), String(subFrameHost), String(topFrameHost), [this, protectedThis = makeRef(*this), subFrameHost, topFrameHost, frameID, completionHandler = WTFMove(completionHandler)] (bool userDidGrantAccess) mutable {
+ m_uiClient->requestStorageAccessConfirm(*this, m_process->webFrame(frameID), ResourceLoadStatistics::primaryDomain(subFrameHost), ResourceLoadStatistics::primaryDomain(topFrameHost), [this, protectedThis = makeRef(*this), subFrameHost, topFrameHost, frameID, completionHandler = WTFMove(completionHandler)] (bool userDidGrantAccess) mutable {
if (userDidGrantAccess)
m_websiteDataStore->grantStorageAccess(WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, m_pageID, userDidGrantAccess, WTFMove(completionHandler));
else
