Changeset 225954 in webkit

Timestamp:

Dec 14, 2017, 6:08:23 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Serialize WebsitePoliciesData instead of WebsitePolicies
​https://bugs.webkit.org/show_bug.cgi?id=180847

Reviewed by Joseph Pecoraro.

No change in behavior. This will allow me to add things to WebsitePolicies that have
a different form when serialized to another process.

Also, remove API::WebsitePolicies because the wrapper isn't necessary.
WebsitePolicies is now the API type that only exists in the UIProcess.

• Shared/WebsitePolicies.cpp: Removed.
• Shared/WebsitePolicies.h:

(WebKit::WebsitePolicies::contentBlockersEnabled const): Deleted.
(WebKit::WebsitePolicies::setContentBlockersEnabled): Deleted.
(WebKit::WebsitePolicies::allowedAutoplayQuirks const): Deleted.
(WebKit::WebsitePolicies::setAllowedAutoplayQuirks): Deleted.
(WebKit::WebsitePolicies::autoplayPolicy const): Deleted.
(WebKit::WebsitePolicies::setAutoplayPolicy): Deleted.
(WebKit::WebsitePolicies::customHeaderFields): Deleted.
(WebKit::WebsitePolicies::takeCustomHeaderFields): Deleted.
(WebKit::WebsitePolicies::setCustomHeaderFields): Deleted.

• Shared/WebsitePoliciesData.cpp: Copied from Source/WebKit/Shared/WebsitePolicies.cpp.

(WebKit::WebsitePoliciesData::fromWebsitePolicies):
(WebKit::WebsitePoliciesData::encode const):
(WebKit::WebsitePoliciesData::decode):
(WebKit::WebsitePoliciesData::applyToDocumentLoader):
(WebKit::WebsitePolicies::WebsitePolicies): Deleted.
(WebKit::WebsitePolicies::encode const): Deleted.
(WebKit::WebsitePolicies::decode): Deleted.
(WebKit::WebsitePolicies::applyToDocumentLoader): Deleted.

• Shared/WebsitePoliciesData.h: Added.
• UIProcess/API/APINavigationClient.h:

(API::NavigationClient::decidePolicyForNavigationAction):
(API::NavigationClient::decidePolicyForNavigationResponse):

• UIProcess/API/APIPolicyClient.h:

(API::PolicyClient::decidePolicyForNavigationAction):
(API::PolicyClient::decidePolicyForNewWindowAction):
(API::PolicyClient::decidePolicyForResponse):

• UIProcess/API/APIWebsitePolicies.cpp: Removed.
• UIProcess/API/APIWebsitePolicies.h: Removed.
• UIProcess/API/C/WKAPICast.h:
• UIProcess/API/C/WKFramePolicyListener.cpp:

(WKFramePolicyListenerUse):
(WKFramePolicyListenerUseWithPolicies):

• UIProcess/API/C/WKPage.cpp:

(WKPageUpdateWebsitePolicies):
(WKPageSetPagePolicyClient):
(WKPageSetPageNavigationClient):

• UIProcess/API/C/WKWebsitePolicies.cpp:

(WKWebsitePoliciesGetTypeID):
(WKWebsitePoliciesCreate):

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _updateWebsitePolicies:]):

• UIProcess/API/Cocoa/_WKWebsitePolicies.mm:

(-[_WKWebsitePolicies dealloc]):
(-[_WKWebsitePolicies init]):

• UIProcess/API/Cocoa/_WKWebsitePoliciesInternal.h:

(WebKit::wrapper):

• UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::NavigationClient::decidePolicyForNavigationAction):
(WebKit::NavigationState::NavigationClient::decidePolicyForNavigationResponse):

• UIProcess/WebFrameListenerProxy.cpp:

(WebKit::WebFrameListenerProxy::receivedPolicyDecision):

• UIProcess/WebFrameListenerProxy.h:
• UIProcess/WebFramePolicyListenerProxy.cpp:

(WebKit::WebFramePolicyListenerProxy::use):
(WebKit::WebFramePolicyListenerProxy::download):
(WebKit::WebFramePolicyListenerProxy::ignore):

• UIProcess/WebFramePolicyListenerProxy.h:
• UIProcess/WebFrameProxy.cpp:

(WebKit::WebFrameProxy::receivedPolicyDecision):

• UIProcess/WebFrameProxy.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::receivedPolicyDecision):
(WebKit::WebPageProxy::decidePolicyForNavigationAction):
(WebKit::WebPageProxy::updateWebsitePolicies):

• UIProcess/WebPageProxy.h:
• UIProcess/WebPageProxy.messages.in:
• WebKit.xcodeproj/project.pbxproj:
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::applyToDocumentLoader):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):

• WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
• WebProcess/WebPage/WebFrame.cpp:

(WebKit::WebFrame::didReceivePolicyDecision):

• WebProcess/WebPage/WebFrame.h:
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didReceivePolicyDecision):
(WebKit::WebPage::updateWebsitePolicies):

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/WebPage.messages.in:

Location:

trunk/Source/WebKit

Files:

