Changeset 225977 in webkit


Ignore:
Timestamp:
Dec 15, 2017, 11:58:02 AM (7 years ago)
Author:
achristensen@apple.com
Message:

Move WebKit::WebsitePolicies to API::WebsitePolicies
​https://bugs.webkit.org/show_bug.cgi?id=180873

Reviewed by Joseph Pecoraro.

It's just an API data object now. I need it to be in the API namespace so we can
give it references to other API namespace objects without weird layering violations.

  • CMakeLists.txt:
  • Shared/WebsiteAutoplayPolicy.h: Added.
  • Shared/WebsiteAutoplayQuirk.h: Added.
  • Shared/WebsitePoliciesData.cpp:

(WebKit::WebsitePoliciesData::fromWebsitePolicies): Deleted.

  • Shared/WebsitePoliciesData.h:
  • UIProcess/API/APIWebsitePolicies.cpp: Added.

(API::WebsitePolicies::~WebsitePolicies):
(API::WebsitePolicies::data):

  • UIProcess/API/APIWebsitePolicies.h: Copied from Source/WebKit/UIProcess/WebsitePolicies.h.
  • UIProcess/API/C/WKAPICast.h:
  • UIProcess/API/C/WKFramePolicyListener.cpp:

(WKFramePolicyListenerUseWithPolicies):

  • UIProcess/API/C/WKPage.cpp:

(WKPageUpdateWebsitePolicies):

  • UIProcess/API/C/WKWebsitePolicies.cpp:

(WKWebsitePoliciesGetTypeID):
(WKWebsitePoliciesCreate):

  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _updateWebsitePolicies:]):

  • UIProcess/API/Cocoa/_WKWebsitePolicies.h:
  • UIProcess/API/Cocoa/_WKWebsitePolicies.mm:

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

  • UIProcess/API/Cocoa/_WKWebsitePoliciesInternal.h:

(WebKit::wrapper): Deleted.

  • UIProcess/Cocoa/NavigationState.mm:

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

  • UIProcess/WebFormSubmissionListenerProxy.cpp:
  • UIProcess/WebsitePolicies.h: Removed.
  • WebKit.xcodeproj/project.pbxproj:
  • WebProcess/WebPage/WebPage.cpp:
