⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 243726 in webkit


Ignore:
Timestamp:
Apr 1, 2019, 5:01:05 PM (7 years ago)
Author:
Wenson Hsieh
Message:

[WebKit2] Introduce a public version of WKWebsitePolicies
​https://bugs.webkit.org/show_bug.cgi?id=195989
<rdar://problem/47228232>

Reviewed by Tim Horton.

Expose the existing _WKWebsitePolicies object as WKWebpagePreferences, in what will eventually become a public
header in the WebKit SDK (WKWebpagePreferences.h). Following a similar transitioning strategy as
_WKWebsiteDataStore and WKWebsiteDataStore, we move existing logic from _WKWebsitePolicies to WKWebpagePreferences
and make _WKWebsitePolicies a wrapper around WKWebpagePreferences.

No change in behavior.

  • Shared/Cocoa/APIObject.mm:

(API::Object::newObject):

Wrap API::WebsitePolicies with WKWebpagePreferences.

  • SourcesCocoa.txt:
  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _updateWebsitePolicies:]):

  • UIProcess/API/Cocoa/WKWebpagePreferences.h: Copied from Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePoliciesInternal.h.
  • UIProcess/API/Cocoa/WKWebpagePreferences.mm: Copied from Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePolicies.mm.

Introduce WKWebpagePreferences.

(+[WKWebpagePreferences defaultPreferences]):
(-[WKWebpagePreferences dealloc]):
(-[WKWebpagePreferences init]):
(-[WKWebpagePreferences _setContentBlockersEnabled:]):
(-[WKWebpagePreferences _contentBlockersEnabled]):
(-[WKWebpagePreferences _setAllowedAutoplayQuirks:]):
(-[WKWebpagePreferences _allowedAutoplayQuirks]):
(-[WKWebpagePreferences _setAutoplayPolicy:]):
(-[WKWebpagePreferences _autoplayPolicy]):
(-[WKWebpagePreferences _setDeviceOrientationAndMotionAccessPolicy:]):
(-[WKWebpagePreferences _deviceOrientationAndMotionAccessPolicy]):
(-[WKWebpagePreferences _setPopUpPolicy:]):
(-[WKWebpagePreferences _popUpPolicy]):
(-[WKWebpagePreferences _customHeaderFields]):
(-[WKWebpagePreferences _setCustomHeaderFields:]):
(-[WKWebpagePreferences _websiteDataStore]):
(-[WKWebpagePreferences _setWebsiteDataStore:]):
(-[WKWebpagePreferences _setCustomUserAgent:]):
(-[WKWebpagePreferences _customUserAgent]):
(-[WKWebpagePreferences _setCustomJavaScriptUserAgentAsSiteSpecificQuirks:]):
(-[WKWebpagePreferences _customJavaScriptUserAgentAsSiteSpecificQuirks]):
(-[WKWebpagePreferences _setCustomNavigatorPlatform:]):
(-[WKWebpagePreferences _customNavigatorPlatform]):
(-[WKWebpagePreferences _apiObject]):

  • UIProcess/API/Cocoa/WKWebpagePreferencesInternal.h: Copied from Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePoliciesInternal.h.
  • UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h: Copied from Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePolicies.h.

Reintroduce all the interfaces currently available on _WKWebsitePolicies as underscore-prefixed SPI on
WKWebpagePreferences.

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

Make _WKWebsitePolicies wrap WKWebpagePreferences, and plumb all existing SPI on WKWebsitePolicies through to
WKWebpagePreferences.

(-[_WKWebsitePolicies init]):
(-[_WKWebsitePolicies webpagePreferences]):
(-[_WKWebsitePolicies setContentBlockersEnabled:]):
(-[_WKWebsitePolicies contentBlockersEnabled]):
(-[_WKWebsitePolicies setAllowedAutoplayQuirks:]):
(-[_WKWebsitePolicies allowedAutoplayQuirks]):
(-[_WKWebsitePolicies setAutoplayPolicy:]):
(-[_WKWebsitePolicies autoplayPolicy]):
(-[_WKWebsitePolicies setDeviceOrientationAndMotionAccessPolicy:]):
(-[_WKWebsitePolicies deviceOrientationAndMotionAccessPolicy]):
(-[_WKWebsitePolicies setPopUpPolicy:]):
(-[_WKWebsitePolicies popUpPolicy]):
(-[_WKWebsitePolicies customHeaderFields]):
(-[_WKWebsitePolicies setCustomHeaderFields:]):
(-[_WKWebsitePolicies websiteDataStore]):
(-[_WKWebsitePolicies setWebsiteDataStore:]):
(-[_WKWebsitePolicies setCustomUserAgent:]):
(-[_WKWebsitePolicies customUserAgent]):
(-[_WKWebsitePolicies setCustomJavaScriptUserAgentAsSiteSpecificQuirks:]):
(-[_WKWebsitePolicies customJavaScriptUserAgentAsSiteSpecificQuirks]):
(-[_WKWebsitePolicies setCustomNavigatorPlatform:]):
(-[_WKWebsitePolicies customNavigatorPlatform]):
(-[_WKWebsitePolicies description]):
(-[_WKWebsitePolicies _apiObject]):
(-[_WKWebsitePolicies dealloc]): Deleted.

  • UIProcess/API/Cocoa/_WKWebsitePoliciesInternal.h:
  • UIProcess/Cocoa/NavigationState.mm:

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

  • WebKit.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit
