Attachment 347738 Details for Bug 188830 – Patch

[patch] Patch

bug-188830-20180821171236.patch (text/plain), 2.49 KB, created by John Wilander on 2018-08-21 17:12:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Wilander

Created: 2018-08-21 17:12:37 PDT

Size: 2.49 KB

patch

obsolete

>Subversion Revision: 235145
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 897dd0575b2864a3cc1c2472713a590389b8eb9f..0ded283eb2d92f7e3e1ff037d218608e99d21b1a 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-08-21  John Wilander  <wilander@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 NOBODY (OOPS!).
>+
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::requestStorageAccess):
>+
> 2018-08-21  John Wilander  <wilander@apple.com>
> 
>         Storage Access API: The call to ResourceLoadStatisticsMemoryStore::grantStorageAccessInternal() should send eTLD+1s, not full host names
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index 5a9531b04bb7472572ffaa48df760273f8841ac3..c00d5141b71811f2de71270291058436c49cefae 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -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>
>@@ -7697,7 +7698,7 @@ void WebPageProxy::requestStorageAccess(String&& subFrameHost, String&& topFrame
>             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

Actions: View | Formatted Diff | Diff

Attachments on bug 188830: 347738