• CMakeLists.txt (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• Shared/WebsitePoliciesData.cpp (moved) (moved from trunk/Source/WebKit/Shared/WebsitePolicies.cpp ) (4 diffs)
• Shared/WebsitePoliciesData.h (added)
• UIProcess/API/APINavigationClient.h (modified) (2 diffs)
• UIProcess/API/APIPolicyClient.h (modified) (2 diffs)
• UIProcess/API/APIWebsitePolicies.cpp (deleted)
• UIProcess/API/APIWebsitePolicies.h (deleted)
• UIProcess/API/C/WKAPICast.h (modified) (2 diffs)
• UIProcess/API/C/WKFramePolicyListener.cpp (modified) (2 diffs)
• UIProcess/API/C/WKPage.cpp (modified) (8 diffs)
• UIProcess/API/C/WKWebsitePolicies.cpp (modified) (2 diffs)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/API/Cocoa/_WKWebsitePolicies.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/_WKWebsitePoliciesInternal.h (modified) (2 diffs)
• UIProcess/Cocoa/NavigationState.mm (modified) (8 diffs)
• UIProcess/WebFrameListenerProxy.cpp (modified) (2 diffs)
• UIProcess/WebFrameListenerProxy.h (modified) (2 diffs)
• UIProcess/WebFramePolicyListenerProxy.cpp (modified) (2 diffs)
• UIProcess/WebFramePolicyListenerProxy.h (modified) (1 diff)
• UIProcess/WebFrameProxy.cpp (modified) (3 diffs)
• UIProcess/WebFrameProxy.h (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (5 diffs)
• UIProcess/WebPageProxy.h (modified) (5 diffs)
• UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• UIProcess/WebsitePolicies.h (moved) (moved from trunk/Source/WebKit/Shared/WebsitePolicies.h ) (3 diffs)
• WebKit.xcodeproj/project.pbxproj (modified) (14 diffs)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (4 diffs)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.h (modified) (2 diffs)
• WebProcess/WebPage/WebFrame.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebFrame.h (modified) (2 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (5 diffs)
• WebProcess/WebPage/WebPage.h (modified) (4 diffs)
• WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)

trunk/Source/WebKit/CMakeLists.txt

@@ -217 +217 @@
     Shared/WebWheelEvent.cpp
     Shared/WebsiteDataStoreParameters.cpp
-    Shared/WebsitePolicies.cpp
+    Shared/WebsitePoliciesData.cpp
 
     Shared/API/APIArray.cpp
@@ -359 +359 @@
     UIProcess/API/APIUserStyleSheet.cpp
     UIProcess/API/APIWebsiteDataStore.cpp
-    UIProcess/API/APIWebsitePolicies.cpp
     UIProcess/API/APIWindowFeatures.cpp
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-12-14  Alex Christensen  <achristensen@webkit.org>
+
+        Serialize WebsitePoliciesData instead of WebsitePolicies
+        https://bugs.webkit.org/show_bug.cgi?id=180847
+
+        Reviewed by Joseph Pecoraro.
+
+        No change in behavior.  This will allow me to add things to WebsitePolicies that have 
+        a different form when serialized to another process.
+        
+        Also, remove API::WebsitePolicies because the wrapper isn't necessary.
+        WebsitePolicies is now the API type that only exists in the UIProcess.
+
+        * Shared/WebsitePolicies.cpp: Removed.
+        * Shared/WebsitePolicies.h:
+        (WebKit::WebsitePolicies::contentBlockersEnabled const): Deleted.
+        (WebKit::WebsitePolicies::setContentBlockersEnabled): Deleted.
+        (WebKit::WebsitePolicies::allowedAutoplayQuirks const): Deleted.
+        (WebKit::WebsitePolicies::setAllowedAutoplayQuirks): Deleted.
+        (WebKit::WebsitePolicies::autoplayPolicy const): Deleted.
+        (WebKit::WebsitePolicies::setAutoplayPolicy): Deleted.
+        (WebKit::WebsitePolicies::customHeaderFields): Deleted.
+        (WebKit::WebsitePolicies::takeCustomHeaderFields): Deleted.
+        (WebKit::WebsitePolicies::setCustomHeaderFields): Deleted.
+        * Shared/WebsitePoliciesData.cpp: Copied from Source/WebKit/Shared/WebsitePolicies.cpp.
+        (WebKit::WebsitePoliciesData::fromWebsitePolicies):
+        (WebKit::WebsitePoliciesData::encode const):
+        (WebKit::WebsitePoliciesData::decode):
+        (WebKit::WebsitePoliciesData::applyToDocumentLoader):
+        (WebKit::WebsitePolicies::WebsitePolicies): Deleted.
+        (WebKit::WebsitePolicies::encode const): Deleted.
+        (WebKit::WebsitePolicies::decode): Deleted.
+        (WebKit::WebsitePolicies::applyToDocumentLoader): Deleted.
+        * Shared/WebsitePoliciesData.h: Added.
+        * UIProcess/API/APINavigationClient.h:
+        (API::NavigationClient::decidePolicyForNavigationAction):
+        (API::NavigationClient::decidePolicyForNavigationResponse):
+        * UIProcess/API/APIPolicyClient.h:
+        (API::PolicyClient::decidePolicyForNavigationAction):
+        (API::PolicyClient::decidePolicyForNewWindowAction):
+        (API::PolicyClient::decidePolicyForResponse):
+        * UIProcess/API/APIWebsitePolicies.cpp: Removed.
+        * UIProcess/API/APIWebsitePolicies.h: Removed.
+        * UIProcess/API/C/WKAPICast.h:
+        * UIProcess/API/C/WKFramePolicyListener.cpp:
+        (WKFramePolicyListenerUse):
+        (WKFramePolicyListenerUseWithPolicies):
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageUpdateWebsitePolicies):
+        (WKPageSetPagePolicyClient):
+        (WKPageSetPageNavigationClient):
+        * UIProcess/API/C/WKWebsitePolicies.cpp:
+        (WKWebsitePoliciesGetTypeID):
+        (WKWebsitePoliciesCreate):
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _updateWebsitePolicies:]):
+        * UIProcess/API/Cocoa/_WKWebsitePolicies.mm:
+        (-[_WKWebsitePolicies dealloc]):
+        (-[_WKWebsitePolicies init]):
+        * UIProcess/API/Cocoa/_WKWebsitePoliciesInternal.h:
+        (WebKit::wrapper):
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::NavigationClient::decidePolicyForNavigationAction):
+        (WebKit::NavigationState::NavigationClient::decidePolicyForNavigationResponse):
+        * UIProcess/WebFrameListenerProxy.cpp:
+        (WebKit::WebFrameListenerProxy::receivedPolicyDecision):
+        * UIProcess/WebFrameListenerProxy.h:
+        * UIProcess/WebFramePolicyListenerProxy.cpp:
+        (WebKit::WebFramePolicyListenerProxy::use):
+        (WebKit::WebFramePolicyListenerProxy::download):
+        (WebKit::WebFramePolicyListenerProxy::ignore):
+        * UIProcess/WebFramePolicyListenerProxy.h:
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::receivedPolicyDecision):
+        * UIProcess/WebFrameProxy.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::receivedPolicyDecision):
+        (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+        (WebKit::WebPageProxy::updateWebsitePolicies):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPageProxy.messages.in:
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::applyToDocumentLoader):
+        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::didReceivePolicyDecision):
+        * WebProcess/WebPage/WebFrame.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didReceivePolicyDecision):
+        (WebKit::WebPage::updateWebsitePolicies):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in:
+
 2017-12-14  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebKit/Shared/WebsitePoliciesData.cpp

@@ -25 +25 @@
 
 #include "config.h"
-#include "WebsitePolicies.h"
+#include "WebsitePoliciesData.h"
 
 #include "ArgumentCoders.h"
