Modified: trunk/Source/WebKit/ChangeLog (235208 => 235209)
--- trunk/Source/WebKit/ChangeLog 2018-08-22 22:51:22 UTC (rev 235208)
+++ trunk/Source/WebKit/ChangeLog 2018-08-22 22:54:34 UTC (rev 235209)
@@ -1,3 +1,14 @@
+2018-08-22 John Wilander <wilan...@apple.com>
+
+ 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-08-22 Tim Horton <timothy_hor...@apple.com>
De-unify WebPage
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (235208 => 235209)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-08-22 22:51:22 UTC (rev 235208)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-08-22 22:54:34 UTC (rev 235209)
@@ -143,6 +143,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>
@@ -7704,7 +7705,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
