<!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>[177469] trunk/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/177469">177469</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-17 15:23:29 -0800 (Wed, 17 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ref-ify WebPageProxy and WebProcessProxy creation functions
https://bugs.webkit.org/show_bug.cgi?id=139751
Reviewed by Andreas Kling.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::createNewWebProcess):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::create):
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::create):
(WebKit::WebProcessProxy::createWebPage):
* UIProcess/WebProcessProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177468 => 177469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-17 23:16:21 UTC (rev 177468)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-17 23:23:29 UTC (rev 177469)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-17 Anders Carlsson <andersca@apple.com>
+
+ Ref-ify WebPageProxy and WebProcessProxy creation functions
+ https://bugs.webkit.org/show_bug.cgi?id=139751
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::createNewWebProcess):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::create):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::create):
+ (WebKit::WebProcessProxy::createWebPage):
+ * UIProcess/WebProcessProxy.h:
+
</ins><span class="cx"> 2014-12-17 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed iOS Build Fix after r177459.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (177468 => 177469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-12-17 23:16:21 UTC (rev 177468)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-12-17 23:23:29 UTC (rev 177469)
</span><span class="lines">@@ -605,7 +605,7 @@
</span><span class="cx"> ensureNetworkProcess();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- RefPtr<WebProcessProxy> process = WebProcessProxy::create(*this);
</del><ins>+ Ref<WebProcessProxy> process = WebProcessProxy::create(*this);
</ins><span class="cx">
</span><span class="cx"> WebProcessCreationParameters parameters;
</span><span class="cx">
</span><span class="lines">@@ -706,7 +706,7 @@
</span><span class="cx"> RefPtr<API::Object> injectedBundleInitializationUserData = m_injectedBundleClient.getInjectedBundleInitializationUserData(this);
</span><span class="cx"> if (!injectedBundleInitializationUserData)
</span><span class="cx"> injectedBundleInitializationUserData = m_injectedBundleInitializationUserData;
</span><del>- process->send(Messages::WebProcess::InitializeWebProcess(parameters, WebContextUserMessageEncoder(injectedBundleInitializationUserData.get(), *process)), 0);
</del><ins>+ process->send(Messages::WebProcess::InitializeWebProcess(parameters, WebContextUserMessageEncoder(injectedBundleInitializationUserData.get(), process)), 0);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> process->send(Messages::WebProcess::SetQOS(webProcessLatencyQOS(), webProcessThroughputQOS()), 0);
</span><span class="lines">@@ -718,7 +718,7 @@
</span><span class="cx"> if (WebPreferences::anyPagesAreUsingPrivateBrowsing())
</span><span class="cx"> process->send(Messages::WebProcess::EnsurePrivateBrowsingSession(SessionID::legacyPrivateSessionID()), 0);
</span><span class="cx">
</span><del>- m_processes.append(process);
</del><ins>+ m_processes.append(process.ptr());
</ins><span class="cx">
</span><span class="cx"> if (m_processModel == ProcessModelSharedSecondaryProcess) {
</span><span class="cx"> for (size_t i = 0; i != m_messagesToInjectedBundlePostedToEmptyContext.size(); ++i) {
</span><span class="lines">@@ -727,7 +727,7 @@
</span><span class="cx"> IPC::ArgumentEncoder messageData;
</span><span class="cx">
</span><span class="cx"> messageData.encode(message.first);
</span><del>- messageData.encode(WebContextUserMessageEncoder(message.second.get(), *process));
</del><ins>+ messageData.encode(WebContextUserMessageEncoder(message.second.get(), process));
</ins><span class="cx"> process->send(Messages::WebProcess::PostInjectedBundleMessage(IPC::DataReference(messageData.buffer(), messageData.bufferSize())), 0);
</span><span class="cx"> }
</span><span class="cx"> m_messagesToInjectedBundlePostedToEmptyContext.clear();
</span><span class="lines">@@ -739,7 +739,7 @@
</span><span class="cx"> Inspector::RemoteInspector::shared();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- return *process;
</del><ins>+ return process;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContext::warmInitialProcess()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (177468 => 177469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-17 23:16:21 UTC (rev 177468)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-17 23:23:29 UTC (rev 177469)
</span><span class="lines">@@ -252,9 +252,9 @@
</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, uint64_t pageID, const WebPageConfiguration& configuration)
</del><ins>+Ref<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, pageID, configuration));
</del><ins>+ return adoptRef(*new WebPageProxy(pageClient, process, pageID, configuration));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPageProxy::WebPageProxy(PageClient& pageClient, WebProcessProxy& process, uint64_t pageID, const WebPageConfiguration& configuration)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (177468 => 177469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-12-17 23:16:21 UTC (rev 177468)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-12-17 23:23:29 UTC (rev 177469)
</span><span class="lines">@@ -246,7 +246,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&, uint64_t pageID, const WebPageConfiguration&);
</del><ins>+ static Ref<WebPageProxy> create(PageClient&, WebProcessProxy&, uint64_t pageID, const WebPageConfiguration&);
</ins><span class="cx"> virtual ~WebPageProxy();
</span><span class="cx">
</span><span class="cx"> uint64_t pageID() const { return m_pageID; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (177468 => 177469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-12-17 23:16:21 UTC (rev 177468)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-12-17 23:23:29 UTC (rev 177469)
</span><span class="lines">@@ -83,9 +83,9 @@
</span><span class="cx"> return pageMap;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebProcessProxy> WebProcessProxy::create(WebContext& context)
</del><ins>+Ref<WebProcessProxy> WebProcessProxy::create(WebContext& context)
</ins><span class="cx"> {
</span><del>- return adoptRef(new WebProcessProxy(context));
</del><ins>+ return adoptRef(*new WebProcessProxy(context));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebProcessProxy::WebProcessProxy(WebContext& context)
</span><span class="lines">@@ -180,13 +180,15 @@
</span><span class="cx"> return globalPageMap().get(pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, const WebPageConfiguration& configuration)
</del><ins>+Ref<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, pageID, configuration);
- m_pageMap.set(pageID, webPage.get());
- globalPageMap().set(pageID, webPage.get());
- return webPage.release();
</del><ins>+ Ref<WebPageProxy> webPage = WebPageProxy::create(pageClient, *this, pageID, configuration);
+
+ m_pageMap.set(pageID, webPage.ptr());
+ globalPageMap().set(pageID, webPage.ptr());
+
+ return webPage;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::addExistingWebPage(WebPageProxy* webPage, uint64_t pageID)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (177468 => 177469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-12-17 23:16:21 UTC (rev 177468)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-12-17 23:23:29 UTC (rev 177469)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> typedef HashMap<uint64_t, RefPtr<WebFrameProxy>> WebFrameProxyMap;
</span><span class="cx"> typedef HashMap<uint64_t, WebPageProxy*> WebPageProxyMap;
</span><span class="cx">
</span><del>- static PassRefPtr<WebProcessProxy> create(WebContext&);
</del><ins>+ static Ref<WebProcessProxy> create(WebContext&);
</ins><span class="cx"> ~WebProcessProxy();
</span><span class="cx">
</span><span class="cx"> static WebProcessProxy* fromConnection(IPC::Connection* connection)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> WebContext& context() { return m_context; }
</span><span class="cx">
</span><span class="cx"> static WebPageProxy* webPage(uint64_t pageID);
</span><del>- PassRefPtr<WebPageProxy> createWebPage(PageClient&, const WebPageConfiguration&);
</del><ins>+ Ref<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">
</span></span></pre>
</div>
</div>
</body>
</html>