@@ -32 +32 @@
 namespace WebKit {
 
-WebsitePolicies::WebsitePolicies(bool contentBlockersEnabled, OptionSet<WebsiteAutoplayQuirk> allowedAutoplayQuirks, WebsiteAutoplayPolicy autoplayPolicy, Vector<WebCore::HTTPHeaderField>&& customHeaderFields)
-    : m_contentBlockersEnabled(contentBlockersEnabled)
-    , m_allowedAutoplayQuirks(allowedAutoplayQuirks)
-    , m_autoplayPolicy(autoplayPolicy)
-    , m_customHeaderFields(WTFMove(customHeaderFields))
+WebsitePoliciesData WebsitePoliciesData::fromWebsitePolicies(const WebsitePolicies& policies)
 {
+    return { policies.contentBlockersEnabled(), policies.allowedAutoplayQuirks(), policies.autoplayPolicy(), policies.customHeaderFields() };
 }
 
-void WebsitePolicies::encode(IPC::Encoder& encoder) const
+void WebsitePoliciesData::encode(IPC::Encoder& encoder) const
 {
-    encoder << m_contentBlockersEnabled;
-    encoder << m_autoplayPolicy;
-    encoder << m_allowedAutoplayQuirks;
-    encoder << m_customHeaderFields;
+    encoder << contentBlockersEnabled;
+    encoder << autoplayPolicy;
+    encoder << allowedAutoplayQuirks;
+    encoder << customHeaderFields;
 }
 
-std::optional<WebsitePolicies> WebsitePolicies::decode(IPC::Decoder& decoder)
+std::optional<WebsitePoliciesData> WebsitePoliciesData::decode(IPC::Decoder& decoder)
 {
     std::optional<bool> contentBlockersEnabled;
@@ -78 +75 @@
 }
 
-void WebsitePolicies::applyToDocumentLoader(WebsitePolicies&& websitePolicies, WebCore::DocumentLoader& documentLoader)
+void WebsitePoliciesData::applyToDocumentLoader(WebsitePoliciesData&& websitePolicies, WebCore::DocumentLoader& documentLoader)
 {
-    documentLoader.setCustomHeaderFields(websitePolicies.takeCustomHeaderFields());
+    documentLoader.setCustomHeaderFields(WTFMove(websitePolicies.customHeaderFields));
     
     // Only setUserContentExtensionsEnabled if it hasn't already been disabled by reloading without content blockers.
     if (documentLoader.userContentExtensionsEnabled())
-        documentLoader.setUserContentExtensionsEnabled(websitePolicies.contentBlockersEnabled());
+        documentLoader.setUserContentExtensionsEnabled(websitePolicies.contentBlockersEnabled);
 
     OptionSet<WebCore::AutoplayQuirk> quirks;
-    auto allowedQuirks = websitePolicies.allowedAutoplayQuirks();
+    const auto& allowedQuirks = websitePolicies.allowedAutoplayQuirks;
     
     if (allowedQuirks.contains(WebsiteAutoplayQuirk::InheritedUserGestures))
@@ -100 +97 @@
     documentLoader.setAllowedAutoplayQuirks(quirks);
 
-    switch (websitePolicies.autoplayPolicy()) {
+    switch (websitePolicies.autoplayPolicy) {
     case WebsiteAutoplayPolicy::Default:
         documentLoader.setAutoplayPolicy(WebCore::AutoplayPolicy::Default);

trunk/Source/WebKit/UIProcess/API/APINavigationClient.h

@@ -32 +32 @@
 #include "WebEvent.h"
 #include "WebFramePolicyListenerProxy.h"
-#include "WebsitePolicies.h"
+#include "WebsitePoliciesData.h"
 #include <WebCore/FrameLoaderTypes.h>
 #include <WebCore/LayoutMilestones.h>
@@ -102 +102 @@
     virtual void decidePolicyForNavigationAction(WebKit::WebPageProxy&, Ref<NavigationAction>&&, Ref<WebKit::WebFramePolicyListenerProxy>&& listener, Object*)
     {
-        listener->use({ });
+        listener->use(std::nullopt);
     }
 
     virtual void decidePolicyForNavigationResponse(WebKit::WebPageProxy&, Ref<NavigationResponse>&&, Ref<WebKit::WebFramePolicyListenerProxy>&& listener, Object*)
     {
-        listener->use({ });
+        listener->use(std::nullopt);
     }
     

trunk/Source/WebKit/UIProcess/API/APIPolicyClient.h

@@ -28 +28 @@
 #include "WebEvent.h"
 #include "WebFramePolicyListenerProxy.h"
-#include "WebsitePolicies.h"
 #include <WebCore/FrameLoaderTypes.h>
 #include <wtf/Forward.h>
@@ -54 +53 @@
     virtual void decidePolicyForNavigationAction(WebKit::WebPageProxy&, WebKit::WebFrameProxy*, const WebKit::NavigationActionData&, WebKit::WebFrameProxy*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, Ref<WebKit::WebFramePolicyListenerProxy>&& listener, API::Object*)
     {
-        listener->use({ });
+        listener->use(std::nullopt);
     }
     virtual void decidePolicyForNewWindowAction(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, const WebKit::NavigationActionData&, const WebCore::ResourceRequest&, const WTF::String&, Ref<WebKit::WebFramePolicyListenerProxy>&& listener, API::Object*)
     {
-        listener->use({ });
+        listener->use(std::nullopt);
     }
     virtual void decidePolicyForResponse(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool, Ref<WebKit::WebFramePolicyListenerProxy>&& listener, API::Object*)
     {
-        listener->use({ });
+        listener->use(std::nullopt);
     }
     virtual void unableToImplementPolicy(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, const WebCore::ResourceError&, API::Object*) { }

trunk/Source/WebKit/UIProcess/API/C/WKAPICast.h

@@ -69 +69 @@
 class UserScript;
 class WebsiteDataStore;
-class WebsitePolicies;
 class WindowFeatures;
 }
@@ -167 +166 @@
 WK_ADD_API_MAPPING(WKViewportAttributesRef, WebViewportAttributes)
 WK_ADD_API_MAPPING(WKWebsiteDataStoreRef, API::WebsiteDataStore)
-WK_ADD_API_MAPPING(WKWebsitePoliciesRef, API::WebsitePolicies)
+WK_ADD_API_MAPPING(WKWebsitePoliciesRef, WebsitePolicies)
 WK_ADD_API_MAPPING(WKWindowFeaturesRef, API::WindowFeatures)
 

trunk/Source/WebKit/UIProcess/API/C/WKFramePolicyListener.cpp

@@ -27 +27 @@
 #include "WKFramePolicyListener.h"
 
-#include "APIWebsitePolicies.h"
 #include "WKAPICast.h"
 #include "WebFramePolicyListenerProxy.h"
 #include "WebFrameProxy.h"
-#include "WebsitePolicies.h"
+#include "WebsitePoliciesData.h"
 
 using namespace WebKit;
@@ -42 +41 @@
 void WKFramePolicyListenerUse(WKFramePolicyListenerRef policyListenerRef)
 {
-    toImpl(policyListenerRef)->use({ });
+    toImpl(policyListenerRef)->use(std::nullopt);
 }
 
 void WKFramePolicyListenerUseWithPolicies(WKFramePolicyListenerRef policyListenerRef, WKWebsitePoliciesRef websitePolicies)
 {
-    toImpl(policyListenerRef)->use(toImpl(websitePolicies)->websitePolicies());
+    toImpl(policyListenerRef)->use(WebsitePoliciesData::fromWebsitePolicies(*toImpl(websitePolicies)));
 }
 

trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp

@@ -47 +47 @@
 #include "APISessionState.h"
 #include "APIUIClient.h"
-#include "APIWebsitePolicies.h"
 #include "APIWindowFeatures.h"
 #include "AuthenticationChallengeProxy.h"
@@ -72 +71 @@
 #include "WebProcessProxy.h"
 #include "WebProtectionSpace.h"
+#include "WebsitePolicies.h"
 #include <WebCore/Page.h>
 #include <WebCore/SecurityOriginData.h>
@@ -326 +326 @@
 void WKPageUpdateWebsitePolicies(WKPageRef pageRef, WKWebsitePoliciesRef websitePoliciesRef)
 {
-    toImpl(pageRef)->updateWebsitePolicies(toImpl(websitePoliciesRef)->websitePolicies());
+    toImpl(pageRef)->updateWebsitePolicies(WebsitePoliciesData::fromWebsitePolicies(*toImpl(websitePoliciesRef)));
 }
 
@@ -1352 +1352 @@
         {
             if (!m_client.decidePolicyForNavigationAction_deprecatedForUseWithV0 && !m_client.decidePolicyForNavigationAction_deprecatedForUseWithV1 && !m_client.decidePolicyForNavigationAction) {
-                listener->use({ });
+                listener->use(std::nullopt);
                 return;
             }
@@ -1370 +1370 @@
         {
             if (!m_client.decidePolicyForNewWindowAction) {
-                listener->use({ });
+                listener->use(std::nullopt);
                 return;
             }
@@ -1382 +1382 @@
         {
             if (!m_client.decidePolicyForResponse_deprecatedForUseWithV0 && !m_client.decidePolicyForResponse) {
-                listener->use({ });
+                listener->use(std::nullopt);
                 return;
             }
@@ -2144 +2144 @@
         {
             if (!m_client.decidePolicyForNavigationAction) {
-                listener->use({ });
+                listener->use(std::nullopt);
                 return;
             }
@@ -2153 +2153 @@
         {
             if (!m_client.decidePolicyForNavigationResponse) {
-                listener->use({ });
+                listener->use(std::nullopt);
                 return;
             }

trunk/Source/WebKit/UIProcess/API/C/WKWebsitePolicies.cpp

@@ -28 +28 @@
 
 #include "APIDictionary.h"
-#include "APIWebsitePolicies.h"
 #include "WKAPICast.h"
 #include "WKArray.h"
@@ -39 +38 @@
 WKTypeID WKWebsitePoliciesGetTypeID()
 {
-    return toAPI(API::WebsitePolicies::APIType);
+    return toAPI(WebsitePolicies::APIType);
 }
 
 WKWebsitePoliciesRef WKWebsitePoliciesCreate()
 {
-    return toAPI(&API::WebsitePolicies::create().leakRef());
+    return toAPI(&WebsitePolicies::create().leakRef());
 }
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -4234 +4234 @@
 - (void)_updateWebsitePolicies:(_WKWebsitePolicies *)websitePolicies
 {
-    _page->updateWebsitePolicies(websitePolicies->_websitePolicies->websitePolicies());
+    _page->updateWebsitePolicies(WebKit::WebsitePoliciesData::fromWebsitePolicies(*websitePolicies->_websitePolicies));
 }
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePolicies.mm

@@ -33 +33 @@
 - (void)dealloc
 {
-    _websitePolicies->API::WebsitePolicies::~WebsitePolicies();
+    _websitePolicies->WebKit::WebsitePolicies::~WebsitePolicies();
     
     [super dealloc];
@@ -43 +43 @@
         return nil;
     
-    API::Object::constructInWrapper<API::WebsitePolicies>(self);
+    API::Object::constructInWrapper<WebKit::WebsitePolicies>(self);
     
     return self;

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePoliciesInternal.h

@@ -28 +28 @@
 #if WK_API_ENABLED
 
-#import "APIWebsitePolicies.h"
 #import "WKObject.h"
+#import "WebsitePolicies.h"
 
 namespace WebKit {
 
-inline _WKWebsitePolicies *wrapper(API::WebsitePolicies& websitePolicies)
+inline _WKWebsitePolicies *wrapper(WebsitePolicies& websitePolicies)
 {
     ASSERT([websitePolicies.wrapper() isKindOfClass:[_WKWebsitePolicies class]]);
@@ -43 +43 @@
 @interface _WKWebsitePolicies () <WKObject> {
 @package
-    API::ObjectStorage<API::WebsitePolicies> _websitePolicies;
+    API::ObjectStorage<WebKit::WebsitePolicies> _websitePolicies;
 }
 @end

trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm

@@ -428 +428 @@
 
             if (!navigationAction->targetFrame()) {
-                listener->use({ });
+                listener->use(std::nullopt);
                 return;
             }
@@ -437 +437 @@
                     listener->download();
                 else
-                    listener->use({ });
+                    listener->use(std::nullopt);
                 return;
             }
@@ -466 +466 @@
         checker->didCallCompletionHandler();
 
-        std::optional<WebsitePolicies> policies;
+        std::optional<WebsitePoliciesData> data;
         if (websitePolicies)
-            policies = websitePolicies->_websitePolicies->websitePolicies();
+            data = WebsitePoliciesData::fromWebsitePolicies(*websitePolicies->_websitePolicies);
 
         switch (actionPolicy) {
         case WKNavigationActionPolicyAllow:
-            tryAppLink(WTFMove(navigationAction), mainFrameURLString, [localListener = WTFMove(localListener), policies = WTFMove(policies)](bool followedLinkToApp) mutable {
+            tryAppLink(WTFMove(navigationAction), mainFrameURLString, [localListener = WTFMove(localListener), data = WTFMove(data)](bool followedLinkToApp) mutable {
                 if (followedLinkToApp) {
                     localListener->ignore();
@@ -478 +478 @@
                 }
 
-                localListener->use(WTFMove(policies));
+                localListener->use(WTFMove(data));
             });
         
@@ -495 +495 @@
         case _WKNavigationActionPolicyAllowWithoutTryingAppLink:
 #pragma clang diagnostic pop
-            localListener->use(WTFMove(policies));
+            localListener->use(WTFMove(data));
             break;
         }
@@ -545 +545 @@
 
             if (exists && !isDirectory && navigationResponse->canShowMIMEType())
-                listener->use({ });
+                listener->use(std::nullopt);
             else
                 listener->ignore();
@@ -552 +552 @@
 
         if (navigationResponse->canShowMIMEType())
-            listener->use({ });
+            listener->use(std::nullopt);
         else
             listener->ignore();
@@ -571 +571 @@
         switch (responsePolicy) {
         case WKNavigationResponsePolicyAllow:
-            localListener->use({ });
+            localListener->use(std::nullopt);
             break;
 

trunk/Source/WebKit/UIProcess/WebFrameListenerProxy.cpp

@@ -28 +28 @@
 
 #include "WebFrameProxy.h"
-#include "WebsitePolicies.h"
+#include "WebsitePoliciesData.h"
 
 namespace WebKit {
@@ -47 +47 @@
 }
 
-void WebFrameListenerProxy::receivedPolicyDecision(WebCore::PolicyAction action, std::optional<WebsitePolicies>&& websitePolicies)
+void WebFrameListenerProxy::receivedPolicyDecision(WebCore::PolicyAction action, std::optional<WebsitePoliciesData>&& data)
 {
     if (!m_frame)
         return;
 
-    m_frame->receivedPolicyDecision(action, m_listenerID, m_navigation.get(), WTFMove(websitePolicies));
+    m_frame->receivedPolicyDecision(action, m_listenerID, m_navigation.get(), WTFMove(data));
     m_frame = nullptr;
 }

trunk/Source/WebKit/UIProcess/WebFrameListenerProxy.h

@@ -35 +35 @@
 
 class WebFrameProxy;
-class WebsitePolicies;
+struct WebsitePoliciesData;
 
 class WebFrameListenerProxy : public API::Object {
@@ -49 +49 @@
     WebFrameListenerProxy(WebFrameProxy*, uint64_t listenerID);
 
-    void receivedPolicyDecision(WebCore::PolicyAction, std::optional<WebsitePolicies>&&);
+    void receivedPolicyDecision(WebCore::PolicyAction, std::optional<WebsitePoliciesData>&&);
 
 private:

trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp

@@ -28 +28 @@
 
 #include "WebFrameProxy.h"
-#include "WebsitePolicies.h"
+#include "WebsitePoliciesData.h"
 
 namespace WebKit {
@@ -37 +37 @@
 }
 
-void WebFramePolicyListenerProxy::use(std::optional<WebsitePolicies>&& websitePolicies)
+void WebFramePolicyListenerProxy::use(std::optional<WebsitePoliciesData>&& data)
 {
-    receivedPolicyDecision(WebCore::PolicyAction::Use, WTFMove(websitePolicies));
+    receivedPolicyDecision(WebCore::PolicyAction::Use, WTFMove(data));
 }
 
 void WebFramePolicyListenerProxy::download()
 {
-    receivedPolicyDecision(WebCore::PolicyAction::Download, { });
+    receivedPolicyDecision(WebCore::PolicyAction::Download, std::nullopt);
 }
 
 void WebFramePolicyListenerProxy::ignore()
 {
-    receivedPolicyDecision(WebCore::PolicyAction::Ignore, { });
+    receivedPolicyDecision(WebCore::PolicyAction::Ignore, std::nullopt);
 }
 

trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h

@@ -45 +45 @@
     }
 
-    void use(std::optional<WebsitePolicies>&&);
+    void use(std::optional<WebsitePoliciesData>&&);
     void download();
     void ignore();

trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp

@@ -33 +33 @@
 #include "WebPasteboardProxy.h"
 #include "WebProcessPool.h"
+#include "WebsitePoliciesData.h"
 #include <WebCore/Image.h>
 #include <WebCore/MIMETypeRegistry.h>
@@ -176 +177 @@
 }
 
-void WebFrameProxy::receivedPolicyDecision(PolicyAction action, uint64_t listenerID, API::Navigation* navigation, std::optional<WebsitePolicies>&& websitePolicies)
+void WebFrameProxy::receivedPolicyDecision(PolicyAction action, uint64_t listenerID, API::Navigation* navigation, std::optional<WebsitePoliciesData>&& data)
 {
     if (!m_page)
@@ -183 +184 @@
     ASSERT(m_activeListener);
     ASSERT(m_activeListener->listenerID() == listenerID);
-    m_page->receivedPolicyDecision(action, *this, listenerID, navigation, WTFMove(websitePolicies));
+    m_page->receivedPolicyDecision(action, *this, listenerID, navigation, WTFMove(data));
 }
 

trunk/Source/WebKit/UIProcess/WebFrameProxy.h

@@ -52 +52 @@
 class WebFramePolicyListenerProxy;
 class WebPageProxy;
-class WebsitePolicies;
+struct WebsitePoliciesData;
 
 typedef GenericCallback<API::Data*> DataCallback;
@@ -115 +115 @@
 
     // Policy operations.
-    void receivedPolicyDecision(WebCore::PolicyAction, uint64_t listenerID, API::Navigation*, std::optional<WebsitePolicies>&&);
+    void receivedPolicyDecision(WebCore::PolicyAction, uint64_t listenerID, API::Navigation*, std::optional<WebsitePoliciesData>&&);
     WebFramePolicyListenerProxy& setUpPolicyListenerProxy(uint64_t listenerID);
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -2276 +2276 @@
 }
 
-void WebPageProxy::receivedPolicyDecision(PolicyAction action, WebFrameProxy& frame, uint64_t listenerID, API::Navigation* navigation, std::optional<WebsitePolicies>&& websitePolicies)
+void WebPageProxy::receivedPolicyDecision(PolicyAction action, WebFrameProxy& frame, uint64_t listenerID, API::Navigation* navigation, std::optional<WebsitePoliciesData>&& websitePolicies)
 {
     if (!isValid())
@@ -2318 +2318 @@
         m_syncNavigationActionPolicyAction = action;
         m_syncNavigationActionPolicyDownloadID = downloadID;
-        m_syncNavigationActionPolicyWebsitePolicies = websitePolicies;
+        m_syncNavigationActionPolicyWebsitePolicies = WTFMove(websitePolicies);
         return;
     }
@@ -3686 +3686 @@
 }
 
-void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, NavigationActionData&& navigationActionData, const FrameInfoData& originatingFrameInfoData, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, ResourceRequest&& request, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& newNavigationID, WebCore::PolicyAction& policyAction, DownloadID& downloadID, std::optional<WebsitePolicies>& websitePolicies)
+void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, NavigationActionData&& navigationActionData, const FrameInfoData& originatingFrameInfoData, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, ResourceRequest&& request, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& newNavigationID, WebCore::PolicyAction& policyAction, DownloadID& downloadID, std::optional<WebsitePoliciesData>& websitePolicies)
 {
     PageClientProtector protector(m_pageClient);
@@ -3755 +3755 @@
         policyAction = m_syncNavigationActionPolicyAction;
         downloadID = m_syncNavigationActionPolicyDownloadID;
-        websitePolicies = m_syncNavigationActionPolicyWebsitePolicies;
+        websitePolicies = WTFMove(m_syncNavigationActionPolicyWebsitePolicies);
     }
 }
@@ -6152 +6152 @@
 }
 
-void WebPageProxy::updateWebsitePolicies(const WebsitePolicies& websitePolicies)
+void WebPageProxy::updateWebsitePolicies(WebsitePoliciesData&& websitePolicies)
 {
     m_process->send(Messages::WebPage::UpdateWebsitePolicies(websitePolicies), m_pageID);

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -63 +63 @@
 #include "WebPopupMenuProxy.h"
 #include "WebProcessLifetimeTracker.h"
-#include "WebsitePolicies.h"
+#include "WebsitePoliciesData.h"
 #include <WebCore/ActivityState.h>
 #include <WebCore/AutoplayEvent.h>
@@ -434 +434 @@
     bool willHandleHorizontalScrollEvents() const;
 
-    void updateWebsitePolicies(const WebsitePolicies&);
+    void updateWebsitePolicies(WebsitePoliciesData&&);
 
     bool canShowMIMEType(const String& mimeType);
@@ -844 +844 @@
 #endif
 
-    void receivedPolicyDecision(WebCore::PolicyAction, WebFrameProxy&, uint64_t listenerID, API::Navigation* navigationID, std::optional<WebsitePolicies>&&);
+    void receivedPolicyDecision(WebCore::PolicyAction, WebFrameProxy&, uint64_t listenerID, API::Navigation* navigationID, std::optional<WebsitePoliciesData>&&);
 
     void backForwardRemovedItem(uint64_t itemID);
@@ -1327 +1327 @@
     void didDestroyNavigation(uint64_t navigationID);
 
-    void decidePolicyForNavigationAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, NavigationActionData&&, const FrameInfoData&, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&&, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& newNavigationID, WebCore::PolicyAction&, DownloadID&, std::optional<WebsitePolicies>&);
+    void decidePolicyForNavigationAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, NavigationActionData&&, const FrameInfoData&, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&&, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& newNavigationID, WebCore::PolicyAction&, DownloadID&, std::optional<WebsitePoliciesData>&);
     void decidePolicyForNewWindowAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, NavigationActionData&&, WebCore::ResourceRequest&&, const String& frameName, uint64_t listenerID, const UserData&);
     void decidePolicyForResponse(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&);
@@ -1868 +1868 @@
     WebCore::PolicyAction m_syncNavigationActionPolicyAction { WebCore::PolicyAction::Use };
     DownloadID m_syncNavigationActionPolicyDownloadID { 0 };
-    std::optional<WebsitePolicies> m_syncNavigationActionPolicyWebsitePolicies;
+    std::optional<WebsitePoliciesData> m_syncNavigationActionPolicyWebsitePolicies;
 
     bool m_shouldSuppressAppLinksInNextNavigationPolicyDecision { false };

trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in

@@ -100 +100 @@
     # Policy messages
     DecidePolicyForResponseSync(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, enum WebCore::PolicyAction policyAction, WebKit::DownloadID downloadID)
-    DecidePolicyForNavigationAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, struct WebKit::FrameInfoData originatingFrameInfoData, uint64_t originatingPageID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, enum WebCore::PolicyAction policyAction, WebKit::DownloadID downloadID, std::optional<WebKit::WebsitePolicies> websitePolicies)
+    DecidePolicyForNavigationAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, struct WebKit::FrameInfoData originatingFrameInfoData, uint64_t originatingPageID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, enum WebCore::PolicyAction policyAction, WebKit::DownloadID downloadID, std::optional<WebKit::WebsitePoliciesData> websitePolicies)
     DecidePolicyForNewWindowAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, struct WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::UserData userData)
     UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::UserData userData)

