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

Changeset 188228 in webkit


Ignore:
Timestamp:
Aug 10, 2015, 1:51:54 PM (11 years ago)
Author:
weinig@apple.com
Message:

Replace WebPageConfiguration with API::PageConfiguration and expose a C-SPI accessor for it
​https://bugs.webkit.org/show_bug.cgi?id=147811

Reviewed by Darin Adler.

  • Adds the missing pieces from WebPageConfiguration into API::PageConfiguration.
  • Adds C-SPI to set and get the WebsiteDataStore on the WKPageConfigurationRef.
  • Uses API::PageConfiguration to pass configuration information from WKWebView/WKView to WebPageProxy.
  • Stores the API::PageConfiguration on the WebPageProxy and exposes a new C-SPI function, WKPageCopyPageConfiguration, to get a copy of it.
  • UIProcess/API/APIPageConfiguration.cpp:

(API::PageConfiguration::create):
(API::PageConfiguration::PageConfiguration):
(API::PageConfiguration::~PageConfiguration):
(API::PageConfiguration::copy):
(API::PageConfiguration::processPool):
(API::PageConfiguration::setRelatedPage):
(API::PageConfiguration::visitedLinkProvider):
(API::PageConfiguration::setVisitedLinkProvider):
(API::PageConfiguration::websiteDataStore):
(API::PageConfiguration::setWebsiteDataStore):
(API::PageConfiguration::sessionID):
(API::PageConfiguration::setSessionID):
(API::PageConfiguration::webPageConfiguration): Deleted.

  • UIProcess/API/APIPageConfiguration.h:

(API::PageConfiguration::preferenceValues):
(API::PageConfiguration::treatsSHA1SignedCertificatesAsInsecure):
(API::PageConfiguration::setTreatsSHA1SignedCertificatesAsInsecure):
(API::PageConfiguration::alwaysRunsAtForegroundPriority):
(API::PageConfiguration::setAlwaysRunsAtForegroundPriority):
(API::PageConfiguration::create): Deleted.

  • UIProcess/API/C/WKPage.cpp:

(WKPageGetPageGroup):
(WKPageCopyPageConfiguration):
(WKPageLoadURL):

  • UIProcess/API/C/WKPage.h:
  • UIProcess/API/C/WKPageConfigurationRef.cpp:

(WKPageConfigurationSetRelatedPage):
(WKPageConfigurationGetWebsiteDataStore):
(WKPageConfigurationSetWebsiteDataStore):

  • UIProcess/API/C/WKPageConfigurationRef.h:
  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView initWithFrame:configuration:]):

  • UIProcess/API/ios/WKViewIOS.mm:

(-[WKView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):

  • UIProcess/API/mac/WKView.mm:

(-[WKView _setPrimaryTrackingArea:]):
(-[WKView initWithFrame:processPool:configuration:webView:]):
(-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
(-[WKView initWithFrame:configurationRef:]):
(-[WKView wantsUpdateLayer]):

  • UIProcess/API/mac/WKViewInternal.h:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::create):
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::~WebPageProxy):
(WebKit::WebPageProxy::configuration):
(WebKit::WebPageProxy::processIdentifier):

  • UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::pageID):
(WebKit::WebPageProxy::sessionID):

  • UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::createNewWebProcessRespectingProcessCountLimit):
(WebKit::WebProcessPool::createWebPage):
(WebKit::WebProcessPool::download):

  • UIProcess/WebProcessPool.h:
  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::webPage):
(WebKit::WebProcessProxy::createWebPage):

  • UIProcess/WebProcessProxy.h:

(WebKit::WebProcessProxy::processPool):

  • UIProcess/ios/WKContentView.h:
  • UIProcess/ios/WKContentView.mm:

(-[WKContentView _commonInitializationWithProcessPool:configuration:]):
(-[WKContentView initWithFrame:processPool:configuration:webView:]):
(-[WKContentView initWithFrame:processPool:configuration:wkView:]):
(-[WKContentView dealloc]):