Location:
trunk/Source/WebKit
Files:
3 added
16 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/CMakeLists.txt

    r225954 r225977  
    359359    UIProcess/API/APIUserStyleSheet.cpp
    360360    UIProcess/API/APIWebsiteDataStore.cpp
     361    UIProcess/API/APIWebsitePolicies.cpp
    361362    UIProcess/API/APIWindowFeatures.cpp
    362363

  • trunk/Source/WebKit/ChangeLog

    r225967 r225977  
     12017-12-15  Alex Christensen  <achristensen@webkit.org>
     2
     3        Move WebKit::WebsitePolicies to API::WebsitePolicies
     4        https://bugs.webkit.org/show_bug.cgi?id=180873
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        It's just an API data object now.  I need it to be in the API namespace so we can
     9        give it references to other API namespace objects without weird layering violations.
     10
     11        * CMakeLists.txt:
     12        * Shared/WebsiteAutoplayPolicy.h: Added.
     13        * Shared/WebsiteAutoplayQuirk.h: Added.
     14        * Shared/WebsitePoliciesData.cpp:
     15        (WebKit::WebsitePoliciesData::fromWebsitePolicies): Deleted.
     16        * Shared/WebsitePoliciesData.h:
     17        * UIProcess/API/APIWebsitePolicies.cpp: Added.
     18        (API::WebsitePolicies::~WebsitePolicies):
     19        (API::WebsitePolicies::data):
     20        * UIProcess/API/APIWebsitePolicies.h: Copied from Source/WebKit/UIProcess/WebsitePolicies.h.
     21        * UIProcess/API/C/WKAPICast.h:
     22        * UIProcess/API/C/WKFramePolicyListener.cpp:
     23        (WKFramePolicyListenerUseWithPolicies):
     24        * UIProcess/API/C/WKPage.cpp:
     25        (WKPageUpdateWebsitePolicies):
     26        * UIProcess/API/C/WKWebsitePolicies.cpp:
     27        (WKWebsitePoliciesGetTypeID):
     28        (WKWebsitePoliciesCreate):
     29        * UIProcess/API/Cocoa/WKWebView.mm:
     30        (-[WKWebView _updateWebsitePolicies:]):
     31        * UIProcess/API/Cocoa/_WKWebsitePolicies.h:
     32        * UIProcess/API/Cocoa/_WKWebsitePolicies.mm:
     33        (-[_WKWebsitePolicies dealloc]):
     34        (-[_WKWebsitePolicies init]):
     35        * UIProcess/API/Cocoa/_WKWebsitePoliciesInternal.h:
     36        (WebKit::wrapper): Deleted.
     37        * UIProcess/Cocoa/NavigationState.mm:
     38        (WebKit::NavigationState::NavigationClient::decidePolicyForNavigationAction):
     39        * UIProcess/WebFormSubmissionListenerProxy.cpp:
     40        * UIProcess/WebsitePolicies.h: Removed.
     41        * WebKit.xcodeproj/project.pbxproj:
     42        * WebProcess/WebPage/WebPage.cpp:
     43
    1442017-12-14  Zan Dobersek  <zdobersek@igalia.com>
    245

  • trunk/Source/WebKit/Shared/WebsitePoliciesData.cpp

    r225954 r225977  
    3131
    3232namespace WebKit {
    33 
    34 WebsitePoliciesData WebsitePoliciesData::fromWebsitePolicies(const WebsitePolicies& policies)
    35 {
    36     return { policies.contentBlockersEnabled(), policies.allowedAutoplayQuirks(), policies.autoplayPolicy(), policies.customHeaderFields() };
    37 }
    3833
    3934void WebsitePoliciesData::encode(IPC::Encoder& encoder) const

  • trunk/Source/WebKit/Shared/WebsitePoliciesData.h

    r225954 r225977  
    2626#pragma once
    2727
    28 #include "WebsitePolicies.h"
     28#include "WebsiteAutoplayPolicy.h"
     29#include "WebsiteAutoplayQuirk.h"
     30#include <WebCore/HTTPHeaderField.h>
     31#include <wtf/OptionSet.h>
     32
     33namespace IPC {
     34class Decoder;
     35class Encoder;
     36}
     37
     38namespace WebCore {
     39class DocumentLoader;
     40}
    2941
    3042namespace WebKit {
    3143
    3244struct WebsitePoliciesData {
    33     static WebsitePoliciesData fromWebsitePolicies(const WebsitePolicies&);
    3445    static void applyToDocumentLoader(WebsitePoliciesData&&, WebCore::DocumentLoader&);
    3546

  • trunk/Source/WebKit/UIProcess/API/APIWebsitePolicies.h

    r225976 r225977  
    2727
    2828#include "APIObject.h"
     29#include "WebsiteAutoplayPolicy.h"
     30#include "WebsiteAutoplayQuirk.h"
    2931#include <WebCore/HTTPHeaderField.h>
    3032#include <wtf/EnumTraits.h>
    … …  
    3335#include <wtf/Vector.h>
    3436
    35 namespace IPC {
    36 class Decoder;
    37 class Encoder;
     37namespace WebKit {
     38struct WebsitePoliciesData;
    3839}
    3940
    40 namespace WebCore {
    41 class DocumentLoader;
    42 }
    43 
    44 namespace WebKit {
    45 
    46 enum class WebsiteAutoplayPolicy {
    47     Default,
    48     Allow,
    49     AllowWithoutSound,
    50     Deny
    51 };
    52 
    53 enum class WebsiteAutoplayQuirk {
    54     SynthesizedPauseEvents = 1 << 0,
    55     InheritedUserGestures = 1 << 1,
    56     ArbitraryUserGestures = 1 << 2,
    57 };
     41namespace API {
    5842
    5943class WebsitePolicies final : public API::ObjectImpl<API::Object::Type::WebsitePolicies> {
    … …  
    6145    static Ref<WebsitePolicies> create() { return adoptRef(*new WebsitePolicies); }
    6246    WebsitePolicies() = default;
     47    ~WebsitePolicies();
    6348
    6449    bool contentBlockersEnabled() const { return m_contentBlockersEnabled; }
    6550    void setContentBlockersEnabled(bool enabled) { m_contentBlockersEnabled = enabled; }
    6651   
    67     OptionSet<WebsiteAutoplayQuirk> allowedAutoplayQuirks() const { return m_allowedAutoplayQuirks; }
    68     void setAllowedAutoplayQuirks(OptionSet<WebsiteAutoplayQuirk> quirks) { m_allowedAutoplayQuirks = quirks; }
     52    OptionSet<WebKit::WebsiteAutoplayQuirk> allowedAutoplayQuirks() const { return m_allowedAutoplayQuirks; }
     53    void setAllowedAutoplayQuirks(OptionSet<WebKit::WebsiteAutoplayQuirk> quirks) { m_allowedAutoplayQuirks = quirks; }
    6954   
    70     WebsiteAutoplayPolicy autoplayPolicy() const { return m_autoplayPolicy; }
    71     void setAutoplayPolicy(WebsiteAutoplayPolicy policy) { m_autoplayPolicy = policy; }
     55    WebKit::WebsiteAutoplayPolicy autoplayPolicy() const { return m_autoplayPolicy; }
     56    void setAutoplayPolicy(WebKit::WebsiteAutoplayPolicy policy) { m_autoplayPolicy = policy; }
    7257   
    7358    const Vector<WebCore::HTTPHeaderField>& customHeaderFields() const { return m_customHeaderFields; }
    … …  
    7560    void setCustomHeaderFields(Vector<WebCore::HTTPHeaderField>&& fields) { m_customHeaderFields = WTFMove(fields); }
    7661
     62    WebKit::WebsitePoliciesData data();
     63
    7764private:
    78     WebsitePolicies(bool contentBlockersEnabled, OptionSet<WebsiteAutoplayQuirk> allowedAutoplayQuirks, WebsiteAutoplayPolicy autoplayPolicy, Vector<WebCore::HTTPHeaderField>&& customHeaderFields)
     65    WebsitePolicies(bool contentBlockersEnabled, OptionSet<WebKit::WebsiteAutoplayQuirk> allowedAutoplayQuirks, WebKit::WebsiteAutoplayPolicy autoplayPolicy, Vector<WebCore::HTTPHeaderField>&& customHeaderFields)
    7966        : m_contentBlockersEnabled(contentBlockersEnabled)
    8067        , m_allowedAutoplayQuirks(allowedAutoplayQuirks)
    … …  
    8471
    8572    bool m_contentBlockersEnabled { true };
    86     OptionSet<WebsiteAutoplayQuirk> m_allowedAutoplayQuirks;
    87     WebsiteAutoplayPolicy m_autoplayPolicy { WebsiteAutoplayPolicy::Default };
     73    OptionSet<WebKit::WebsiteAutoplayQuirk> m_allowedAutoplayQuirks;
     74    WebKit::WebsiteAutoplayPolicy m_autoplayPolicy { WebKit::WebsiteAutoplayPolicy::Default };
    8875    Vector<WebCore::HTTPHeaderField> m_customHeaderFields;
    8976};
    9077
    91 } // namespace WebKit
    92 
    93 namespace WTF {
    94 
    95 template<> struct EnumTraits<WebKit::WebsiteAutoplayPolicy> {
    96     using values = EnumValues<
    97         WebKit::WebsiteAutoplayPolicy,
    98         WebKit::WebsiteAutoplayPolicy::Default,
    99         WebKit::WebsiteAutoplayPolicy::Allow,
    100         WebKit::WebsiteAutoplayPolicy::AllowWithoutSound,
    101         WebKit::WebsiteAutoplayPolicy::Deny
    102     >;
    103 };
    104 
    105 } // namespace WTF
     78} // namespace API

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

    r225954 r225977  
    6969class UserScript;
    7070class WebsiteDataStore;
     71class WebsitePolicies;
    7172class WindowFeatures;
    7273}
    … …  
    111112class WebUserContentControllerProxy;
    112113class WebViewportAttributes;
    113 class WebsitePolicies;
    114114
    115115WK_ADD_API_MAPPING(WKAuthenticationChallengeRef, AuthenticationChallengeProxy)
    … …  
    166166WK_ADD_API_MAPPING(WKViewportAttributesRef, WebViewportAttributes)
    167167WK_ADD_API_MAPPING(WKWebsiteDataStoreRef, API::WebsiteDataStore)
    168 WK_ADD_API_MAPPING(WKWebsitePoliciesRef, WebsitePolicies)
     168WK_ADD_API_MAPPING(WKWebsitePoliciesRef, API::WebsitePolicies)
    169169WK_ADD_API_MAPPING(WKWindowFeaturesRef, API::WindowFeatures)
    170170

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

    r225954 r225977  
    2727#include "WKFramePolicyListener.h"
    2828
     29#include "APIWebsitePolicies.h"
    2930#include "WKAPICast.h"
    3031#include "WebFramePolicyListenerProxy.h"
    … …  
    4647void WKFramePolicyListenerUseWithPolicies(WKFramePolicyListenerRef policyListenerRef, WKWebsitePoliciesRef websitePolicies)
    4748{
    48     toImpl(policyListenerRef)->use(WebsitePoliciesData::fromWebsitePolicies(*toImpl(websitePolicies)));
     49    toImpl(policyListenerRef)->use(toImpl(websitePolicies)->data());
    4950}
    5051

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

    r225954 r225977  
    4747#include "APISessionState.h"
    4848#include "APIUIClient.h"
     49#include "APIWebsitePolicies.h"
    4950#include "APIWindowFeatures.h"
    5051#include "AuthenticationChallengeProxy.h"
    … …  
    7172#include "WebProcessProxy.h"
    7273#include "WebProtectionSpace.h"
    73 #include "WebsitePolicies.h"
    7474#include <WebCore/Page.h>
    7575#include <WebCore/SecurityOriginData.h>
    … …  
    326326void WKPageUpdateWebsitePolicies(WKPageRef pageRef, WKWebsitePoliciesRef websitePoliciesRef)
    327327{
    328     toImpl(pageRef)->updateWebsitePolicies(WebsitePoliciesData::fromWebsitePolicies(*toImpl(websitePoliciesRef)));
     328    toImpl(pageRef)->updateWebsitePolicies(toImpl(websitePoliciesRef)->data());
    329329}
    330330

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

    r225954 r225977  
    2828
    2929#include "APIDictionary.h"
     30#include "APIWebsitePolicies.h"
    3031#include "WKAPICast.h"
    3132#include "WKArray.h"
    3233#include "WKDictionary.h"
    3334#include "WKRetainPtr.h"
    34 #include "WebsitePolicies.h"
    3535
    3636using namespace WebKit;
    … …  
    3838WKTypeID WKWebsitePoliciesGetTypeID()
    3939{
    40     return toAPI(WebsitePolicies::APIType);
     40    return toAPI(API::WebsitePolicies::APIType);
    4141}
    4242
    4343WKWebsitePoliciesRef WKWebsitePoliciesCreate()
    4444{
    45     return toAPI(&WebsitePolicies::create().leakRef());
     45    return toAPI(&API::WebsitePolicies::create().leakRef());
    4646}
    4747

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

    r225954 r225977  
    42344234- (void)_updateWebsitePolicies:(_WKWebsitePolicies *)websitePolicies
    42354235{
    4236     _page->updateWebsitePolicies(WebKit::WebsitePoliciesData::fromWebsitePolicies(*websitePolicies->_websitePolicies));
     4236    _page->updateWebsitePolicies(websitePolicies->_websitePolicies->data());
    42374237}
    42384238

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePolicies.h

    r223451 r225977  
    4747@property (nonatomic) _WKWebsiteAutoplayQuirk allowedAutoplayQuirks WK_API_AVAILABLE(macosx(10.13), ios(11.0));
    4848@property (nonatomic) _WKWebsiteAutoplayPolicy autoplayPolicy WK_API_AVAILABLE(macosx(10.13), ios(11.0));
    49 @property (nonatomic, copy, setter=setCustomHeaderFields:) NSDictionary<NSString *, NSString *> *customHeaderFields WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     49@property (nonatomic, copy) NSDictionary<NSString *, NSString *> *customHeaderFields WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    5050
    5151@end

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

    r225954 r225977  
    2929#if WK_API_ENABLED
    3030
     31#import "WKWebsiteDataStoreInternal.h"
     32
    3133@implementation _WKWebsitePolicies
    3234
    3335- (void)dealloc
    3436{
    35     _websitePolicies->WebKit::WebsitePolicies::~WebsitePolicies();
     37    _websitePolicies->API::WebsitePolicies::~WebsitePolicies();
    3638   
    3739    [super dealloc];
    … …  
    4345        return nil;
    4446   
    45     API::Object::constructInWrapper<WebKit::WebsitePolicies>(self);
     47    API::Object::constructInWrapper<API::WebsitePolicies>(self);
    4648   
    4749    return self;

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

    r225954 r225977  
    2828#if WK_API_ENABLED
    2929
     30#import "APIWebsitePolicies.h"
    3031#import "WKObject.h"
    31 #import "WebsitePolicies.h"
    3232
    33 namespace WebKit {
     33namespace API {
    3434
    3535inline _WKWebsitePolicies *wrapper(WebsitePolicies& websitePolicies)
    … …  
    4343@interface _WKWebsitePolicies () <WKObject> {
    4444@package
    45     API::ObjectStorage<WebKit::WebsitePolicies> _websitePolicies;
     45    API::ObjectStorage<API::WebsitePolicies> _websitePolicies;
    4646}
    4747@end

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

    r225954 r225977  
    468468        std::optional<WebsitePoliciesData> data;
    469469        if (websitePolicies)
    470             data = WebsitePoliciesData::fromWebsitePolicies(*websitePolicies->_websitePolicies);
     470            data = websitePolicies->_websitePolicies->data();
    471471
    472472        switch (actionPolicy) {

  • trunk/Source/WebKit/UIProcess/WebFormSubmissionListenerProxy.cpp

    r222456 r225977  
    2727#include "WebFormSubmissionListenerProxy.h"
    2828
    29 #include "WebsitePolicies.h"
    30 
    3129namespace WebKit {
    3230

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

    r225954 r225977  
    11851185                5C0B177C1E7C885400E9123C /* WebSocketStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0B177A1E7C884F00E9123C /* WebSocketStream.cpp */; };
    11861186                5C0B17811E7C8C2600E9123C /* NetworkSocketStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0B177D1E7C886700E9123C /* NetworkSocketStream.cpp */; };
    1187                 5C13024C1FE35154000D9B31 /* WebsitePolicies.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C13024B1FE35142000D9B31 /* WebsitePolicies.h */; };
    11881187                5C1426EC1C23F80900D41183 /* NetworkProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426E21C23F80500D41183 /* NetworkProcessCreationParameters.cpp */; };
    11891188                5C1426ED1C23F80900D41183 /* NetworkProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426E31C23F80500D41183 /* NetworkProcessCreationParameters.h */; };
    … …  
    12111210                5C7706741D1138380012700F /* WebSocketProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C7706731D111D8B0012700F /* WebSocketProvider.cpp */; };
    12121211                5C85C7881C3F23CE0061A4FA /* PendingDownload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C85C7861C3F23C50061A4FA /* PendingDownload.cpp */; };
     1212                5C8DD37E1FE4502000F2A556 /* APIWebsitePolicies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C8DD37D1FE4501100F2A556 /* APIWebsitePolicies.cpp */; };
     1213                5C8DD3801FE4521600F2A556 /* WebsiteAutoplayPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C8DD37F1FE4519200F2A556 /* WebsiteAutoplayPolicy.h */; };
    12131214                5C9E56821DF7F1AB00C9EE33 /* WKWebsitePolicies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C9E56801DF7F05500C9EE33 /* WKWebsitePolicies.cpp */; };
    12141215                5C9E56831DF7F1B300C9EE33 /* WKWebsitePolicies.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9E56811DF7F05500C9EE33 /* WKWebsitePolicies.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    35743575                5C0B17801E7C888000E9123C /* WebSocketStream.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebSocketStream.messages.in; path = Network/WebSocketStream.messages.in; sourceTree = "<group>"; };
    35753576                5C13024A1FE341A7000D9B31 /* WebsitePoliciesData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsitePoliciesData.h; sourceTree = "<group>"; };
    3576                 5C13024B1FE35142000D9B31 /* WebsitePolicies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsitePolicies.h; sourceTree = "<group>"; };
    35773577                5C1426E21C23F80500D41183 /* NetworkProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessCreationParameters.cpp; path = NetworkProcess/NetworkProcessCreationParameters.cpp; sourceTree = "<group>"; };
    35783578                5C1426E31C23F80500D41183 /* NetworkProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessCreationParameters.h; path = NetworkProcess/NetworkProcessCreationParameters.h; sourceTree = "<group>"; };
    … …  
    36043604                5C84CF901F96AC4E00B6705A /* NetworkSessionCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkSessionCreationParameters.h; path = NetworkProcess/NetworkSessionCreationParameters.h; sourceTree = "<group>"; };
    36053605                5C85C7861C3F23C50061A4FA /* PendingDownload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PendingDownload.cpp; path = NetworkProcess/Downloads/PendingDownload.cpp; sourceTree = "<group>"; };
     3606                5C8DD37C1FE4501100F2A556 /* APIWebsitePolicies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebsitePolicies.h; sourceTree = "<group>"; };
     3607                5C8DD37D1FE4501100F2A556 /* APIWebsitePolicies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIWebsitePolicies.cpp; sourceTree = "<group>"; };
     3608                5C8DD37F1FE4519200F2A556 /* WebsiteAutoplayPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsiteAutoplayPolicy.h; sourceTree = "<group>"; };
     3609                5C8DD3811FE455CA00F2A556 /* WebsiteAutoplayQuirk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsiteAutoplayQuirk.h; sourceTree = "<group>"; };
    36063610                5C9E56801DF7F05500C9EE33 /* WKWebsitePolicies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebsitePolicies.cpp; sourceTree = "<group>"; };
    36073611                5C9E56811DF7F05500C9EE33 /* WKWebsitePolicies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebsitePolicies.h; sourceTree = "<group>"; };
    … …  
    52135217                                3760881C150413E900FC82C7 /* WebRenderObject.cpp */,
    52145218                                3760881D150413E900FC82C7 /* WebRenderObject.h */,
     5219                                5C8DD37F1FE4519200F2A556 /* WebsiteAutoplayPolicy.h */,
     5220                                5C8DD3811FE455CA00F2A556 /* WebsiteAutoplayQuirk.h */,
    52155221                                511F7D3F1EB1BCEE00E47B83 /* WebsiteDataStoreParameters.cpp */,
    52165222                                511F7D401EB1BCEE00E47B83 /* WebsiteDataStoreParameters.h */,
    … …  
    71947200                                6B821DDB1EEF05DD00D7AF4A /* WebResourceLoadStatisticsTelemetry.cpp */,
    71957201                                6B821DDA1EEF05DD00D7AF4A /* WebResourceLoadStatisticsTelemetry.h */,
    7196                                 5C13024B1FE35142000D9B31 /* WebsitePolicies.h */,
    71977202                                51D124241E6D3CC3002B2820 /* WebURLSchemeHandler.cpp */,
    71987203                                51D124251E6D3CC3002B2820 /* WebURLSchemeHandler.h */,
    … …  
    72757280                                1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */,
    72767281                                1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */,
     7282                                5C8DD37D1FE4501100F2A556 /* APIWebsitePolicies.cpp */,
     7283                                5C8DD37C1FE4501100F2A556 /* APIWebsitePolicies.h */,
    72777284                                1A6563E21B7A8C50009CF787 /* APIWindowFeatures.cpp */,
    72787285                                1A6563E31B7A8C50009CF787 /* APIWindowFeatures.h */,
    … …  
    91609167                                D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */,
    91619168                                51BEB62C1F3A5AD7005029B9 /* WebServiceWorkerProvider.h in Headers */,
     9169                                5C8DD3801FE4521600F2A556 /* WebsiteAutoplayPolicy.h in Headers */,
    91629170                                1A4832D71A9CDF96008B4DFE /* WebsiteData.h in Headers */,
    91639171                                1A4832D11A9BDC2F008B4DFE /* WebsiteDataRecord.h in Headers */,
    91649172                                1A53C2AA1A325730004E8C70 /* WebsiteDataStore.h in Headers */,
    91659173                                511F7D411EB1BCF500E47B83 /* WebsiteDataStoreParameters.h in Headers */,
    9166                                 5C13024C1FE35154000D9B31 /* WebsitePolicies.h in Headers */,
    91679174                                836034A01ACB34D600626549 /* WebSQLiteDatabaseTracker.h in Headers */,
    91689175                                1A52C0F81A38CDC70016160A /* WebStorageNamespaceProvider.h in Headers */,
    … …  
    1020010207                                1A3635A91A3144A300ED6197 /* APIWebsiteDataStore.cpp in Sources */,
    1020110208                                1A3635AD1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm in Sources */,
     10209                                5C8DD37E1FE4502000F2A556 /* APIWebsitePolicies.cpp in Sources */,
    1020210210                                1A6563E41B7A8C50009CF787 /* APIWindowFeatures.cpp in Sources */,
    1020310211                                1AD4C1921B39F33200ABC28E /* ApplicationStateTracker.mm in Sources */,

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

    r225954 r225977  
    122122#include "WebValidationMessageClient.h"
    123123#include "WebsiteDataStoreParameters.h"
    124 #include "WebsitePolicies.h"
    125124#include <JavaScriptCore/APICast.h>
    126125#include <WebCore/ApplicationCacheStorage.h>
Note: See TracChangeset for help on using the changeset viewer.