trunk/Source/WebKit/UIProcess/WebsitePolicies.h

@@ -26 +26 @@
 #pragma once
 
+#include "APIObject.h"
 #include <WebCore/HTTPHeaderField.h>
 #include <wtf/EnumTraits.h>
@@ -56 +57 @@
 };
 
-class WebsitePolicies {
+class WebsitePolicies final : public API::ObjectImpl<API::Object::Type::WebsitePolicies> {
 public:
+    static Ref<WebsitePolicies> create() { return adoptRef(*new WebsitePolicies); }
     WebsitePolicies() = default;
 
@@ -69 +71 @@
     void setAutoplayPolicy(WebsiteAutoplayPolicy policy) { m_autoplayPolicy = policy; }
     
-    const Vector<WebCore::HTTPHeaderField>& customHeaderFields() { return m_customHeaderFields; }
+    const Vector<WebCore::HTTPHeaderField>& customHeaderFields() const { return m_customHeaderFields; }
     Vector<WebCore::HTTPHeaderField>&& takeCustomHeaderFields() { return WTFMove(m_customHeaderFields); }
     void setCustomHeaderFields(Vector<WebCore::HTTPHeaderField>&& fields) { m_customHeaderFields = WTFMove(fields); }
-    
-    static void applyToDocumentLoader(WebsitePolicies&&, WebCore::DocumentLoader&);
-    
-    void encode(IPC::Encoder&) const;
-    static std::optional<WebsitePolicies> decode(IPC::Decoder&);
 
 private:
-    WebsitePolicies(bool, OptionSet<WebsiteAutoplayQuirk>, WebsiteAutoplayPolicy, Vector<WebCore::HTTPHeaderField>&&);
+    WebsitePolicies(bool contentBlockersEnabled, OptionSet<WebsiteAutoplayQuirk> allowedAutoplayQuirks, WebsiteAutoplayPolicy autoplayPolicy, Vector<WebCore::HTTPHeaderField>&& customHeaderFields)
+        : m_contentBlockersEnabled(contentBlockersEnabled)
+        , m_allowedAutoplayQuirks(allowedAutoplayQuirks)
+        , m_autoplayPolicy(autoplayPolicy)
+        , m_customHeaderFields(WTFMove(customHeaderFields))
+    { }
 
     bool m_contentBlockersEnabled { true };

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1185 +1185 @@
                 5C0B177C1E7C885400E9123C /* WebSocketStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0B177A1E7C884F00E9123C /* WebSocketStream.cpp */; };
                 5C0B17811E7C8C2600E9123C /* NetworkSocketStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0B177D1E7C886700E9123C /* NetworkSocketStream.cpp */; };
