<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163783] releases/WebKitGTK/webkit-2.4/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163783">163783</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-10 06:55:47 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/163671">r163671</a> - Simplify web page creation
https://bugs.webkit.org/show_bug.cgi?id=128425
Reviewed by Andreas Kling.
Add a WebPageConfiguration class and stick the page group, preferences, session etc there
instead of adding more and more parameters to the WebPageProxy constructor.
Make WebContext::createWebPage fill in the missing pieces in the WebPageConfiguration object.
* UIProcess/API/ios/WKContentView.mm:
(-[WKContentView initWithFrame:configuration:]):
(-[WKContentView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
* UIProcess/API/mac/WKView.mm:
(-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
* UIProcess/WebContext.cpp:
(WebKit::WebContext::createWebPage):
* UIProcess/WebContext.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::create):
(WebKit::WebPageProxy::WebPageProxy):
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::createWebPage):
* UIProcess/WebProcessProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPIiosWKContentViewmm">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/ios/WKContentView.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPImacWKViewmm">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebContextcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebContexth">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebPageProxycpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebPageProxyh">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebProcessProxycpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebProcessProxyh">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (163782 => 163783)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-02-10 14:22:36 UTC (rev 163782)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-02-10 14:55:47 UTC (rev 163783)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-02-07 Anders Carlsson <andersca@apple.com>
+
+ Simplify web page creation
+ https://bugs.webkit.org/show_bug.cgi?id=128425
+
+ Reviewed by Andreas Kling.
+
+ Add a WebPageConfiguration class and stick the page group, preferences, session etc there
+ instead of adding more and more parameters to the WebPageProxy constructor.
+
+ Make WebContext::createWebPage fill in the missing pieces in the WebPageConfiguration object.
+
+ * UIProcess/API/ios/WKContentView.mm:
+ (-[WKContentView initWithFrame:configuration:]):
+ (-[WKContentView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::createWebPage):
+ * UIProcess/WebContext.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::create):
+ (WebKit::WebPageProxy::WebPageProxy):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::createWebPage):
+ * UIProcess/WebProcessProxy.h:
+
</ins><span class="cx"> 2014-02-08 Adrian Perez de Castro <aperez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Make process model names properly meaningful
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (163782 => 163783)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-02-10 14:22:36 UTC (rev 163782)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-02-10 14:55:47 UTC (rev 163783)
</span><span class="lines">@@ -969,7 +969,9 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
</span><span class="cx">
</span><del>- priv->pageProxy = context->createWebPage(*priv->pageClient, pageGroup);
</del><ins>+ WebPageConfiguration webPageConfiguration;
+ webPageConfiguration.pageGroup = pageGroup;
+ priv->pageProxy = context->createWebPage(*priv->pageClient, std::move(webPageConfiguration));
</ins><span class="cx"> priv->pageProxy->initializeWebPage();
</span><span class="cx">
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPIiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/ios/WKContentView.mm (163782 => 163783)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/ios/WKContentView.mm 2014-02-10 14:22:36 UTC (rev 163782)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/ios/WKContentView.mm 2014-02-10 14:55:47 UTC (rev 163783)
</span><span class="lines">@@ -100,7 +100,9 @@
</span><span class="cx">
</span><span class="cx"> _pageClient = std::make_unique<PageClientImpl>(self);
</span><span class="cx">
</span><del>- _page = configuration.processClass->_context->createWebPage(*_pageClient, nullptr);
</del><ins>+ WebPageConfiguration webPageConfiguration;
+
+ _page = configuration.processClass->_context->createWebPage(*_pageClient, std::move(webPageConfiguration));
</ins><span class="cx"> _page->initializeWebPage();
</span><span class="cx"> _page->setIntrinsicDeviceScaleFactor([UIScreen mainScreen].scale);
</span><span class="cx"> _page->setUseFixedLayout(true);
</span><span class="lines">@@ -240,7 +242,12 @@
</span><span class="cx"> RunLoop::initializeMainRunLoop();
</span><span class="cx">
</span><span class="cx"> _pageClient = std::make_unique<PageClientImpl>(self);
</span><del>- _page = toImpl(contextRef)->createWebPage(*_pageClient, toImpl(pageGroupRef), toImpl(relatedPage));
</del><ins>+
+ WebPageConfiguration webPageConfiguration;
+ webPageConfiguration.group = toImpl(pageGroupRef);
+ webPageConfiguration.relatedPage = toImpl(relatedPage);
+
+ _page = toImpl(contextRef)->createWebPage(*_pageClient, std::move(webPageConfiguration));
</ins><span class="cx"> _page->initializeWebPage();
</span><span class="cx"> _page->setIntrinsicDeviceScaleFactor([UIScreen mainScreen].scale);
</span><span class="cx"> _page->setUseFixedLayout(true);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/mac/WKView.mm (163782 => 163783)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-02-10 14:22:36 UTC (rev 163782)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-02-10 14:55:47 UTC (rev 163783)
</span><span class="lines">@@ -2930,8 +2930,12 @@
</span><span class="cx">
</span><span class="cx"> _data = [[WKViewData alloc] init];
</span><span class="cx">
</span><ins>+ WebPageConfiguration webPageConfiguration;
+ webPageConfiguration.pageGroup = toImpl(pageGroupRef);
+ webPageConfiguration.relatedPage = toImpl(relatedPage);
+
</ins><span class="cx"> _data->_pageClient = std::make_unique<PageClientImpl>(self);
</span><del>- _data->_page = toImpl(contextRef)->createWebPage(*_data->_pageClient, toImpl(pageGroupRef), toImpl(relatedPage));
</del><ins>+ _data->_page = toImpl(contextRef)->createWebPage(*_data->_pageClient, std::move(webPageConfiguration));
</ins><span class="cx"> _data->_page->setIntrinsicDeviceScaleFactor([self _intrinsicDeviceScaleFactor]);
</span><span class="cx"> _data->_page->initializeWebPage();
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebContext.cpp (163782 => 163783)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebContext.cpp 2014-02-10 14:22:36 UTC (rev 163782)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebContext.cpp 2014-02-10 14:55:47 UTC (rev 163783)
</span><span class="lines">@@ -760,8 +760,13 @@
</span><span class="cx"> return *result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient& pageClient, WebPageGroup* pageGroup, API::Session& session, WebPageProxy* relatedPage)
</del><ins>+PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient& pageClient, WebPageConfiguration configuration)
</ins><span class="cx"> {
</span><ins>+ if (!configuration.pageGroup)
+ configuration.pageGroup = &m_defaultPageGroup.get();
+ if (!configuration.session)
+ configuration.session = configuration.pageGroup->preferences()->privateBrowsingEnabled() ? &API::Session::legacyPrivateSession() : &API::Session::defaultSession();
+
</ins><span class="cx"> RefPtr<WebProcessProxy> process;
</span><span class="cx"> if (m_processModel == ProcessModelSharedSecondaryProcess) {
</span><span class="cx"> process = &ensureSharedWebProcess();
</span><span class="lines">@@ -769,22 +774,16 @@
</span><span class="cx"> if (m_haveInitialEmptyProcess) {
</span><span class="cx"> process = m_processes.last();
</span><span class="cx"> m_haveInitialEmptyProcess = false;
</span><del>- } else if (relatedPage) {
</del><ins>+ } else if (configuration.relatedPage) {
</ins><span class="cx"> // Sharing processes, e.g. when creating the page via window.open().
</span><del>- process = &relatedPage->process();
</del><ins>+ process = &configuration.relatedPage->process();
</ins><span class="cx"> } else
</span><span class="cx"> process = &createNewWebProcessRespectingProcessCountLimit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return process->createWebPage(pageClient, pageGroup ? *pageGroup : m_defaultPageGroup.get(), session);
</del><ins>+ return process->createWebPage(pageClient, std::move(configuration));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient& pageClient, WebPageGroup* pageGroup, WebPageProxy* relatedPage)
-{
- WebPageGroup* group = pageGroup ? pageGroup : &m_defaultPageGroup.get();
- return createWebPage(pageClient, group, group->preferences()->privateBrowsingEnabled() ? API::Session::legacyPrivateSession() : API::Session::defaultSession(), relatedPage);
-}
-
</del><span class="cx"> DownloadProxy* WebContext::download(WebPageProxy* initiatingPage, const ResourceRequest& request)
</span><span class="cx"> {
</span><span class="cx"> DownloadProxy* downloadProxy = createDownloadProxy();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebContext.h (163782 => 163783)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebContext.h 2014-02-10 14:22:36 UTC (rev 163782)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebContext.h 2014-02-10 14:55:47 UTC (rev 163783)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> class WebPageGroup;
</span><span class="cx"> class WebPageProxy;
</span><span class="cx"> struct StatisticsData;
</span><ins>+struct WebPageConfiguration;
</ins><span class="cx"> struct WebProcessCreationParameters;
</span><span class="cx">
</span><span class="cx"> typedef GenericCallback<WKDictionaryRef> DictionaryCallback;
</span><span class="lines">@@ -156,8 +157,7 @@
</span><span class="cx">
</span><span class="cx"> StorageManager& storageManager() const { return *m_storageManager; }
</span><span class="cx">
</span><del>- PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebPageGroup*, API::Session&, WebPageProxy* relatedPage = 0);
- PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebPageGroup*, WebPageProxy* relatedPage = 0);
</del><ins>+ PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebPageConfiguration);
</ins><span class="cx">
</span><span class="cx"> const String& injectedBundlePath() const { return m_injectedBundlePath; }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.cpp (163782 => 163783)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-10 14:22:36 UTC (rev 163782)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-10 14:55:47 UTC (rev 163783)
</span><span class="lines">@@ -239,17 +239,17 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !LOG_DISABLED
</span><span class="cx">
</span><del>-PassRefPtr<WebPageProxy> WebPageProxy::create(PageClient& pageClient, WebProcessProxy& process, WebPageGroup& pageGroup, API::Session& session, uint64_t pageID)
</del><ins>+PassRefPtr<WebPageProxy> WebPageProxy::create(PageClient& pageClient, WebProcessProxy& process, uint64_t pageID, const WebPageConfiguration& configuration)
</ins><span class="cx"> {
</span><del>- return adoptRef(new WebPageProxy(pageClient, process, pageGroup, session, pageID));
</del><ins>+ return adoptRef(new WebPageProxy(pageClient, process, pageID, configuration));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WebPageProxy::WebPageProxy(PageClient& pageClient, WebProcessProxy& process, WebPageGroup& pageGroup, API::Session& session, uint64_t pageID)
</del><ins>+WebPageProxy::WebPageProxy(PageClient& pageClient, WebProcessProxy& process, uint64_t pageID, const WebPageConfiguration& configuration)
</ins><span class="cx"> : m_pageClient(pageClient)
</span><span class="cx"> , m_loaderClient(std::make_unique<API::LoaderClient>())
</span><span class="cx"> , m_policyClient(std::make_unique<API::PolicyClient>())
</span><span class="cx"> , m_process(process)
</span><del>- , m_pageGroup(pageGroup)
</del><ins>+ , m_pageGroup(*configuration.pageGroup)
</ins><span class="cx"> , m_mainFrame(nullptr)
</span><span class="cx"> , m_userAgent(standardUserAgent())
</span><span class="cx"> , m_geolocationPermissionRequestManager(*this)
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> , m_needTouchEvents(false)
</span><span class="cx"> #endif
</span><span class="cx"> , m_pageID(pageID)
</span><del>- , m_session(session)
</del><ins>+ , m_session(*configuration.session)
</ins><span class="cx"> , m_isPageSuspended(false)
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> , m_isSmartInsertDeleteEnabled(TextChecker::isSmartInsertDeleteEnabled())
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: If we ever expose the session storage size as a preference, we need to pass it here.
</span><span class="cx"> m_process->context().storageManager().createSessionStorageNamespace(m_pageID, m_process->isValid() ? m_process->connection() : 0, std::numeric_limits<unsigned>::max());
</span><del>- setSession(session);
</del><ins>+ setSession(*configuration.session);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPageProxy::~WebPageProxy()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.h (163782 => 163783)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-10 14:22:36 UTC (rev 163782)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-10 14:55:47 UTC (rev 163783)
</span><span class="lines">@@ -320,6 +320,12 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+struct WebPageConfiguration {
+ WebPageGroup* pageGroup = nullptr;
+ API::Session* session = nullptr;
+ WebPageProxy* relatedPage = nullptr;
+};
+
</ins><span class="cx"> class WebPageProxy : public API::ObjectImpl<API::Object::Type::Page>
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> , public WebColorPicker::Client
</span><span class="lines">@@ -328,8 +334,7 @@
</span><span class="cx"> , public IPC::MessageReceiver
</span><span class="cx"> , public IPC::MessageSender {
</span><span class="cx"> public:
</span><del>-
- static PassRefPtr<WebPageProxy> create(PageClient&, WebProcessProxy&, WebPageGroup&, API::Session&, uint64_t pageID);
</del><ins>+ static PassRefPtr<WebPageProxy> create(PageClient&, WebProcessProxy&, uint64_t pageID, const WebPageConfiguration&);
</ins><span class="cx"> virtual ~WebPageProxy();
</span><span class="cx">
</span><span class="cx"> void setSession(API::Session&);
</span><span class="lines">@@ -863,7 +868,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebPageProxy(PageClient&, WebProcessProxy&, WebPageGroup&, API::Session&, uint64_t pageID);
</del><ins>+ WebPageProxy(PageClient&, WebProcessProxy&, uint64_t pageID, const WebPageConfiguration&);
</ins><span class="cx"> void platformInitialize();
</span><span class="cx">
</span><span class="cx"> void updateViewState(WebCore::ViewState::Flags flagsToUpdate = WebCore::ViewState::AllFlags);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebProcessProxy.cpp (163782 => 163783)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-02-10 14:22:36 UTC (rev 163782)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-02-10 14:55:47 UTC (rev 163783)
</span><span class="lines">@@ -167,10 +167,10 @@
</span><span class="cx"> return globalPageMap().get(pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, WebPageGroup& pageGroup, API::Session& session)
</del><ins>+PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, const WebPageConfiguration& configuration)
</ins><span class="cx"> {
</span><span class="cx"> uint64_t pageID = generatePageID();
</span><del>- RefPtr<WebPageProxy> webPage = WebPageProxy::create(pageClient, *this, pageGroup, session, pageID);
</del><ins>+ RefPtr<WebPageProxy> webPage = WebPageProxy::create(pageClient, *this, pageID, configuration);
</ins><span class="cx"> m_pageMap.set(pageID, webPage.get());
</span><span class="cx"> globalPageMap().set(pageID, webPage.get());
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebProcessProxy.h (163782 => 163783)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-02-10 14:22:36 UTC (rev 163782)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-02-10 14:55:47 UTC (rev 163783)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> WebContext& context() { return m_context.get(); }
</span><span class="cx">
</span><span class="cx"> static WebPageProxy* webPage(uint64_t pageID);
</span><del>- PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebPageGroup&, API::Session&);
</del><ins>+ PassRefPtr<WebPageProxy> createWebPage(PageClient&, const WebPageConfiguration&);
</ins><span class="cx"> void addExistingWebPage(WebPageProxy*, uint64_t pageID);
</span><span class="cx"> void removeWebPage(uint64_t pageID);
</span><span class="cx"> Vector<WebPageProxy*> pages() const;
</span></span></pre>
</div>
</div>
</body>
</html>