Location:
trunk/Source/WebKit2
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/CMakeLists.txt

    r186484 r188228  
    394394    UIProcess/API/APINavigation.cpp
    395395    UIProcess/API/APINavigationData.cpp
     396    UIProcess/API/APIPageConfiguration.cpp
    396397    UIProcess/API/APIProcessPoolConfiguration.cpp
    397398    UIProcess/API/APISession.cpp

  • trunk/Source/WebKit2/ChangeLog

    r188223 r188228  
     12015-08-08  Sam Weinig  <sam@webkit.org>
     2
     3        Replace WebPageConfiguration with API::PageConfiguration and expose a C-SPI accessor for it
     4        https://bugs.webkit.org/show_bug.cgi?id=147811
     5
     6        Reviewed by Darin Adler.
     7
     8        - Adds the missing pieces from WebPageConfiguration into API::PageConfiguration.
     9        - Adds C-SPI to set and get the WebsiteDataStore on the WKPageConfigurationRef.
     10        - Uses API::PageConfiguration to pass configuration information from WKWebView/WKView
     11          to WebPageProxy.
     12        - Stores the API::PageConfiguration on the WebPageProxy and exposes a new C-SPI function,
     13          WKPageCopyPageConfiguration, to get a copy of it.
     14
     15        * UIProcess/API/APIPageConfiguration.cpp:
     16        (API::PageConfiguration::create):
     17        (API::PageConfiguration::PageConfiguration):
     18        (API::PageConfiguration::~PageConfiguration):
     19        (API::PageConfiguration::copy):
     20        (API::PageConfiguration::processPool):
     21        (API::PageConfiguration::setRelatedPage):
     22        (API::PageConfiguration::visitedLinkProvider):
     23        (API::PageConfiguration::setVisitedLinkProvider):
     24        (API::PageConfiguration::websiteDataStore):
     25        (API::PageConfiguration::setWebsiteDataStore):
     26        (API::PageConfiguration::sessionID):
     27        (API::PageConfiguration::setSessionID):
     28        (API::PageConfiguration::webPageConfiguration): Deleted.
     29        * UIProcess/API/APIPageConfiguration.h:
     30        (API::PageConfiguration::preferenceValues):
     31        (API::PageConfiguration::treatsSHA1SignedCertificatesAsInsecure):
     32        (API::PageConfiguration::setTreatsSHA1SignedCertificatesAsInsecure):
     33        (API::PageConfiguration::alwaysRunsAtForegroundPriority):
     34        (API::PageConfiguration::setAlwaysRunsAtForegroundPriority):
     35        (API::PageConfiguration::create): Deleted.
     36        * UIProcess/API/C/WKPage.cpp:
     37        (WKPageGetPageGroup):
     38        (WKPageCopyPageConfiguration):
     39        (WKPageLoadURL):
     40        * UIProcess/API/C/WKPage.h:
     41        * UIProcess/API/C/WKPageConfigurationRef.cpp:
     42        (WKPageConfigurationSetRelatedPage):
     43        (WKPageConfigurationGetWebsiteDataStore):
     44        (WKPageConfigurationSetWebsiteDataStore):
     45        * UIProcess/API/C/WKPageConfigurationRef.h:
     46        * UIProcess/API/Cocoa/WKWebView.mm:
     47        (-[WKWebView initWithFrame:configuration:]):
     48        * UIProcess/API/ios/WKViewIOS.mm:
     49        (-[WKView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
     50        * UIProcess/API/mac/WKView.mm:
     51        (-[WKView _setPrimaryTrackingArea:]):
     52        (-[WKView initWithFrame:processPool:configuration:webView:]):
     53        (-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
     54        (-[WKView initWithFrame:configurationRef:]):
     55        (-[WKView wantsUpdateLayer]):
     56        * UIProcess/API/mac/WKViewInternal.h:
     57        * UIProcess/WebPageProxy.cpp:
     58        (WebKit::WebPageProxy::create):
     59        (WebKit::WebPageProxy::WebPageProxy):
     60        (WebKit::WebPageProxy::~WebPageProxy):
     61        (WebKit::WebPageProxy::configuration):
     62        (WebKit::WebPageProxy::processIdentifier):
     63        * UIProcess/WebPageProxy.h:
     64        (WebKit::WebPageProxy::pageID):
     65        (WebKit::WebPageProxy::sessionID):
     66        * UIProcess/WebProcessPool.cpp:
     67        (WebKit::WebProcessPool::createNewWebProcessRespectingProcessCountLimit):
     68        (WebKit::WebProcessPool::createWebPage):
     69        (WebKit::WebProcessPool::download):
     70        * UIProcess/WebProcessPool.h:
     71        * UIProcess/WebProcessProxy.cpp:
     72        (WebKit::WebProcessProxy::webPage):
     73        (WebKit::WebProcessProxy::createWebPage):
     74        * UIProcess/WebProcessProxy.h:
     75        (WebKit::WebProcessProxy::processPool):
     76        * UIProcess/ios/WKContentView.h:
     77        * UIProcess/ios/WKContentView.mm:
     78        (-[WKContentView _commonInitializationWithProcessPool:configuration:]):
     79        (-[WKContentView initWithFrame:processPool:configuration:webView:]):
     80        (-[WKContentView initWithFrame:processPool:configuration:wkView:]):
     81        (-[WKContentView dealloc]):
     82
    1832015-08-10  Commit Queue  <commit-queue@webkit.org>
    284

  • trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp

    r178618 r188228  
    3838namespace API {
    3939
     40Ref<PageConfiguration> PageConfiguration::create()
     41{
     42    return adoptRef(*new PageConfiguration);
     43}
     44
    4045PageConfiguration::PageConfiguration()
    4146{
    … …  
    4550{
    4651}
     52
     53Ref<PageConfiguration> PageConfiguration::copy() const
     54{
     55    auto copy = create();
     56
     57    copy->m_processPool = this->m_processPool;
     58    copy->m_userContentController = this->m_userContentController;
     59    copy->m_pageGroup = this->m_pageGroup;
     60    copy->m_preferences = this->m_preferences;
     61    copy->m_preferenceValues = this->m_preferenceValues;
     62    copy->m_relatedPage = this->m_relatedPage;
     63    copy->m_visitedLinkProvider = this->m_visitedLinkProvider;
     64    copy->m_websiteDataStore = this->m_websiteDataStore;
     65    copy->m_sessionID = this->m_sessionID;
     66    copy->m_treatsSHA1SignedCertificatesAsInsecure = this->m_treatsSHA1SignedCertificatesAsInsecure;
     67#if PLATFORM(IOS)
     68    copy->m_alwaysRunsAtForegroundPriority = this->m_alwaysRunsAtForegroundPriority;
     69#endif
     70
     71    return copy;
     72}
     73
    4774
    4875WebProcessPool* PageConfiguration::processPool()
    … …  
    96123}
    97124
    98 WebKit::WebPageConfiguration PageConfiguration::webPageConfiguration()
     125
     126VisitedLinkProvider* PageConfiguration::visitedLinkProvider()
    99127{
    100     WebKit::WebPageConfiguration configuration;
     128    return m_visitedLinkProvider.get();
     129}
    101130
    102     configuration.userContentController = userContentController();
    103     configuration.pageGroup = pageGroup();
    104     configuration.preferences = preferences();
    105     configuration.relatedPage = relatedPage();
     131void PageConfiguration::setVisitedLinkProvider(VisitedLinkProvider* visitedLinkProvider)
     132{
     133    m_visitedLinkProvider = visitedLinkProvider;
     134}
    106135
    107     return configuration;
     136API::WebsiteDataStore* PageConfiguration::websiteDataStore()
     137{
     138    return m_websiteDataStore.get();
     139}
     140
     141void PageConfiguration::setWebsiteDataStore(API::WebsiteDataStore* websiteDataStore)
     142{
     143    m_websiteDataStore = websiteDataStore;
     144}
     145
     146WebCore::SessionID PageConfiguration::sessionID()
     147{
     148    return m_sessionID;
     149}
     150
     151void PageConfiguration::setSessionID(WebCore::SessionID sessionID)
     152{
     153    m_sessionID = sessionID;
    108154}
    109155

  • trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h

    r178618 r188228  
    2828
    2929#include "APIObject.h"
     30#include "WebPreferencesStore.h"
     31#include <WebCore/SessionID.h>
    3032#include <wtf/GetPtr.h>
    3133
    3234namespace WebKit {
    33 struct WebPageConfiguration;
     35class VisitedLinkProvider;
     36class WebPageGroup;
     37class WebPageProxy;
     38class WebPreferences;
     39class WebProcessPool;
    3440class WebUserContentControllerProxy;
    35 class WebProcessPool;
    36 class WebPageGroup;
    37 class WebPreferences;
    38 class WebPageProxy;
    3941}
    4042
    4143namespace API {
    4244
     45class WebsiteDataStore;
     46
    4347class PageConfiguration : public ObjectImpl<Object::Type::PageConfiguration> {
    4448public:
    45     static Ref<PageConfiguration> create()
    46     {
    47         return adoptRef(*new PageConfiguration);
    48     }
     49    static Ref<PageConfiguration> create();
     50
     51    explicit PageConfiguration();
    4952    virtual ~PageConfiguration();
     53
     54    Ref<PageConfiguration> copy() const;
    5055
    5156    // FIXME: The configuration properties should return their default values
    … …  
    6469    void setPreferences(WebKit::WebPreferences*);
    6570
     71    WebKit::WebPreferencesStore::ValueMap& preferenceValues() { return m_preferenceValues; }
     72
    6673    WebKit::WebPageProxy* relatedPage();
    6774    void setRelatedPage(WebKit::WebPageProxy*);
    6875
    69     WebKit::WebPageConfiguration webPageConfiguration();
     76    WebKit::VisitedLinkProvider* visitedLinkProvider();
     77    void setVisitedLinkProvider(WebKit::VisitedLinkProvider*);
     78
     79    WebsiteDataStore* websiteDataStore();
     80    void setWebsiteDataStore(WebsiteDataStore*);
     81
     82    WebCore::SessionID sessionID();
     83    void setSessionID(WebCore::SessionID);
     84
     85    bool treatsSHA1SignedCertificatesAsInsecure() { return m_treatsSHA1SignedCertificatesAsInsecure; }
     86    void setTreatsSHA1SignedCertificatesAsInsecure(bool treatsSHA1SignedCertificatesAsInsecure) { m_treatsSHA1SignedCertificatesAsInsecure = treatsSHA1SignedCertificatesAsInsecure; }
     87
     88#if PLATFORM(IOS)
     89    bool alwaysRunsAtForegroundPriority() { return m_alwaysRunsAtForegroundPriority; }
     90    void setAlwaysRunsAtForegroundPriority(bool alwaysRunsAtForegroundPriority) { m_alwaysRunsAtForegroundPriority = alwaysRunsAtForegroundPriority; }
     91#endif
    7092
    7193private:
    72     PageConfiguration();
    7394
    7495    RefPtr<WebKit::WebProcessPool> m_processPool;
    … …  
    7697    RefPtr<WebKit::WebPageGroup> m_pageGroup;
    7798    RefPtr<WebKit::WebPreferences> m_preferences;
     99    WebKit::WebPreferencesStore::ValueMap m_preferenceValues;
    78100    RefPtr<WebKit::WebPageProxy> m_relatedPage;
     101    RefPtr<WebKit::VisitedLinkProvider> m_visitedLinkProvider;
     102
     103    RefPtr<WebsiteDataStore> m_websiteDataStore;
     104    // FIXME: We currently have to pass the session ID separately here to support the legacy private browsing session.
     105    // Once we get rid of it we should get rid of this configuration parameter as well.
     106    WebCore::SessionID m_sessionID;
     107
     108    bool m_treatsSHA1SignedCertificatesAsInsecure = false;
     109#if PLATFORM(IOS)
     110    bool m_alwaysRunsAtForegroundPriority = false;
     111#endif
    79112};
    80113

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

    r187002 r188228  
    3838#include "APINavigationClient.h"
    3939#include "APINavigationResponse.h"
     40#include "APIPageConfiguration.h"
    4041#include "APIPolicyClient.h"
    4142#include "APISessionState.h"
    … …  
    128129}
    129130
     131WKPageConfigurationRef WKPageCopyPageConfiguration(WKPageRef pageRef)
     132{
     133    return toAPI(&toImpl(pageRef)->configuration().copy().leakRef());
     134}
     135
    130136void WKPageLoadURL(WKPageRef pageRef, WKURLRef URLRef)
    131137{

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

    r185840 r188228  
    6060WK_EXPORT WKPageGroupRef WKPageGetPageGroup(WKPageRef page);
    6161
     62WK_EXPORT WKPageConfigurationRef WKPageCopyPageConfiguration(WKPageRef page);
     63
    6264// URL Requests
    6365WK_EXPORT void WKPageLoadURL(WKPageRef page, WKURLRef url);

  • trunk/Source/WebKit2/UIProcess/API/C/WKPageConfigurationRef.cpp

    r180362 r188228  
    9494    toImpl(configuration)->setRelatedPage(toImpl(relatedPage));
    9595}
     96
     97WKWebsiteDataStoreRef WKPageConfigurationGetWebsiteDataStore(WKPageConfigurationRef configuration)
     98{
     99    return toAPI(toImpl(configuration)->websiteDataStore());
     100}
     101
     102void WKPageConfigurationSetWebsiteDataStore(WKPageConfigurationRef configuration, WKWebsiteDataStoreRef websiteDataStore)
     103{
     104    toImpl(configuration)->setWebsiteDataStore(toImpl(websiteDataStore));
     105}

  • trunk/Source/WebKit2/UIProcess/API/C/WKPageConfigurationRef.h

    r178618 r188228  
    5252WK_EXPORT void WKPageConfigurationSetRelatedPage(WKPageConfigurationRef configuration, WKPageRef relatedPage);
    5353
     54WK_EXPORT WKWebsiteDataStoreRef WKPageConfigurationGetWebsiteDataStore(WKPageConfigurationRef configuration);
     55WK_EXPORT void WKPageConfigurationSetWebsiteDataStore(WKPageConfigurationRef configuration, WKWebsiteDataStoreRef websiteDataStore);
     56
    5457#ifdef __cplusplus
    5558}

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

    r188223 r188228  
    3030
    3131#import "APIFormClient.h"
     32#import "APIPageConfiguration.h"
    3233#import "APISerializedScriptValue.h"
    3334#import "CompletionHandlerCallChecker.h"
    … …  
    301302
    302303    WebKit::WebProcessPool& processPool = *[_configuration processPool]->_processPool;
    303 
    304     WebKit::WebPageConfiguration webPageConfiguration;
    305     webPageConfiguration.preferences = [_configuration preferences]->_preferences.get();
     304   
     305    auto pageConfiguration = API::PageConfiguration::create();
     306
     307    pageConfiguration->setProcessPool(&processPool);
     308    pageConfiguration->setPreferences([_configuration preferences]->_preferences.get());
    306309    if (WKWebView *relatedWebView = [_configuration _relatedWebView])
    307         webPageConfiguration.relatedPage = relatedWebView->_page.get();
    308 
    309     webPageConfiguration.userContentController = [_configuration userContentController]->_userContentControllerProxy.get();
    310     webPageConfiguration.visitedLinkProvider = [_configuration _visitedLinkProvider]->_visitedLinkProvider.get();
    311     webPageConfiguration.websiteDataStore = &[_configuration websiteDataStore]->_websiteDataStore->websiteDataStore();
    312     webPageConfiguration.sessionID = webPageConfiguration.websiteDataStore->sessionID();
    313     webPageConfiguration.treatsSHA1SignedCertificatesAsInsecure = [_configuration _treatsSHA1SignedCertificatesAsInsecure];
     310        pageConfiguration->setRelatedPage(relatedWebView->_page.get());
     311
     312    pageConfiguration->setUserContentController([_configuration userContentController]->_userContentControllerProxy.get());
     313    pageConfiguration->setVisitedLinkProvider([_configuration _visitedLinkProvider]->_visitedLinkProvider.get());
     314    pageConfiguration->setWebsiteDataStore([_configuration websiteDataStore]->_websiteDataStore.get());
     315    pageConfiguration->setSessionID(pageConfiguration->websiteDataStore()->websiteDataStore().sessionID());
     316    pageConfiguration->setTreatsSHA1SignedCertificatesAsInsecure([_configuration _treatsSHA1SignedCertificatesAsInsecure]);
    314317
    315318    RefPtr<WebKit::WebPageGroup> pageGroup;
    … …  
    317320    if (groupIdentifier.length) {
    318321        pageGroup = WebKit::WebPageGroup::create(configuration._groupIdentifier);
    319         webPageConfiguration.pageGroup = pageGroup.get();
    320     }
    321 
    322     webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::suppressesIncrementalRenderingKey(), WebKit::WebPreferencesStore::Value(!![_configuration suppressesIncrementalRendering]));
     322        pageConfiguration->setPageGroup(pageGroup.get());
     323    }
     324
     325    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::suppressesIncrementalRenderingKey(), WebKit::WebPreferencesStore::Value(!![_configuration suppressesIncrementalRendering]));
    323326
    324327#if PLATFORM(IOS)
    325     webPageConfiguration.alwaysRunsAtForegroundPriority = [_configuration _alwaysRunsAtForegroundPriority];
    326 
    327     webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
    328     webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsPictureInPictureMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback()));
    329     webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::requiresUserGestureForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration requiresUserActionForMediaPlayback]));
     328    pageConfiguration->setAlwaysRunsAtForegroundPriority([_configuration _alwaysRunsAtForegroundPriority]);
     329
     330    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
     331    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsPictureInPictureMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback()));
     332    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::requiresUserGestureForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration requiresUserActionForMediaPlayback]));
    330333#endif
    331334#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    332     webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAirPlayForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsAirPlayForMediaPlayback]));
     335    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsAirPlayForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsAirPlayForMediaPlayback]));
    333336#endif
    334337
    … …  
    340343    [self addSubview:_scrollView.get()];
    341344
    342     _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds processPool:processPool configuration:WTF::move(webPageConfiguration) webView:self]);
     345    _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds processPool:processPool configuration:WTF::move(pageConfiguration) webView:self]);
    343346
    344347    _page = [_contentView page];
    … …  
    368371
    369372#if PLATFORM(MAC)
    370     _wkView = adoptNS([[WKView alloc] initWithFrame:bounds processPool:processPool configuration:WTF::move(webPageConfiguration) webView:self]);
     373    _wkView = adoptNS([[WKView alloc] initWithFrame:bounds processPool:processPool configuration:WTF::move(pageConfiguration) webView:self]);
    371374    [self addSubview:_wkView.get()];
    372375    _page = WebKit::toImpl([_wkView pageRef]);

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

    r187543 r188228  
    2222
    2323#include "APIDownloadClient.h"
     24#include "APIPageConfiguration.h"
    2425#include "APIProcessPoolConfiguration.h"
    2526#include "APIString.h"
    … …  
    13161317{
    13171318    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(webView);
    1318     WebPageConfiguration webPageConfiguration;
    1319     webPageConfiguration.preferences = webkitSettingsGetPreferences(webkit_web_view_get_settings(webView));
    1320     webPageConfiguration.relatedPage = relatedView ? webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(relatedView)) : nullptr;
    1321     webPageConfiguration.userContentController = userContentManager ? webkitUserContentManagerGetUserContentControllerProxy(userContentManager) : nullptr;
    1322     webPageConfiguration.websiteDataStore = &webkitWebsiteDataManagerGetDataStore(context->priv->websiteDataManager.get());
    1323     webPageConfiguration.sessionID = webPageConfiguration.websiteDataStore->sessionID();
    1324     webkitWebViewBaseCreateWebPage(webViewBase, context->priv->context.get(), WTF::move(webPageConfiguration));
     1319
     1320    auto pageConfiguration = API::PageConfiguration::create();
     1321    pageConfiguration->setPreferences(webkitSettingsGetPreferences(webkit_web_view_get_settings(webView)));
     1322    pageConfiguration->setRelatedPage(relatedView ? webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(relatedView)) : nullptr);
     1323    pageConfiguration->setUserContentController(userContentManager ? webkitUserContentManagerGetUserContentControllerProxy(userContentManager) : nullptr);
     1324    pageConfiguration->setWebsiteDataStore(&webkitWebsiteDataManagerGetDataStore(context->priv->websiteDataManager.get()));
     1325    pageConfiguration->setSessionID(pageConfiguration->websiteDataStore()->websiteDataStore().sessionID());
     1326    webkitWebViewBaseCreateWebPage(webViewBase, context->priv->context.get(), WTF::move(pageConfiguration));
    13251327
    13261328    WebPageProxy* page = webkitWebViewBaseGetPage(webViewBase);

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

    r188208 r188228  
    3030#include "WebKitWebViewBase.h"
    3131
     32#include "APIPageConfiguration.h"
    3233#include "DrawingAreaProxyImpl.h"
    3334#include "InputMethodFilter.h"
    … …  
    10461047{
    10471048    WebKitWebViewBase* webkitWebViewBase = WEBKIT_WEB_VIEW_BASE(g_object_new(WEBKIT_TYPE_WEB_VIEW_BASE, nullptr));
    1048     WebPageConfiguration webPageConfiguration;
    1049     webPageConfiguration.preferences = preferences;
    1050     webPageConfiguration.pageGroup = pageGroup;
    1051     webPageConfiguration.relatedPage = relatedPage;
    1052     webPageConfiguration.userContentController = userContentController;
    1053     webkitWebViewBaseCreateWebPage(webkitWebViewBase, context, WTF::move(webPageConfiguration));
     1049
     1050    auto pageConfiguration = API::PageConfiguration::create();
     1051    pageConfiguration->setPreferences(preferences);
     1052    pageConfiguration->setPageGroup(pageGroup);
     1053    pageConfiguration->setRelatedPage(relatedPage);
     1054    pageConfiguration->setUserContentController(userContentController);
     1055    webkitWebViewBaseCreateWebPage(webkitWebViewBase, context, WTF::move(pageConfiguration));
    10541056    return webkitWebViewBase;
    10551057}
    … …  
    10721074#endif // HAVE(GTK_SCALE_FACTOR)
    10731075
    1074 void webkitWebViewBaseCreateWebPage(WebKitWebViewBase* webkitWebViewBase, WebProcessPool* context, WebPageConfiguration&& configuration)
     1076void webkitWebViewBaseCreateWebPage(WebKitWebViewBase* webkitWebViewBase, WebProcessPool* context, Ref<API::PageConfiguration>&& configuration)
    10751077{
    10761078    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h

    r186221 r188228  
    4040GtkIMContext* webkitWebViewBaseGetIMContext(WebKitWebViewBase*);
    4141WebKit::WebPageProxy* webkitWebViewBaseGetPage(WebKitWebViewBase*);
    42 void webkitWebViewBaseCreateWebPage(WebKitWebViewBase*, WebKit::WebProcessPool*, WebKit::WebPageConfiguration&&);
     42void webkitWebViewBaseCreateWebPage(WebKitWebViewBase*, WebKit::WebProcessPool*, Ref<API::PageConfiguration>&&);
    4343void webkitWebViewBaseSetTooltipText(WebKitWebViewBase*, const char*);
    4444void webkitWebViewBaseSetTooltipArea(WebKitWebViewBase*, const WebCore::IntRect&);

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp

    r185950 r188228  
    7171
    7272struct _WebKitWebsiteDataManagerPrivate {
    73     RefPtr<WebsiteDataStore> websiteDataStore;
     73    RefPtr<API::WebsiteDataStore> websiteDataStore;
    7474    GUniquePtr<char> baseDataDirectory;
    7575    GUniquePtr<char> baseCacheDirectory;
    … …  
    300300{
    301301    WebKitWebsiteDataManager* manager = WEBKIT_WEBSITE_DATA_MANAGER(g_object_new(WEBKIT_TYPE_WEBSITE_DATA_MANAGER, nullptr));
    302     manager->priv->websiteDataStore = WebsiteDataStore::create(WTF::move(configuration));
     302    manager->priv->websiteDataStore = API::WebsiteDataStore::create(WTF::move(configuration));
    303303
    304304    return manager;
    305305}
    306306
    307 WebsiteDataStore& webkitWebsiteDataManagerGetDataStore(WebKitWebsiteDataManager* manager)
     307API::WebsiteDataStore& webkitWebsiteDataManagerGetDataStore(WebKitWebsiteDataManager* manager)
    308308{
    309309    WebKitWebsiteDataManagerPrivate* priv = manager->priv;
    … …  
    319319            API::WebsiteDataStore::defaultWebSQLDatabaseDirectory() : WebCore::filenameToString(priv->webSQLDirectory.get());
    320320        configuration.mediaKeysStorageDirectory = API::WebsiteDataStore::defaultMediaKeysStorageDirectory();
    321         priv->websiteDataStore = WebsiteDataStore::create(WTF::move(configuration));
     321        priv->websiteDataStore = API::WebsiteDataStore::create(WTF::move(configuration));
    322322    }
    323323

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManagerPrivate.h

    r185950 r188228  
    2121#define WebKitWebsiteDataManagerPrivate_h
    2222
     23#include "APIWebsiteDataStore.h"
    2324#include "WebKitPrivate.h"
    2425#include "WebsiteDataStore.h"
    2526
    2627WebKitWebsiteDataManager* webkitWebsiteDataManagerCreate(WebKit::WebsiteDataStore::Configuration&&);
    27 WebKit::WebsiteDataStore& webkitWebsiteDataManagerGetDataStore(WebKitWebsiteDataManager*);
     28API::WebsiteDataStore& webkitWebsiteDataManagerGetDataStore(WebKitWebsiteDataManager*);
    2829
    2930#endif // WebKitWebsiteDataManagerPrivate_h

  • trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm

    r185127 r188228  
    2929#if PLATFORM(IOS)
    3030
     31#import "APIPageConfiguration.h"
    3132#import "RemoteLayerTreeTransaction.h"
    3233#import "UIKitSPI.h"
    … …  
    226227    [self addSubview:_scrollView.get()];
    227228
    228     WebKit::WebPageConfiguration webPageConfiguration;
    229     webPageConfiguration.pageGroup = toImpl(pageGroupRef);
    230     webPageConfiguration.relatedPage = toImpl(relatedPage);
    231 
    232     _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds processPool:*toImpl(contextRef) configuration:WTF::move(webPageConfiguration) wkView:self]);
     229    auto configuration = API::PageConfiguration::create();
     230    configuration->setProcessPool(toImpl(contextRef));
     231    configuration->setPageGroup(toImpl(pageGroupRef));
     232    configuration->setRelatedPage(toImpl(relatedPage));
     233
     234    _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds processPool:*toImpl(contextRef) configuration:WTF::move(configuration) wkView:self]);
    233235
    234236    [[_contentView layer] setAnchorPoint:CGPointZero];

  • trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

    r188011 r188228  
    37453745}
    37463746
    3747 - (instancetype)initWithFrame:(NSRect)frame processPool:(WebProcessPool&)processPool configuration:(WebPageConfiguration)webPageConfiguration webView:(WKWebView *)webView
     3747- (instancetype)initWithFrame:(NSRect)frame processPool:(WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView
    37483748{
    37493749    self = [super initWithFrame:frame];
    … …  
    37673767
    37683768    _data->_pageClient = std::make_unique<PageClientImpl>(self, webView);
    3769     _data->_page = processPool.createWebPage(*_data->_pageClient, WTF::move(webPageConfiguration));
     3769    _data->_page = processPool.createWebPage(*_data->_pageClient, WTF::move(configuration));
    37703770    _data->_page->setAddsVisitedLinks(processPool.historyClient().addsVisitedLinks());
    37713771
    … …  
    39953995- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef relatedToPage:(WKPageRef)relatedPage
    39963996{
    3997     WebPageConfiguration webPageConfiguration;
    3998     webPageConfiguration.pageGroup = toImpl(pageGroupRef);
    3999     webPageConfiguration.relatedPage = toImpl(relatedPage);
    4000 
    4001     return [self initWithFrame:frame processPool:*toImpl(contextRef) configuration:webPageConfiguration webView:nil];
    4002 }
    4003 
    4004 - (id)initWithFrame:(NSRect)frame configurationRef:(WKPageConfigurationRef)configuration
    4005 {
    4006     auto& processPool = *toImpl(configuration)->processPool();
    4007     auto webPageConfiguration = toImpl(configuration)->webPageConfiguration();
    4008 
    4009     return [self initWithFrame:frame processPool:processPool configuration:webPageConfiguration webView:nil];
     3997    auto configuration = API::PageConfiguration::create();
     3998    configuration->setProcessPool(toImpl(contextRef));
     3999    configuration->setPageGroup(toImpl(pageGroupRef));
     4000    configuration->setRelatedPage(toImpl(relatedPage));
     4001
     4002    return [self initWithFrame:frame processPool:*toImpl(contextRef) configuration:WTF::move(configuration) webView:nil];
     4003}
     4004
     4005- (id)initWithFrame:(NSRect)frame configurationRef:(WKPageConfigurationRef)configurationRef
     4006{
     4007    Ref<API::PageConfiguration> configuration = *toImpl(configurationRef);
     4008    auto& processPool = *configuration->processPool();
     4009
     4010    return [self initWithFrame:frame processPool:processPool configuration:WTF::move(configuration) webView:nil];
    40104011}
    40114012

  • trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h

    r188011 r188228  
    3939namespace API {
    4040class Object;
     41class PageConfiguration;
    4142}
    4243
    … …  
    5960struct ColorSpaceData;
    6061struct EditorState;
    61 struct WebPageConfiguration;
    6262}
    6363
    … …  
    6969
    7070@interface WKView ()
    71 #if WK_API_ENABLED
    72 - (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(WebKit::WebPageConfiguration)webPageConfiguration webView:(WKWebView *)webView;
    73 #endif
     71- (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView;
    7472
    7573- (std::unique_ptr<WebKit::DrawingAreaProxy>)_createDrawingAreaProxy;

  • trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp

    r187795 r188228  
    3030#include "WebView.h"
    3131
     32#include "APIPageConfiguration.h"
    3233#include "CoordinatedDrawingAreaProxy.h"
    3334#include "CoordinatedGraphicsScene.h"
    … …  
    5354    , m_opacity(1.0)
    5455{
    55     WebPageConfiguration webPageConfiguration;
    56     webPageConfiguration.pageGroup = pageGroup;
     56    auto pageConfiguration = API::PageConfiguration::create();
     57    pageConfiguration->setPageGroup(pageGroup);
    5758
    5859    // Need to call createWebPage after other data members, specifically m_visible, are initialized.
    59     m_page = context->createWebPage(*this, WTF::move(webPageConfiguration));
     60    m_page = context->createWebPage(*this, WTF::move(pageConfiguration));
    6061
    6162    m_page->pageGroup().preferences().setAcceleratedCompositingEnabled(true);

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r188030 r188228  
    4141#include "APINavigationClient.h"
    4242#include "APINavigationResponse.h"
     43#include "APIPageConfiguration.h"
    4344#include "APIPolicyClient.h"
    4445#include "APISecurityOrigin.h"
    … …  
    294295};
    295296
    296 Ref<WebPageProxy> WebPageProxy::create(PageClient& pageClient, WebProcessProxy& process, uint64_t pageID, const WebPageConfiguration& configuration)
    297 {
    298     return adoptRef(*new WebPageProxy(pageClient, process, pageID, configuration));
    299 }
    300 
    301 WebPageProxy::WebPageProxy(PageClient& pageClient, WebProcessProxy& process, uint64_t pageID, const WebPageConfiguration& configuration)
     297Ref<WebPageProxy> WebPageProxy::create(PageClient& pageClient, WebProcessProxy& process, uint64_t pageID, Ref<API::PageConfiguration>&& configuration)
     298{
     299    return adoptRef(*new WebPageProxy(pageClient, process, pageID, WTF::move(configuration)));
     300}
     301
     302WebPageProxy::WebPageProxy(PageClient& pageClient, WebProcessProxy& process, uint64_t pageID, Ref<API::PageConfiguration>&& configuration)
    302303    : m_pageClient(pageClient)
     304    , m_configuration(WTF::move(configuration))
    303305    , m_loaderClient(std::make_unique<API::LoaderClient>())
    304306    , m_policyClient(std::make_unique<API::PolicyClient>())
    … …  
    312314    , m_navigationState(std::make_unique<WebNavigationState>())
    313315    , m_process(process)
    314     , m_pageGroup(*configuration.pageGroup)
    315     , m_preferences(*configuration.preferences)
    316     , m_userContentController(configuration.userContentController)
    317     , m_visitedLinkProvider(*configuration.visitedLinkProvider)
    318     , m_websiteDataStore(*configuration.websiteDataStore)
     316    , m_pageGroup(*m_configuration->pageGroup())
     317    , m_preferences(*m_configuration->preferences())
     318    , m_userContentController(m_configuration->userContentController())
     319    , m_visitedLinkProvider(*m_configuration->visitedLinkProvider())
     320    , m_websiteDataStore(m_configuration->websiteDataStore()->websiteDataStore())
    319321    , m_mainFrame(nullptr)
    320322    , m_userAgent(standardUserAgent())
    321     , m_treatsSHA1CertificatesAsInsecure(configuration.treatsSHA1SignedCertificatesAsInsecure)
     323    , m_treatsSHA1CertificatesAsInsecure(m_configuration->treatsSHA1SignedCertificatesAsInsecure())
    322324#if PLATFORM(IOS)
    323325    , m_hasReceivedLayerTreeTransactionAfterDidCommitLoad(true)
    … …  
    336338    , m_viewWasEverInWindow(false)
    337339#if PLATFORM(IOS)
    338     , m_alwaysRunsAtForegroundPriority(configuration.alwaysRunsAtForegroundPriority)
     340    , m_alwaysRunsAtForegroundPriority(m_configuration->alwaysRunsAtForegroundPriority())
    339341#endif
    340342    , m_backForwardList(WebBackForwardList::create(*this))
    … …  
    380382#endif
    381383    , m_pageID(pageID)
    382     , m_sessionID(configuration.sessionID)
     384    , m_sessionID(m_configuration->sessionID())
    383385    , m_isPageSuspended(false)
    384386    , m_addsVisitedLinks(true)
    … …  
    437439    , m_scrollPinningBehavior(DoNotPin)
    438440    , m_navigationID(0)
    439     , m_configurationPreferenceValues(configuration.preferenceValues)
     441    , m_configurationPreferenceValues(m_configuration->preferenceValues())
    440442    , m_potentiallyChangedViewStateFlags(ViewState::NoFlags)
    441443    , m_viewStateChangeWantsSynchronousReply(false)
    … …  
    517519    webPageProxyCounter.decrement();
    518520#endif
     521}
     522
     523const API::PageConfiguration& WebPageProxy::configuration() const
     524{
     525    return m_configuration.get();
    519526}
    520527

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r188121 r188228  
    255255#endif
    256256
    257 struct WebPageConfiguration {
    258     WebPageGroup* pageGroup = nullptr;
    259     WebPreferences* preferences = nullptr;
    260     WebUserContentControllerProxy* userContentController = nullptr;
    261     VisitedLinkProvider* visitedLinkProvider = nullptr;
    262 
    263     WebsiteDataStore* websiteDataStore = nullptr;
    264     // FIXME: We currently have to pass the session ID separately here to support the legacy private browsing session.
    265     // Once we get rid of it we should get rid of this configuration parameter as well.
    266     WebCore::SessionID sessionID;
    267 
    268     WebPageProxy* relatedPage = nullptr;
    269 
    270     bool treatsSHA1SignedCertificatesAsInsecure = false;
    271 
    272 #if PLATFORM(IOS)
    273     bool alwaysRunsAtForegroundPriority = false;
    274 #endif
    275 
    276     WebPreferencesStore::ValueMap preferenceValues;
    277 };
    278 
    279257class WebPageProxy : public API::ObjectImpl<API::Object::Type::Page>
    280258#if ENABLE(INPUT_TYPE_COLOR)
    … …  
    288266    , public IPC::MessageSender {
    289267public:
    290     static Ref<WebPageProxy> create(PageClient&, WebProcessProxy&, uint64_t pageID, const WebPageConfiguration&);
     268    static Ref<WebPageProxy> create(PageClient&, WebProcessProxy&, uint64_t pageID, Ref<API::PageConfiguration>&&);
    291269    virtual ~WebPageProxy();
     270
     271    const API::PageConfiguration& configuration() const;
    292272
    293273    uint64_t pageID() const { return m_pageID; }
    … …  
    10851065
    10861066private:
    1087     WebPageProxy(PageClient&, WebProcessProxy&, uint64_t pageID, const WebPageConfiguration&);
     1067    WebPageProxy(PageClient&, WebProcessProxy&, uint64_t pageID, Ref<API::PageConfiguration>&&);
    10881068    void platformInitialize();
    10891069
    … …  
    14891469
    14901470    PageClient& m_pageClient;
     1471    Ref<API::PageConfiguration> m_configuration;
     1472
    14911473    std::unique_ptr<API::LoaderClient> m_loaderClient;
    14921474    std::unique_ptr<API::PolicyClient> m_policyClient;

  • trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

    r187917 r188228  
    3030#include "APIDownloadClient.h"
    3131#include "APILegacyContextHistoryClient.h"
     32#include "APIPageConfiguration.h"
    3233#include "APIProcessPoolConfiguration.h"
    3334#include "CustomProtocolManagerMessages.h"
    … …  
    832833}
    833834
    834 PassRefPtr<WebPageProxy> WebProcessPool::createWebPage(PageClient& pageClient, WebPageConfiguration configuration)
    835 {
    836     if (!configuration.pageGroup)
    837         configuration.pageGroup = m_defaultPageGroup.ptr();
    838     if (!configuration.preferences)
    839         configuration.preferences = &configuration.pageGroup->preferences();
    840     if (!configuration.visitedLinkProvider)
    841         configuration.visitedLinkProvider = m_visitedLinkProvider.ptr();
    842     if (!configuration.websiteDataStore) {
    843         ASSERT(!configuration.sessionID.isValid());
    844         configuration.websiteDataStore = &m_websiteDataStore->websiteDataStore();
    845         configuration.sessionID = configuration.preferences->privateBrowsingEnabled() ? SessionID::legacyPrivateSessionID() : SessionID::defaultSessionID();
     835PassRefPtr<WebPageProxy> WebProcessPool::createWebPage(PageClient& pageClient, Ref<API::PageConfiguration>&& pageConfiguration)
     836{
     837    if (!pageConfiguration->pageGroup())
     838        pageConfiguration->setPageGroup(m_defaultPageGroup.ptr());
     839    if (!pageConfiguration->preferences())
     840        pageConfiguration->setPreferences(&pageConfiguration->pageGroup()->preferences());
     841    if (!pageConfiguration->visitedLinkProvider())
     842        pageConfiguration->setVisitedLinkProvider(m_visitedLinkProvider.ptr());
     843    if (!pageConfiguration->websiteDataStore()) {
     844        ASSERT(!pageConfiguration->sessionID().isValid());
     845        pageConfiguration->setWebsiteDataStore(m_websiteDataStore.get());
     846        pageConfiguration->setSessionID(pageConfiguration->preferences()->privateBrowsingEnabled() ? SessionID::legacyPrivateSessionID() : SessionID::defaultSessionID());
    846847    }
    847848
    … …  
    853854            process = m_processes.last();
    854855            m_haveInitialEmptyProcess = false;
    855         } else if (configuration.relatedPage) {
     856        } else if (pageConfiguration->relatedPage()) {
    856857            // Sharing processes, e.g. when creating the page via window.open().
    857             process = &configuration.relatedPage->process();
     858            process = &pageConfiguration->relatedPage()->process();
    858859        } else
    859860            process = &createNewWebProcessRespectingProcessCountLimit();
    860861    }
    861862
    862     return process->createWebPage(pageClient, WTF::move(configuration));
     863    return process->createWebPage(pageClient, WTF::move(pageConfiguration));
    863864}
    864865

  • trunk/Source/WebKit2/UIProcess/WebProcessPool.h

    r187917 r188228  
    7777class DownloadClient;
    7878class LegacyContextHistoryClient;
     79class PageConfiguration;
    7980}
    8081
    … …  
    8788class WebPageProxy;
    8889struct StatisticsData;
    89 struct WebPageConfiguration;
    9090struct WebProcessCreationParameters;
    9191   
    … …  
    172172    API::WebsiteDataStore* websiteDataStore() const { return m_websiteDataStore.get(); }
    173173
    174     PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebPageConfiguration);
     174    PassRefPtr<WebPageProxy> createWebPage(PageClient&, Ref<API::PageConfiguration>&&);
    175175
    176176    const String& injectedBundlePath() const { return m_configuration->injectedBundlePath(); }

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

    r187136 r188228  
    207207}
    208208
    209 Ref<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, const WebPageConfiguration& configuration)
     209Ref<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, Ref<API::PageConfiguration>&& pageConfiguration)
    210210{
    211211    uint64_t pageID = generatePageID();
    212     Ref<WebPageProxy> webPage = WebPageProxy::create(pageClient, *this, pageID, configuration);
     212    Ref<WebPageProxy> webPage = WebPageProxy::create(pageClient, *this, pageID, WTF::move(pageConfiguration));
    213213
    214214    m_pageMap.set(pageID, webPage.ptr());

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

    r187129 r188228  
    8585
    8686    static WebPageProxy* webPage(uint64_t pageID);
    87     Ref<WebPageProxy> createWebPage(PageClient&, const WebPageConfiguration&);
     87    Ref<WebPageProxy> createWebPage(PageClient&, Ref<API::PageConfiguration>&&);
    8888    void addExistingWebPage(WebPageProxy*, uint64_t pageID);
    8989    void removeWebPage(uint64_t pageID);

  • trunk/Source/WebKit2/UIProcess/ios/WKContentView.h

    r185894 r188228  
    3535@class WKWebView;
    3636
     37namespace API {
     38class PageConfiguration;
     39}
     40
    3741namespace WebCore {
    3842struct Highlight;
    … …  
    4650class WebPageProxy;
    4751class WebProcessPool;
    48 struct WebPageConfiguration;
    4952}
    5053
    … …  
    6265@property (nonatomic, readonly) BOOL isBackground;
    6366
    64 - (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(WebKit::WebPageConfiguration)webPageConfiguration webView:(WKWebView *)webView;
    65 - (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(WebKit::WebPageConfiguration)webPageConfiguration wkView:(WKView *)webView;
     67- (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView;
     68- (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration wkView:(WKView *)webView;
    6669
    6770- (void)didUpdateVisibleRect:(CGRect)visibleRect unobscuredRect:(CGRect)unobscuredRect

  • trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm

    r187193 r188228  
    2929#if PLATFORM(IOS)
    3030
     31#import "APIPageConfiguration.h"
    3132#import "ApplicationStateTracker.h"
    3233#import "PageClientImplIOS.h"
    … …  
    182183}
    183184
    184 - (instancetype)_commonInitializationWithProcessPool:(WebKit::WebProcessPool&)processPool configuration:(WebKit::WebPageConfiguration)webPageConfiguration
     185- (instancetype)_commonInitializationWithProcessPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration
    185186{
    186187    ASSERT(_pageClient);
    187188
    188     _page = processPool.createWebPage(*_pageClient, WTF::move(webPageConfiguration));
     189    _page = processPool.createWebPage(*_pageClient, WTF::move(configuration));
    189190    _page->initializeWebPage();
    190191    _page->setIntrinsicDeviceScaleFactor(WKGetScaleFactorForScreen([UIScreen mainScreen]));
    … …  
    219220}
    220221
    221 - (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(WebKit::WebPageConfiguration)webPageConfiguration webView:(WKWebView *)webView
     222- (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView
    222223{
    223224    if (!(self = [super initWithFrame:frame]))
    … …  
    229230    _webView = webView;
    230231
    231     return [self _commonInitializationWithProcessPool:processPool configuration:webPageConfiguration];
    232 }
    233 
    234 - (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(WebKit::WebPageConfiguration)webPageConfiguration wkView:(WKView *)wkView
     232    return [self _commonInitializationWithProcessPool:processPool configuration:WTF::move(configuration)];
     233}
     234
     235- (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration wkView:(WKView *)wkView
    235236{
    236237    if (!(self = [super initWithFrame:frame]))
    … …  
    241242    _pageClient = std::make_unique<PageClientImpl>(self, wkView);
    242243
    243     return [self _commonInitializationWithProcessPool:processPool configuration:webPageConfiguration];
     244    return [self _commonInitializationWithProcessPool:processPool configuration:WTF::move(configuration)];
    244245}
    245246
Note: See TracChangeset for help on using the changeset viewer.