+                5C13024C1FE35154000D9B31 /* WebsitePolicies.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C13024B1FE35142000D9B31 /* WebsitePolicies.h */; };
                 5C1426EC1C23F80900D41183 /* NetworkProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426E21C23F80500D41183 /* NetworkProcessCreationParameters.cpp */; };
                 5C1426ED1C23F80900D41183 /* NetworkProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426E31C23F80500D41183 /* NetworkProcessCreationParameters.h */; };
@@ -1205 +1206 @@
                 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */; };
                 5C298DA01C3DF02100470AFE /* PendingDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C298D9E1C3DEF2900470AFE /* PendingDownload.h */; };
-                5C3AEA8F1FE1F21F002318D3 /* WebsitePolicies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C3AEA8E1FE1F1DF002318D3 /* WebsitePolicies.cpp */; };
+                5C3AEA8F1FE1F21F002318D3 /* WebsitePoliciesData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C3AEA8E1FE1F1DF002318D3 /* WebsitePoliciesData.cpp */; };
                 5C62FDF91EFC271C00CE072E /* WKURLSchemeTaskPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 5C6CE6D11F59BC7A0007C6CB /* PageClientImplCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C6CE6D01F59BC460007C6CB /* PageClientImplCocoa.mm */; };
@@ -1215 +1216 @@
                 5CB2378C1DF0DE6E00117AA3 /* _WKWebsitePolicies.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB237891DF0DD4300117AA3 /* _WKWebsitePolicies.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 5CB2378E1DF0E0D300117AA3 /* _WKWebsitePoliciesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB2378D1DF0E0C200117AA3 /* _WKWebsitePoliciesInternal.h */; };