Files:
9 edited
4 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r243713 r243726  
     12019-04-01  Wenson Hsieh  <wenson_hsieh@apple.com>
     2
     3        [WebKit2] Introduce a public version of WKWebsitePolicies
     4        https://bugs.webkit.org/show_bug.cgi?id=195989
     5        <rdar://problem/47228232>
     6
     7        Reviewed by Tim Horton.
     8
     9        Expose the existing _WKWebsitePolicies object as WKWebpagePreferences, in what will eventually become a public
     10        header in the WebKit SDK (WKWebpagePreferences.h). Following a similar transitioning strategy as
     11        _WKWebsiteDataStore and WKWebsiteDataStore, we move existing logic from _WKWebsitePolicies to WKWebpagePreferences
     12        and make _WKWebsitePolicies a wrapper around WKWebpagePreferences.
     13
     14        No change in behavior.
     15
     16        * Shared/Cocoa/APIObject.mm:
     17        (API::Object::newObject):
     18
     19        Wrap API::WebsitePolicies with WKWebpagePreferences.
     20
     21        * SourcesCocoa.txt:
     22        * UIProcess/API/Cocoa/WKWebView.mm:
     23        (-[WKWebView _updateWebsitePolicies:]):
     24        * UIProcess/API/Cocoa/WKWebpagePreferences.h: Copied from Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePoliciesInternal.h.
     25        * UIProcess/API/Cocoa/WKWebpagePreferences.mm: Copied from Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePolicies.mm.
     26
     27        Introduce WKWebpagePreferences.
     28
     29        (+[WKWebpagePreferences defaultPreferences]):
     30        (-[WKWebpagePreferences dealloc]):
     31        (-[WKWebpagePreferences init]):
     32        (-[WKWebpagePreferences _setContentBlockersEnabled:]):
     33        (-[WKWebpagePreferences _contentBlockersEnabled]):
     34        (-[WKWebpagePreferences _setAllowedAutoplayQuirks:]):
     35        (-[WKWebpagePreferences _allowedAutoplayQuirks]):
     36        (-[WKWebpagePreferences _setAutoplayPolicy:]):
     37        (-[WKWebpagePreferences _autoplayPolicy]):
     38        (-[WKWebpagePreferences _setDeviceOrientationAndMotionAccessPolicy:]):
     39        (-[WKWebpagePreferences _deviceOrientationAndMotionAccessPolicy]):
     40        (-[WKWebpagePreferences _setPopUpPolicy:]):
     41        (-[WKWebpagePreferences _popUpPolicy]):
     42        (-[WKWebpagePreferences _customHeaderFields]):
     43        (-[WKWebpagePreferences _setCustomHeaderFields:]):
     44        (-[WKWebpagePreferences _websiteDataStore]):
     45        (-[WKWebpagePreferences _setWebsiteDataStore:]):
     46        (-[WKWebpagePreferences _setCustomUserAgent:]):
     47        (-[WKWebpagePreferences _customUserAgent]):
     48        (-[WKWebpagePreferences _setCustomJavaScriptUserAgentAsSiteSpecificQuirks:]):
     49        (-[WKWebpagePreferences _customJavaScriptUserAgentAsSiteSpecificQuirks]):
     50        (-[WKWebpagePreferences _setCustomNavigatorPlatform:]):
     51        (-[WKWebpagePreferences _customNavigatorPlatform]):
     52        (-[WKWebpagePreferences _apiObject]):
     53        * UIProcess/API/Cocoa/WKWebpagePreferencesInternal.h: Copied from Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePoliciesInternal.h.
     54        * UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h: Copied from Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePolicies.h.
     55
     56        Reintroduce all the interfaces currently available on _WKWebsitePolicies as underscore-prefixed SPI on
     57        WKWebpagePreferences.
     58
     59        * UIProcess/API/Cocoa/_WKWebsitePolicies.h:
     60        * UIProcess/API/Cocoa/_WKWebsitePolicies.mm:
     61
     62        Make _WKWebsitePolicies wrap WKWebpagePreferences, and plumb all existing SPI on WKWebsitePolicies through to
     63        WKWebpagePreferences.
     64
     65        (-[_WKWebsitePolicies init]):
     66        (-[_WKWebsitePolicies webpagePreferences]):
     67        (-[_WKWebsitePolicies setContentBlockersEnabled:]):
     68        (-[_WKWebsitePolicies contentBlockersEnabled]):
     69        (-[_WKWebsitePolicies setAllowedAutoplayQuirks:]):
     70        (-[_WKWebsitePolicies allowedAutoplayQuirks]):
     71        (-[_WKWebsitePolicies setAutoplayPolicy:]):
     72        (-[_WKWebsitePolicies autoplayPolicy]):
     73        (-[_WKWebsitePolicies setDeviceOrientationAndMotionAccessPolicy:]):
     74        (-[_WKWebsitePolicies deviceOrientationAndMotionAccessPolicy]):
     75        (-[_WKWebsitePolicies setPopUpPolicy:]):
     76        (-[_WKWebsitePolicies popUpPolicy]):
     77        (-[_WKWebsitePolicies customHeaderFields]):
     78        (-[_WKWebsitePolicies setCustomHeaderFields:]):
     79        (-[_WKWebsitePolicies websiteDataStore]):
     80        (-[_WKWebsitePolicies setWebsiteDataStore:]):
     81        (-[_WKWebsitePolicies setCustomUserAgent:]):
     82        (-[_WKWebsitePolicies customUserAgent]):
     83        (-[_WKWebsitePolicies setCustomJavaScriptUserAgentAsSiteSpecificQuirks:]):
     84        (-[_WKWebsitePolicies customJavaScriptUserAgentAsSiteSpecificQuirks]):
     85        (-[_WKWebsitePolicies setCustomNavigatorPlatform:]):
     86        (-[_WKWebsitePolicies customNavigatorPlatform]):
     87        (-[_WKWebsitePolicies description]):
     88        (-[_WKWebsitePolicies _apiObject]):
     89        (-[_WKWebsitePolicies dealloc]): Deleted.
     90        * UIProcess/API/Cocoa/_WKWebsitePoliciesInternal.h:
     91        * UIProcess/Cocoa/NavigationState.mm:
     92        (WebKit::NavigationState::NavigationClient::decidePolicyForNavigationAction):
     93        * WebKit.xcodeproj/project.pbxproj:
     94
    1952019-04-01  Wenson Hsieh  <wenson_hsieh@apple.com>
    296

  • trunk/Source/WebKit/Shared/Cocoa/APIObject.mm

    r243319 r243726  
    6464#import "WKWebProcessPlugInRangeHandleInternal.h"
    6565#import "WKWebProcessPlugInScriptWorldInternal.h"
     66#import "WKWebpagePreferencesInternal.h"
    6667#import "WKWebsiteDataRecordInternal.h"
    6768#import "WKWebsiteDataStoreInternal.h"
    … …  
    8384#import "_WKVisitedLinkStoreInternal.h"
    8485#import "_WKWebsiteDataStoreConfigurationInternal.h"
    85 #import "_WKWebsitePoliciesInternal.h"
    8686
    8787#if ENABLE(APPLICATION_MANIFEST)
    … …  
    347347
    348348    case Type::WebsitePolicies:
    349         wrapper = [_WKWebsitePolicies alloc];
     349        wrapper = [WKWebpagePreferences alloc];
    350350        break;
    351351

  • trunk/Source/WebKit/SourcesCocoa.txt

    r243553 r243726  
    307307UIProcess/API/Cocoa/WKWebView.mm
    308308UIProcess/API/Cocoa/WKWebViewConfiguration.mm
     309UIProcess/API/Cocoa/WKWebpagePreferences.mm
    309310UIProcess/API/Cocoa/WKWindowFeatures.mm
    310311

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

    r243682 r243726  
    7878#import "WKWebViewConfigurationInternal.h"
    7979#import "WKWebViewContentProvider.h"
     80#import "WKWebpagePreferencesInternal.h"
    8081#import "WKWebsiteDataStoreInternal.h"
    8182#import "WebBackForwardList.h"
    … …  
    51295130- (void)_updateWebsitePolicies:(_WKWebsitePolicies *)websitePolicies
    51305131{
    5131     auto data = websitePolicies->_websitePolicies->data();
     5132    auto data = websitePolicies.webpagePreferences->_websitePolicies->data();
    51325133    if (data.websiteDataStoreParameters)
    51335134        [NSException raise:NSInvalidArgumentException format:@"Updating WKWebsiteDataStore is only supported during decidePolicyForNavigationAction."];

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

    r243722 r243726  
    11/*
    2  * Copyright (C) 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #import "_WKWebsitePolicies.h"
     26#import <WebKit/WKFoundation.h>
    2727
    28 #import "APIWebsitePolicies.h"
    29 #import "WKObject.h"
     28/*! A WKWebpagePreferences object is a collection of properties that
     29 determine the preferences to use when loading and rendering a page.
     30 @discussion Contains properties used to determine webpage preferences.
     31 */
     32WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA))
     33@interface WKWebpagePreferences : NSObject
    3034
    31 namespace WebKit {
    32 
    33 template<> struct WrapperTraits<API::WebsitePolicies> {
    34     using WrapperClass = _WKWebsitePolicies;
    35 };
    36 
    37 }
    38 
    39 @interface _WKWebsitePolicies () <WKObject> {
    40 @package
    41     API::ObjectStorage<API::WebsitePolicies> _websitePolicies;
    42 }
    4335@end

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

    r243722 r243726  
    11/*
    2  * Copyright (C) 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2525
    2626#import "config.h"
     27#import "WKWebpagePreferences.h"
     28
     29#import "WKWebpagePreferencesInternal.h"
     30#import "WKWebsiteDataStoreInternal.h"
    2731#import "_WKWebsitePoliciesInternal.h"
    28 
    29 #import "WKWebsiteDataStoreInternal.h"
    30 
    31 @implementation _WKWebsitePolicies
     32#import <wtf/RetainPtr.h>
     33
     34@implementation WKWebpagePreferences
     35
     36+ (instancetype)defaultPreferences
     37{
     38    return [[[self alloc] init] autorelease];
     39}
    3240
    3341- (void)dealloc
    3442{
    3543    _websitePolicies->API::WebsitePolicies::~WebsitePolicies();
    36    
     44
    3745    [super dealloc];
    3846}
    … …  
    4250    if (!(self = [super init]))
    4351        return nil;
    44    
     52
    4553    API::Object::constructInWrapper<API::WebsitePolicies>(self);
    46    
     54
    4755    return self;
    4856}
    4957
    50 - (void)setContentBlockersEnabled:(BOOL)contentBlockersEnabled
     58- (void)_setContentBlockersEnabled:(BOOL)contentBlockersEnabled
    5159{
    5260    _websitePolicies->setContentBlockersEnabled(contentBlockersEnabled);
    5361}
    5462
    55 - (BOOL)contentBlockersEnabled
     63- (BOOL)_contentBlockersEnabled
    5664{
    5765    return _websitePolicies->contentBlockersEnabled();
    5866}
    5967
    60 - (void)setAllowedAutoplayQuirks:(_WKWebsiteAutoplayQuirk)allowedQuirks
     68- (void)_setAllowedAutoplayQuirks:(_WKWebsiteAutoplayQuirk)allowedQuirks
    6169{
    6270    OptionSet<WebKit::WebsiteAutoplayQuirk> quirks;
    … …  
    7785}
    7886
    79 - (_WKWebsiteAutoplayQuirk)allowedAutoplayQuirks
     87- (_WKWebsiteAutoplayQuirk)_allowedAutoplayQuirks
    8088{
    8189    _WKWebsiteAutoplayQuirk quirks = 0;
    … …  
    97105}
    98106
    99 - (void)setAutoplayPolicy:(_WKWebsiteAutoplayPolicy)policy
     107- (void)_setAutoplayPolicy:(_WKWebsiteAutoplayPolicy)policy
    100108{
    101109    switch (policy) {
    … …  
    115123}
    116124
    117 - (_WKWebsiteAutoplayPolicy)autoplayPolicy
     125- (_WKWebsiteAutoplayPolicy)_autoplayPolicy
    118126{
    119127    switch (_websitePolicies->autoplayPolicy()) {
    … …  
    129137}
    130138
    131 - (void)setDeviceOrientationAndMotionAccessPolicy:(_WKWebsiteDeviceOrientationAndMotionAccessPolicy)policy
     139- (void)_setDeviceOrientationAndMotionAccessPolicy:(_WKWebsiteDeviceOrientationAndMotionAccessPolicy)policy
    132140{
    133141    switch (policy) {
    … …  
    144152}
    145153
    146 - (_WKWebsiteDeviceOrientationAndMotionAccessPolicy)deviceOrientationAndMotionAccessPolicy
     154- (_WKWebsiteDeviceOrientationAndMotionAccessPolicy)_deviceOrientationAndMotionAccessPolicy
    147155{
    148156    if (!_websitePolicies->deviceOrientationAndMotionAccessState())
    … …  
    151159}
    152160
    153 - (void)setPopUpPolicy:(_WKWebsitePopUpPolicy)policy
     161- (void)_setPopUpPolicy:(_WKWebsitePopUpPolicy)policy
    154162{
    155163    switch (policy) {
    … …  
    166174}
    167175
    168 - (_WKWebsitePopUpPolicy)popUpPolicy
     176- (_WKWebsitePopUpPolicy)_popUpPolicy
    169177{
    170178    switch (_websitePolicies->popUpPolicy()) {
    … …  
    178186}
    179187
    180 - (NSDictionary<NSString *, NSString *> *)customHeaderFields
     188- (NSDictionary<NSString *, NSString *> *)_customHeaderFields
    181189{
    182190    const auto& fields = _websitePolicies->customHeaderFields();
    183     NSMutableDictionary *dictionary = [[[NSMutableDictionary alloc] initWithCapacity:fields.size()] autorelease];
     191    auto dictionary = adoptNS([[NSMutableDictionary alloc] initWithCapacity:fields.size()]);
    184192    for (const auto& field : fields)
    185193        [dictionary setObject:field.value() forKey:field.name()];
    186     return dictionary;
    187 }
    188 
    189 - (void)setCustomHeaderFields:(NSDictionary<NSString *, NSString *> *)fields
     194    return dictionary.autorelease();
     195}
     196
     197- (void)_setCustomHeaderFields:(NSDictionary<NSString *, NSString *> *)fields
    190198{
    191199    Vector<WebCore::HTTPHeaderField> parsedFields;
    192200    parsedFields.reserveInitialCapacity(fields.count);
    193    
    194     for (NSString* name in fields) {
     201
     202    for (NSString *name in fields) {
    195203        auto field = WebCore::HTTPHeaderField::create(name, [fields objectForKey:name]);
    196204        if (field && startsWithLettersIgnoringASCIICase(field->name(), "x-"))
    … …  
    200208}
    201209
    202 - (WKWebsiteDataStore *)websiteDataStore
     210- (WKWebsiteDataStore *)_websiteDataStore
    203211{
    204212    return wrapper(_websitePolicies->websiteDataStore());
    205213}
    206214
    207 - (void)setWebsiteDataStore:(WKWebsiteDataStore *)websiteDataStore
     215- (void)_setWebsiteDataStore:(WKWebsiteDataStore *)websiteDataStore
    208216{
    209217    _websitePolicies->setWebsiteDataStore(websiteDataStore->_websiteDataStore.get());
    210218}
    211219
    212 - (void)setCustomUserAgent:(NSString *)customUserAgent
     220- (void)_setCustomUserAgent:(NSString *)customUserAgent
    213221{
    214222    _websitePolicies->setCustomUserAgent(customUserAgent);
    215223}
    216224
    217 - (NSString *)customUserAgent
     225- (NSString *)_customUserAgent
    218226{
    219227    return _websitePolicies->customUserAgent();
    220228}
    221229
    222 - (void)setCustomJavaScriptUserAgentAsSiteSpecificQuirks:(NSString *)customUserAgent
     230- (void)_setCustomJavaScriptUserAgentAsSiteSpecificQuirks:(NSString *)customUserAgent
    223231{
    224232    _websitePolicies->setCustomJavaScriptUserAgentAsSiteSpecificQuirks(customUserAgent);
    225233}
    226234
    227 - (NSString *)customJavaScriptUserAgentAsSiteSpecificQuirks
     235- (NSString *)_customJavaScriptUserAgentAsSiteSpecificQuirks
    228236{
    229237    return _websitePolicies->customJavaScriptUserAgentAsSiteSpecificQuirks();
    230238}
    231239
    232 - (void)setCustomNavigatorPlatform:(NSString *)customNavigatorPlatform
     240- (void)_setCustomNavigatorPlatform:(NSString *)customNavigatorPlatform
    233241{
    234242    _websitePolicies->setCustomNavigatorPlatform(customNavigatorPlatform);
    235243}
    236244
    237 - (NSString *)customNavigatorPlatform
     245- (NSString *)_customNavigatorPlatform
    238246{
    239247    return _websitePolicies->customNavigatorPlatform();
    240248}
    241249
    242 - (NSString *)description
    243 {
    244     return [NSString stringWithFormat:@"<%@: %p; contentBlockersEnabled = %d>", NSStringFromClass(self.class), self, self.contentBlockersEnabled];
    245 }
    246 
    247250- (API::Object&)_apiObject
    248251{

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

    r243722 r243726  
    11/*
    2  * Copyright (C) 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #import "_WKWebsitePolicies.h"
     26#pragma once
    2727
    2828#import "APIWebsitePolicies.h"
    2929#import "WKObject.h"
     30#import "WKWebpagePreferencesPrivate.h"
     31#import "_WKWebsitePolicies.h"
    3032
    3133namespace WebKit {
    3234
    3335template<> struct WrapperTraits<API::WebsitePolicies> {
    34     using WrapperClass = _WKWebsitePolicies;
     36    using WrapperClass = WKWebpagePreferences;
    3537};
    3638
    3739}
    3840
    39 @interface _WKWebsitePolicies () <WKObject> {
     41@interface WKWebpagePreferences () <WKObject> {
    4042@package
    4143    API::ObjectStorage<API::WebsitePolicies> _websitePolicies;
    4244}
     45
     46@property (class, nonatomic, readonly) WKWebpagePreferences *defaultPreferences;
    4347@end

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

    r243722 r243726  
    11/*
    2  * Copyright (C) 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#pragma once
     27
    2628#import <WebKit/WKFoundation.h>
     29#import <WebKit/WKWebpagePreferences.h>
     30#import <WebKit/WKWebsiteDataStore.h>
    2731
    2832typedef NS_ENUM(NSInteger, _WKWebsiteAutoplayPolicy) {
    … …  
    5256} WK_API_AVAILABLE(macos(10.14), ios(12.0));
    5357
    54 @class WKWebsiteDataStore;
     58@interface WKWebpagePreferences (WKPrivate)
    5559
    56 WK_CLASS_AVAILABLE(macos(10.12.3), ios(10.3))
    57 @interface _WKWebsitePolicies : NSObject
    58 
    59 @property (nonatomic) BOOL contentBlockersEnabled;
    60 @property (nonatomic) _WKWebsiteAutoplayQuirk allowedAutoplayQuirks WK_API_AVAILABLE(macos(10.13), ios(11.0));
    61 @property (nonatomic) _WKWebsiteAutoplayPolicy autoplayPolicy WK_API_AVAILABLE(macos(10.13), ios(11.0));
    62 @property (nonatomic, copy) NSDictionary<NSString *, NSString *> *customHeaderFields WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
    63 @property (nonatomic) _WKWebsitePopUpPolicy popUpPolicy WK_API_AVAILABLE(macos(10.14), ios(12.0));
    64 @property (nonatomic, strong) WKWebsiteDataStore *websiteDataStore WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
    65 @property (nonatomic, copy) NSString *customUserAgent WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    66 @property (nonatomic, copy) NSString *customJavaScriptUserAgentAsSiteSpecificQuirks WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    67 @property (nonatomic, copy) NSString *customNavigatorPlatform WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    68 @property (nonatomic) _WKWebsiteDeviceOrientationAndMotionAccessPolicy deviceOrientationAndMotionAccessPolicy WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     60@property (nonatomic, setter=_setContentBlockersEnabled:) BOOL _contentBlockersEnabled;
     61@property (nonatomic, setter=_setAllowedAutoplayQuirks:) _WKWebsiteAutoplayQuirk _allowedAutoplayQuirks;
     62@property (nonatomic, setter=_setAutoplayPolicy:) _WKWebsiteAutoplayPolicy _autoplayPolicy;
     63@property (nonatomic, copy, setter=_setCustomHeaderFields:) NSDictionary<NSString *, NSString *> *_customHeaderFields;
     64@property (nonatomic, setter=_setPopUpPolicy:) _WKWebsitePopUpPolicy _popUpPolicy;
     65@property (nonatomic, strong, setter=_setWebsiteDataStore:) WKWebsiteDataStore *_websiteDataStore;
     66@property (nonatomic, copy, setter=_setCustomUserAgent:) NSString *_customUserAgent;
     67@property (nonatomic, copy, setter=_setCustomJavaScriptUserAgentAsSiteSpecificQuirks:) NSString *_customJavaScriptUserAgentAsSiteSpecificQuirks;
     68@property (nonatomic, copy, setter=_setCustomNavigatorPlatform:) NSString *_customNavigatorPlatform;
     69@property (nonatomic, setter=_setDeviceOrientationAndMotionAccessPolicy:) _WKWebsiteDeviceOrientationAndMotionAccessPolicy _deviceOrientationAndMotionAccessPolicy;
    6970
    7071@end

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

    r243376 r243726  
    2525
    2626#import <WebKit/WKFoundation.h>
    27 
    28 typedef NS_ENUM(NSInteger, _WKWebsiteAutoplayPolicy) {
    29     _WKWebsiteAutoplayPolicyDefault,
    30     _WKWebsiteAutoplayPolicyAllow,
    31     _WKWebsiteAutoplayPolicyAllowWithoutSound,
    32     _WKWebsiteAutoplayPolicyDeny
    33 } WK_API_AVAILABLE(macos(10.13), ios(11.0));
    34 
    35 typedef NS_OPTIONS(NSUInteger, _WKWebsiteAutoplayQuirk) {
    36     _WKWebsiteAutoplayQuirkSynthesizedPauseEvents = 1 << 0,
    37     _WKWebsiteAutoplayQuirkInheritedUserGestures = 1 << 1,
    38     _WKWebsiteAutoplayQuirkArbitraryUserGestures = 1 << 2,
    39     _WKWebsiteAutoplayQuirkPerDocumentAutoplayBehavior = 1 << 3,
    40 } WK_API_AVAILABLE(macos(10.13), ios(11.0));
    41 
    42 typedef NS_OPTIONS(NSUInteger, _WKWebsitePopUpPolicy) {
    43     _WKWebsitePopUpPolicyDefault,
    44     _WKWebsitePopUpPolicyAllow,
    45     _WKWebsitePopUpPolicyBlock,
    46 } WK_API_AVAILABLE(macos(10.14), ios(12.0));
    47 
    48 typedef NS_OPTIONS(NSUInteger, _WKWebsiteDeviceOrientationAndMotionAccessPolicy) {
    49     _WKWebsiteDeviceOrientationAndMotionAccessPolicyAsk,
    50     _WKWebsiteDeviceOrientationAndMotionAccessPolicyGrant,
    51     _WKWebsiteDeviceOrientationAndMotionAccessPolicyDeny,
    52 } WK_API_AVAILABLE(macos(10.14), ios(12.0));
     27#import <WebKit/WKWebpagePreferencesPrivate.h>
    5328
    5429@class WKWebsiteDataStore;

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

    r242960 r243726  
    2525
    2626#import "config.h"
     27
     28#import "WKWebpagePreferencesInternal.h"
     29#import "WKWebsiteDataStoreInternal.h"
    2730#import "_WKWebsitePoliciesInternal.h"
    2831
    29 #import "WKWebsiteDataStoreInternal.h"
    30 
    3132@implementation _WKWebsitePolicies
    32 
    33 - (void)dealloc
    34 {
    35     _websitePolicies->API::WebsitePolicies::~WebsitePolicies();
    36    
    37     [super dealloc];
    38 }
    3933
    4034- (instancetype)init
    … …  
    4236    if (!(self = [super init]))
    4337        return nil;
    44    
    45     API::Object::constructInWrapper<API::WebsitePolicies>(self);
    46    
     38
     39    _webpagePreferences = adoptNS([[WKWebpagePreferences alloc] init]);
    4740    return self;
     41}
     42
     43- (WKWebpagePreferences *)webpagePreferences
     44{
     45    return _webpagePreferences.get();
    4846}
    4947
    5048- (void)setContentBlockersEnabled:(BOOL)contentBlockersEnabled
    5149{
    52     _websitePolicies->setContentBlockersEnabled(contentBlockersEnabled);
     50    [_webpagePreferences _setContentBlockersEnabled:contentBlockersEnabled];
    5351}
    5452
    5553- (BOOL)contentBlockersEnabled
    5654{
    57     return _websitePolicies->contentBlockersEnabled();
     55    return [_webpagePreferences _contentBlockersEnabled];
    5856}
    5957
    6058- (void)setAllowedAutoplayQuirks:(_WKWebsiteAutoplayQuirk)allowedQuirks
    6159{
    62     OptionSet<WebKit::WebsiteAutoplayQuirk> quirks;
    63 
    64     if (allowedQuirks & _WKWebsiteAutoplayQuirkInheritedUserGestures)
    65         quirks.add(WebKit::WebsiteAutoplayQuirk::InheritedUserGestures);
    66 
    67     if (allowedQuirks & _WKWebsiteAutoplayQuirkSynthesizedPauseEvents)
    68         quirks.add(WebKit::WebsiteAutoplayQuirk::SynthesizedPauseEvents);
    69 
    70     if (allowedQuirks & _WKWebsiteAutoplayQuirkArbitraryUserGestures)
    71         quirks.add(WebKit::WebsiteAutoplayQuirk::ArbitraryUserGestures);
    72 
    73     if (allowedQuirks & _WKWebsiteAutoplayQuirkPerDocumentAutoplayBehavior)
    74         quirks.add(WebKit::WebsiteAutoplayQuirk::PerDocumentAutoplayBehavior);
    75 
    76     _websitePolicies->setAllowedAutoplayQuirks(quirks);
     60    [_webpagePreferences _setAllowedAutoplayQuirks:allowedQuirks];
    7761}
    7862
    7963- (_WKWebsiteAutoplayQuirk)allowedAutoplayQuirks
    8064{
    81     _WKWebsiteAutoplayQuirk quirks = 0;
    82     auto allowedQuirks = _websitePolicies->allowedAutoplayQuirks();
    83 
    84     if (allowedQuirks.contains(WebKit::WebsiteAutoplayQuirk::InheritedUserGestures))
    85         quirks |= _WKWebsiteAutoplayQuirkInheritedUserGestures;
    86 
    87     if (allowedQuirks.contains(WebKit::WebsiteAutoplayQuirk::SynthesizedPauseEvents))
    88         quirks |= _WKWebsiteAutoplayQuirkSynthesizedPauseEvents;
    89 
    90     if (allowedQuirks.contains(WebKit::WebsiteAutoplayQuirk::ArbitraryUserGestures))
    91         quirks |= _WKWebsiteAutoplayQuirkArbitraryUserGestures;
    92 
    93     if (allowedQuirks.contains(WebKit::WebsiteAutoplayQuirk::PerDocumentAutoplayBehavior))
    94         quirks |= _WKWebsiteAutoplayQuirkPerDocumentAutoplayBehavior;
    95 
    96     return quirks;
     65    return [_webpagePreferences _allowedAutoplayQuirks];
    9766}
    9867
    9968- (void)setAutoplayPolicy:(_WKWebsiteAutoplayPolicy)policy
    10069{
    101     switch (policy) {
    102     case _WKWebsiteAutoplayPolicyDefault:
    103         _websitePolicies->setAutoplayPolicy(WebKit::WebsiteAutoplayPolicy::Default);
    104         break;
    105     case _WKWebsiteAutoplayPolicyAllow:
    106         _websitePolicies->setAutoplayPolicy(WebKit::WebsiteAutoplayPolicy::Allow);
    107         break;
    108     case _WKWebsiteAutoplayPolicyAllowWithoutSound:
    109         _websitePolicies->setAutoplayPolicy(WebKit::WebsiteAutoplayPolicy::AllowWithoutSound);
    110         break;
    111     case _WKWebsiteAutoplayPolicyDeny:
    112         _websitePolicies->setAutoplayPolicy(WebKit::WebsiteAutoplayPolicy::Deny);
    113         break;
    114     }
     70    [_webpagePreferences _setAutoplayPolicy:policy];
    11571}
    11672
    11773- (_WKWebsiteAutoplayPolicy)autoplayPolicy
    11874{
    119     switch (_websitePolicies->autoplayPolicy()) {
    120     case WebKit::WebsiteAutoplayPolicy::Default:
    121         return _WKWebsiteAutoplayPolicyDefault;
    122     case WebKit::WebsiteAutoplayPolicy::Allow:
    123         return _WKWebsiteAutoplayPolicyAllow;
    124     case WebKit::WebsiteAutoplayPolicy::AllowWithoutSound:
    125         return _WKWebsiteAutoplayPolicyAllowWithoutSound;
    126     case WebKit::WebsiteAutoplayPolicy::Deny:
    127         return _WKWebsiteAutoplayPolicyDeny;
    128     }
     75    return [_webpagePreferences _autoplayPolicy];
    12976}
    13077
    13178- (void)setDeviceOrientationAndMotionAccessPolicy:(_WKWebsiteDeviceOrientationAndMotionAccessPolicy)policy
    13279{
    133     switch (policy) {
    134     case _WKWebsiteDeviceOrientationAndMotionAccessPolicyAsk:
    135         _websitePolicies->setDeviceOrientationAndMotionAccessState(WTF::nullopt);
    136         break;
    137     case _WKWebsiteDeviceOrientationAndMotionAccessPolicyGrant:
    138         _websitePolicies->setDeviceOrientationAndMotionAccessState(true);
    139         break;
    140     case _WKWebsiteDeviceOrientationAndMotionAccessPolicyDeny:
    141         _websitePolicies->setDeviceOrientationAndMotionAccessState(false);
    142         break;
    143     }
     80    [_webpagePreferences _setDeviceOrientationAndMotionAccessPolicy:policy];
    14481}
    14582
    14683- (_WKWebsiteDeviceOrientationAndMotionAccessPolicy)deviceOrientationAndMotionAccessPolicy
    14784{
    148     if (!_websitePolicies->deviceOrientationAndMotionAccessState())
    149         return _WKWebsiteDeviceOrientationAndMotionAccessPolicyAsk;
    150     return *_websitePolicies->deviceOrientationAndMotionAccessState() ? _WKWebsiteDeviceOrientationAndMotionAccessPolicyGrant : _WKWebsiteDeviceOrientationAndMotionAccessPolicyDeny;
     85    return [_webpagePreferences _deviceOrientationAndMotionAccessPolicy];
    15186}
    15287
    15388- (void)setPopUpPolicy:(_WKWebsitePopUpPolicy)policy
    15489{
    155     switch (policy) {
    156     case _WKWebsitePopUpPolicyDefault:
    157         _websitePolicies->setPopUpPolicy(WebKit::WebsitePopUpPolicy::Default);
    158         break;
    159     case _WKWebsitePopUpPolicyAllow:
    160         _websitePolicies->setPopUpPolicy(WebKit::WebsitePopUpPolicy::Allow);
    161         break;
    162     case _WKWebsitePopUpPolicyBlock:
    163         _websitePolicies->setPopUpPolicy(WebKit::WebsitePopUpPolicy::Block);
    164         break;
    165     }
     90    [_webpagePreferences _setPopUpPolicy:policy];
    16691}
    16792
    16893- (_WKWebsitePopUpPolicy)popUpPolicy
    16994{
    170     switch (_websitePolicies->popUpPolicy()) {
    171     case WebKit::WebsitePopUpPolicy::Default:
    172         return _WKWebsitePopUpPolicyDefault;
    173     case WebKit::WebsitePopUpPolicy::Allow:
    174         return _WKWebsitePopUpPolicyAllow;
    175     case WebKit::WebsitePopUpPolicy::Block:
    176         return _WKWebsitePopUpPolicyBlock;
    177     }
     95    return [_webpagePreferences _popUpPolicy];
    17896}
    17997
    18098- (NSDictionary<NSString *, NSString *> *)customHeaderFields
    18199{
    182     const auto& fields = _websitePolicies->customHeaderFields();
    183     NSMutableDictionary *dictionary = [[[NSMutableDictionary alloc] initWithCapacity:fields.size()] autorelease];
    184     for (const auto& field : fields)
    185         [dictionary setObject:field.value() forKey:field.name()];
    186     return dictionary;
     100    return [_webpagePreferences _customHeaderFields];
    187101}
    188102
    189103- (void)setCustomHeaderFields:(NSDictionary<NSString *, NSString *> *)fields
    190104{
    191     Vector<WebCore::HTTPHeaderField> parsedFields;
    192     parsedFields.reserveInitialCapacity(fields.count);
    193    
    194     for (NSString* name in fields) {
    195         auto field = WebCore::HTTPHeaderField::create(name, [fields objectForKey:name]);
    196         if (field && startsWithLettersIgnoringASCIICase(field->name(), "x-"))
    197             parsedFields.uncheckedAppend(WTFMove(*field));
    198     }
    199     _websitePolicies->setCustomHeaderFields(WTFMove(parsedFields));
     105    [_webpagePreferences _setCustomHeaderFields:fields];
    200106}
    201107
    202108- (WKWebsiteDataStore *)websiteDataStore
    203109{
    204     return wrapper(_websitePolicies->websiteDataStore());
     110    return [_webpagePreferences _websiteDataStore];
    205111}
    206112
    207113- (void)setWebsiteDataStore:(WKWebsiteDataStore *)websiteDataStore
    208114{
    209     _websitePolicies->setWebsiteDataStore(websiteDataStore->_websiteDataStore.get());
     115    [_webpagePreferences _setWebsiteDataStore:websiteDataStore];
    210116}
    211117
    212118- (void)setCustomUserAgent:(NSString *)customUserAgent
    213119{
    214     _websitePolicies->setCustomUserAgent(customUserAgent);
     120    [_webpagePreferences _setCustomUserAgent:customUserAgent];
    215121}
    216122
    217123- (NSString *)customUserAgent
    218124{
    219     return _websitePolicies->customUserAgent();
     125    return [_webpagePreferences _customUserAgent];
    220126}
    221127
    222128- (void)setCustomJavaScriptUserAgentAsSiteSpecificQuirks:(NSString *)customUserAgent
    223129{
    224     _websitePolicies->setCustomJavaScriptUserAgentAsSiteSpecificQuirks(customUserAgent);
     130    [_webpagePreferences _setCustomJavaScriptUserAgentAsSiteSpecificQuirks:customUserAgent];
    225131}
    226132
    227133- (NSString *)customJavaScriptUserAgentAsSiteSpecificQuirks
    228134{
    229     return _websitePolicies->customJavaScriptUserAgentAsSiteSpecificQuirks();
     135    return [_webpagePreferences _customJavaScriptUserAgentAsSiteSpecificQuirks];
    230136}
    231137
    232138- (void)setCustomNavigatorPlatform:(NSString *)customNavigatorPlatform
    233139{
    234     _websitePolicies->setCustomNavigatorPlatform(customNavigatorPlatform);
     140    [_webpagePreferences _setCustomNavigatorPlatform:customNavigatorPlatform];
    235141}
    236142
    237143- (NSString *)customNavigatorPlatform
    238144{
    239     return _websitePolicies->customNavigatorPlatform();
     145    return [_webpagePreferences _customNavigatorPlatform];
    240146}
    241147
    242148- (NSString *)description
    243149{
    244     return [NSString stringWithFormat:@"<%@: %p; contentBlockersEnabled = %d>", NSStringFromClass(self.class), self, self.contentBlockersEnabled];
     150    return [NSString stringWithFormat:@"<%@ %@>", self.class, [_webpagePreferences description]];
    245151}
    246152
    247153- (API::Object&)_apiObject
    248154{
    249     return *_websitePolicies;
     155    return [_webpagePreferences _apiObject];
    250156}
    251157

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

    r242339 r243726  
    2525
    2626#import "_WKWebsitePolicies.h"
     27#import <wtf/RetainPtr.h>
    2728
    28 #import "APIWebsitePolicies.h"
    29 #import "WKObject.h"
     29@class WKWebpagePreferences;
    3030
    31 namespace WebKit {
    32 
    33 template<> struct WrapperTraits<API::WebsitePolicies> {
    34     using WrapperClass = _WKWebsitePolicies;
    35 };
    36 
     31@interface _WKWebsitePolicies ()
     32{
     33@package
     34    RetainPtr<WKWebpagePreferences> _webpagePreferences;
    3735}
    3836
    39 @interface _WKWebsitePolicies () <WKObject> {
    40 @package
    41     API::ObjectStorage<API::WebsitePolicies> _websitePolicies;
    42 }
     37@property (nonatomic, readonly) WKWebpagePreferences *webpagePreferences;
     38
    4339@end

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

    r243319 r243726  
    5555#import "WKReloadFrameErrorRecoveryAttempter.h"
    5656#import "WKWebViewInternal.h"
     57#import "WKWebpagePreferencesInternal.h"
    5758#import "WebCredential.h"
    5859#import "WebFrameProxy.h"
    … …  
    557558        checker->didCallCompletionHandler();
    558559
    559         RefPtr<API::WebsitePolicies> apiWebsitePolicies = websitePolicies ? websitePolicies->_websitePolicies.get() : nullptr;
     560        RefPtr<API::WebsitePolicies> apiWebsitePolicies = [websitePolicies webpagePreferences] ? [websitePolicies webpagePreferences]->_websitePolicies.get() : nullptr;
    560561        if (apiWebsitePolicies) {
    561562            if (auto* websiteDataStore = apiWebsitePolicies->websiteDataStore()) {

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

    r243671 r243726  
    16351635                ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; };
    16361636                F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1637                F438CD1C2241421400DE6DDA /* WKWebpagePreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = F438CD1B224140A600DE6DDA /* WKWebpagePreferences.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1638                F438CD1F22414D4000DE6DDA /* WKWebpagePreferencesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = F438CD1E22414D4000DE6DDA /* WKWebpagePreferencesInternal.h */; };
     1639                F438CD212241F69500DE6DDA /* WKWebpagePreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F438CD202241F69500DE6DDA /* WKWebpagePreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    16371640                F44291921FA591C9002CC93E /* _WKAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = F44291911FA59107002CC93E /* _WKAttachment.h */; settings = {ATTRIBUTES = (Private, ); }; };
    16381641                F44291961FA5942A002CC93E /* _WKAttachmentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = F44291951FA5942A002CC93E /* _WKAttachmentInternal.h */; };
    … …  
    45654568                F40D1B68220BDC0F00B49A01 /* WebAutocorrectionContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebAutocorrectionContext.h; path = ios/WebAutocorrectionContext.h; sourceTree = "<group>"; };
    45664569                F41056612130699A0092281D /* APIAttachmentCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = APIAttachmentCocoa.mm; sourceTree = "<group>"; };
     4570                F438CD1B224140A600DE6DDA /* WKWebpagePreferences.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKWebpagePreferences.h; sourceTree = "<group>"; };
     4571                F438CD1D22414AD600DE6DDA /* WKWebpagePreferences.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebpagePreferences.mm; sourceTree = "<group>"; };
     4572                F438CD1E22414D4000DE6DDA /* WKWebpagePreferencesInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKWebpagePreferencesInternal.h; sourceTree = "<group>"; };
     4573                F438CD202241F69500DE6DDA /* WKWebpagePreferencesPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKWebpagePreferencesPrivate.h; sourceTree = "<group>"; };
    45674574                F44291911FA59107002CC93E /* _WKAttachment.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = _WKAttachment.h; sourceTree = "<group>"; };
    45684575                F44291931FA59311002CC93E /* _WKAttachment.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKAttachment.mm; sourceTree = "<group>"; };
    … …  
    62536260                                1AAF089C19267FC800B6390C /* WKUserScriptInternal.h */,
    62546261                                7C882DF61C7E995E006BF731 /* WKUserScriptPrivate.h */,
     6262                                F438CD1B224140A600DE6DDA /* WKWebpagePreferences.h */,
     6263                                F438CD1D22414AD600DE6DDA /* WKWebpagePreferences.mm */,
     6264                                F438CD1E22414D4000DE6DDA /* WKWebpagePreferencesInternal.h */,
     6265                                F438CD202241F69500DE6DDA /* WKWebpagePreferencesPrivate.h */,
    62556266                                1A4832CA1A9BC465008B4DFE /* WKWebsiteDataRecord.h */,
    62566267                                1A4832C91A9BC465008B4DFE /* WKWebsiteDataRecord.mm */,
    … …  
    1003810049                                C5E1AFEB16B20B7E006CC1F2 /* WKWebArchiveResource.h in Headers */,
    1003910050                                2D1E8223216FFF5100A15265 /* WKWebEvent.h in Headers */,
     10051                                F438CD1C2241421400DE6DDA /* WKWebpagePreferences.h in Headers */,
     10052                                F438CD1F22414D4000DE6DDA /* WKWebpagePreferencesInternal.h in Headers */,
     10053                                F438CD212241F69500DE6DDA /* WKWebpagePreferencesPrivate.h in Headers */,
    1004010054                                5CADDE05215046BD0067D309 /* WKWebProcess.h in Headers */,
    1004110055                                1AA2E56718D77508003814BD /* WKWebProcessBundleParameters.h in Headers */,
Note: See TracChangeset for help on using the changeset viewer.