-                5CB237911DF0E2E600117AA3 /* APIWebsitePolicies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB237901DF0E1DD00117AA3 /* APIWebsitePolicies.cpp */; };
-                5CB237921DF0E2EE00117AA3 /* APIWebsitePolicies.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB2378F1DF0E1B800117AA3 /* APIWebsitePolicies.h */; };
                 5CBC9B8D1C65279C00A8FDCF /* NetworkDataTaskCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CBC9B8B1C65257300A8FDCF /* NetworkDataTaskCocoa.mm */; };
                 5CBC9B8E1C652CA000A8FDCF /* NetworkDataTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CBC9B891C6524A500A8FDCF /* NetworkDataTask.h */; };
@@ -3574 +3573 @@
                 5C0B177F1E7C886700E9123C /* NetworkSocketStream.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkSocketStream.messages.in; path = NetworkProcess/NetworkSocketStream.messages.in; sourceTree = "<group>"; };
                 5C0B17801E7C888000E9123C /* WebSocketStream.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebSocketStream.messages.in; path = Network/WebSocketStream.messages.in; sourceTree = "<group>"; };
+                5C13024A1FE341A7000D9B31 /* WebsitePoliciesData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsitePoliciesData.h; sourceTree = "<group>"; };
+                5C13024B1FE35142000D9B31 /* WebsitePolicies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsitePolicies.h; sourceTree = "<group>"; };
                 5C1426E21C23F80500D41183 /* NetworkProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessCreationParameters.cpp; path = NetworkProcess/NetworkProcessCreationParameters.cpp; sourceTree = "<group>"; };
                 5C1426E31C23F80500D41183 /* NetworkProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessCreationParameters.h; path = NetworkProcess/NetworkProcessCreationParameters.h; sourceTree = "<group>"; };
@@ -3595 +3596 @@
                 5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkSession.h; path = NetworkProcess/NetworkSession.h; sourceTree = "<group>"; };
                 5C298D9E1C3DEF2900470AFE /* PendingDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PendingDownload.h; path = NetworkProcess/Downloads/PendingDownload.h; sourceTree = "<group>"; };
-                5C3AEA8E1FE1F1DF002318D3 /* WebsitePolicies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebsitePolicies.cpp; sourceTree = "<group>"; };
+                5C3AEA8E1FE1F1DF002318D3 /* WebsitePoliciesData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebsitePoliciesData.cpp; sourceTree = "<group>"; };
                 5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKURLSchemeTaskPrivate.h; sourceTree = "<group>"; };
                 5C6CE6D01F59BC460007C6CB /* PageClientImplCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageClientImplCocoa.mm; sourceTree = "<group>"; };
@@ -3603 +3604 @@
                 5C84CF901F96AC4E00B6705A /* NetworkSessionCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkSessionCreationParameters.h; path = NetworkProcess/NetworkSessionCreationParameters.h; sourceTree = "<group>"; };
                 5C85C7861C3F23C50061A4FA /* PendingDownload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PendingDownload.cpp; path = NetworkProcess/Downloads/PendingDownload.cpp; sourceTree = "<group>"; };
-                5C9E567F1DF7930900C9EE33 /* WebsitePolicies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsitePolicies.h; sourceTree = "<group>"; };
                 5C9E56801DF7F05500C9EE33 /* WKWebsitePolicies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebsitePolicies.cpp; sourceTree = "<group>"; };
                 5C9E56811DF7F05500C9EE33 /* WKWebsitePolicies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebsitePolicies.h; sourceTree = "<group>"; };
@@ -3609 +3609 @@
                 5CB2378A1DF0DD4300117AA3 /* _WKWebsitePolicies.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKWebsitePolicies.mm; sourceTree = "<group>"; };
                 5CB2378D1DF0E0C200117AA3 /* _WKWebsitePoliciesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebsitePoliciesInternal.h; sourceTree = "<group>"; };
-                5CB2378F1DF0E1B800117AA3 /* APIWebsitePolicies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebsitePolicies.h; sourceTree = "<group>"; };
-                5CB237901DF0E1DD00117AA3 /* APIWebsitePolicies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIWebsitePolicies.cpp; sourceTree = "<group>"; };
                 5CBC9B891C6524A500A8FDCF /* NetworkDataTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkDataTask.h; path = NetworkProcess/NetworkDataTask.h; sourceTree = "<group>"; };
                 5CBC9B8B1C65257300A8FDCF /* NetworkDataTaskCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkDataTaskCocoa.mm; path = NetworkProcess/cocoa/NetworkDataTaskCocoa.mm; sourceTree = "<group>"; };
@@ -5217 +5215 @@
                                 511F7D3F1EB1BCEE00E47B83 /* WebsiteDataStoreParameters.cpp */,
                                 511F7D401EB1BCEE00E47B83 /* WebsiteDataStoreParameters.h */,
-                                5C3AEA8E1FE1F1DF002318D3 /* WebsitePolicies.cpp */,
-                                5C9E567F1DF7930900C9EE33 /* WebsitePolicies.h */,
+                                5C3AEA8E1FE1F1DF002318D3 /* WebsitePoliciesData.cpp */,
+                                5C13024A1FE341A7000D9B31 /* WebsitePoliciesData.h */,
                                 8360349D1ACB34D600626549 /* WebSQLiteDatabaseTracker.cpp */,
                                 8360349E1ACB34D600626549 /* WebSQLiteDatabaseTracker.h */,
@@ -7196 +7194 @@
                                 6B821DDB1EEF05DD00D7AF4A /* WebResourceLoadStatisticsTelemetry.cpp */,
                                 6B821DDA1EEF05DD00D7AF4A /* WebResourceLoadStatisticsTelemetry.h */,
+                                5C13024B1FE35142000D9B31 /* WebsitePolicies.h */,
                                 51D124241E6D3CC3002B2820 /* WebURLSchemeHandler.cpp */,
                                 51D124251E6D3CC3002B2820 /* WebURLSchemeHandler.h */,
@@ -7276 +7275 @@
                                 1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */,
                                 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */,
-                                5CB237901DF0E1DD00117AA3 /* APIWebsitePolicies.cpp */,
-                                5CB2378F1DF0E1B800117AA3 /* APIWebsitePolicies.h */,
                                 1A6563E21B7A8C50009CF787 /* APIWindowFeatures.cpp */,
                                 1A6563E31B7A8C50009CF787 /* APIWindowFeatures.h */,
@@ -8621 +8618 @@
                                 1AE286841C7F93860069AC4F /* APIWebsiteDataRecord.h in Headers */,
                                 1A3635AA1A3144A300ED6197 /* APIWebsiteDataStore.h in Headers */,
-                                5CB237921DF0E2EE00117AA3 /* APIWebsitePolicies.h in Headers */,
                                 1A6563E51B7A8C50009CF787 /* APIWindowFeatures.h in Headers */,
                                 1AD4C1931B39F33200ABC28E /* ApplicationStateTracker.h in Headers */,
@@ -9168 +9164 @@
                                 1A53C2AA1A325730004E8C70 /* WebsiteDataStore.h in Headers */,
                                 511F7D411EB1BCF500E47B83 /* WebsiteDataStoreParameters.h in Headers */,
+                                5C13024C1FE35154000D9B31 /* WebsitePolicies.h in Headers */,
                                 836034A01ACB34D600626549 /* WebSQLiteDatabaseTracker.h in Headers */,
                                 1A52C0F81A38CDC70016160A /* WebStorageNamespaceProvider.h in Headers */,
@@ -10203 +10200 @@
                                 1A3635A91A3144A300ED6197 /* APIWebsiteDataStore.cpp in Sources */,
                                 1A3635AD1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm in Sources */,
-                                5CB237911DF0E2E600117AA3 /* APIWebsitePolicies.cpp in Sources */,
                                 1A6563E41B7A8C50009CF787 /* APIWindowFeatures.cpp in Sources */,
                                 1AD4C1921B39F33200ABC28E /* ApplicationStateTracker.mm in Sources */,
@@ -10836 +10832 @@
                                 1A4832C31A965A3C008B4DFE /* WebsiteDataStoreCocoa.mm in Sources */,
                                 511F7D421EB1BCF800E47B83 /* WebsiteDataStoreParameters.cpp in Sources */,
-                                5C3AEA8F1FE1F21F002318D3 /* WebsitePolicies.cpp in Sources */,
+                                5C3AEA8F1FE1F21F002318D3 /* WebsitePoliciesData.cpp in Sources */,
                                 5C7706741D1138380012700F /* WebSocketProvider.cpp in Sources */,
                                 5C0B177C1E7C885400E9123C /* WebSocketStream.cpp in Sources */,

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -55 +55 @@
 #include "WebProcess.h"
 #include "WebProcessPoolMessages.h"
-#include "WebsitePolicies.h"
+#include "WebsitePoliciesData.h"
 #include <JavaScriptCore/APICast.h>
 #include <JavaScriptCore/JSObject.h>
@@ -777 +777 @@
 }
 
-void WebFrameLoaderClient::applyToDocumentLoader(WebsitePolicies&& websitePolicies)
+void WebFrameLoaderClient::applyToDocumentLoader(WebsitePoliciesData&& websitePolicies)
 {
     if (!m_frame)
@@ -792 +792 @@
         return;
 
-    WebsitePolicies::applyToDocumentLoader(WTFMove(websitePolicies), *documentLoader);
+    WebsitePoliciesData::applyToDocumentLoader(WTFMove(websitePolicies), *documentLoader);
 }
 
@@ -863 +863 @@
     // Notify the UIProcess.
     Ref<WebFrame> protect(*m_frame);
-    std::optional<WebsitePolicies> websitePolicies;
+    std::optional<WebsitePoliciesData> websitePolicies;
     if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), documentLoader->navigationID(), navigationActionData, originatingFrameInfoData, originatingFrame && originatingFrame->page() ? originatingFrame->page()->pageID() : 0, navigationAction.resourceRequest(), request, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID, websitePolicies))) {
         m_frame->didReceivePolicyDecision(listenerID, PolicyAction::Ignore, 0, { }, { });

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h

@@ -36 +36 @@
 class PluginView;
 class WebFrame;
-class WebsitePolicies;
+struct WebsitePoliciesData;
     
 class WebFrameLoaderClient final : public WebCore::FrameLoaderClient {
@@ -50 +50 @@
     void setUseIconLoadingClient(bool useIconLoadingClient) { m_useIconLoadingClient = useIconLoadingClient; }
 
-    void applyToDocumentLoader(WebsitePolicies&&);
+    void applyToDocumentLoader(WebsitePoliciesData&&);
 
     std::optional<uint64_t> pageID() const final;

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

@@ -46 +46 @@
 #include "WebPageProxyMessages.h"
 #include "WebProcess.h"
+#include "WebsitePoliciesData.h"
 #include <JavaScriptCore/APICast.h>
 #include <JavaScriptCore/JSContextRef.h>
@@ -252 +253 @@
 }
 
-void WebFrame::didReceivePolicyDecision(uint64_t listenerID, PolicyAction action, uint64_t navigationID, DownloadID downloadID, std::optional<WebsitePolicies>&& websitePolicies)
+void WebFrame::didReceivePolicyDecision(uint64_t listenerID, PolicyAction action, uint64_t navigationID, DownloadID downloadID, std::optional<WebsitePoliciesData>&& websitePolicies)
 {
     if (!m_coreFrame)

trunk/Source/WebKit/WebProcess/WebPage/WebFrame.h

@@ -64 +64 @@
 class InjectedBundleScriptWorld;
 class WebPage;
-class WebsitePolicies;
 struct FrameInfoData;
+struct WebsitePoliciesData;
 
 class WebFrame : public API::ObjectImpl<API::Object::Type::BundleFrame> {
@@ -87 +87 @@
     uint64_t setUpPolicyListener(WebCore::FramePolicyFunction&&, ForNavigationAction);
     void invalidatePolicyListener();
-    void didReceivePolicyDecision(uint64_t listenerID, WebCore::PolicyAction, uint64_t navigationID, DownloadID, std::optional<WebsitePolicies>&&);
+    void didReceivePolicyDecision(uint64_t listenerID, WebCore::PolicyAction, uint64_t navigationID, DownloadID, std::optional<WebsitePoliciesData>&&);
 
     uint64_t setUpWillSubmitFormListener(WTF::Function<void(void)>&&);

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

@@ -31 +31 @@
 #include "APIArray.h"
 #include "APIGeometry.h"
-#include "APIWebsitePolicies.h"
 #include "AssistedNodeInformation.h"
 #include "DataReference.h"
@@ -123 +122 @@
 #include "WebValidationMessageClient.h"
 #include "WebsiteDataStoreParameters.h"
+#include "WebsitePolicies.h"
 #include <JavaScriptCore/APICast.h>
 #include <WebCore/ApplicationCacheStorage.h>
@@ -2747 +2747 @@
 }
 
-void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, PolicyAction policyAction, uint64_t navigationID, const DownloadID& downloadID, std::optional<WebsitePolicies>&& websitePolicies)
+void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, PolicyAction policyAction, uint64_t navigationID, const DownloadID& downloadID, std::optional<WebsitePoliciesData>&& websitePolicies)
 {
     WebFrame* frame = WebProcess::singleton().webFrame(frameID);
@@ -5439 +5439 @@
 }
 
-void WebPage::updateWebsitePolicies(WebsitePolicies&& websitePolicies)
+void WebPage::updateWebsitePolicies(WebsitePoliciesData&& websitePolicies)
 {
     if (!m_page)
@@ -5448 +5448 @@
         return;
 
-    WebsitePolicies::applyToDocumentLoader(WTFMove(websitePolicies), *documentLoader);
+    WebsitePoliciesData::applyToDocumentLoader(WTFMove(websitePolicies), *documentLoader);
     
 #if ENABLE(VIDEO)

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -211 +211 @@
 class WebWheelEvent;
 class WebTouchEvent;
-class WebsitePolicies;
 class RemoteLayerTreeTransaction;
 
@@ -225 +224 @@
 struct WebPreferencesStore;
 struct WebSelectionData;
+struct WebsitePoliciesData;
 
 enum class DragControllerAction;
@@ -1190 +1190 @@
     void updatePreferencesGenerated(const WebPreferencesStore&);
 
-    void didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, WebCore::PolicyAction, uint64_t navigationID, const DownloadID&, std::optional<WebsitePolicies>&&);
+    void didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, WebCore::PolicyAction, uint64_t navigationID, const DownloadID&, std::optional<WebsitePoliciesData>&&);
     void continueWillSubmitForm(uint64_t frameID, uint64_t listenerID);
     void setUserAgent(const String&);
@@ -1299 +1299 @@
     void reportUsedFeatures();
 
-    void updateWebsitePolicies(WebsitePolicies&&);
+    void updateWebsitePolicies(WebsitePoliciesData&&);
 
 #if PLATFORM(MAC)

trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in

@@ -151 +151 @@
     DidRemoveBackForwardItem(uint64_t backForwardItemID)
 
-    UpdateWebsitePolicies(WebKit::WebsitePolicies websitePolicies)
-    DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, enum WebCore::PolicyAction policyAction, uint64_t navigationID, WebKit::DownloadID downloadID, std::optional<WebKit::WebsitePolicies> websitePolicies)
+    UpdateWebsitePolicies(struct WebKit::WebsitePoliciesData websitePolicies)
+    DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, enum WebCore::PolicyAction policyAction, uint64_t navigationID, WebKit::DownloadID downloadID, std::optional<WebKit::WebsitePoliciesData> websitePolicies)
     ContinueWillSubmitForm(uint64_t frameID, uint64_t listenerID)