Diff
Modified: trunk/Source/WebKit2/ChangeLog (177468 => 177469)
--- 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)
@@ -1,3 +1,20 @@
+2014-12-17 Anders Carlsson <[email protected]>
+
+ 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:
+
2014-12-17 Joseph Pecoraro <[email protected]>
Unreviewed iOS Build Fix after r177459.
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (177468 => 177469)
--- 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)
@@ -605,7 +605,7 @@
ensureNetworkProcess();
#endif
- RefPtr<WebProcessProxy> process = WebProcessProxy::create(*this);
+ Ref<WebProcessProxy> process = WebProcessProxy::create(*this);
WebProcessCreationParameters parameters;
@@ -706,7 +706,7 @@
RefPtr<API::Object> injectedBundleInitializationUserData = m_injectedBundleClient.getInjectedBundleInitializationUserData(this);
if (!injectedBundleInitializationUserData)
injectedBundleInitializationUserData = m_injectedBundleInitializationUserData;
- process->send(Messages::WebProcess::InitializeWebProcess(parameters, WebContextUserMessageEncoder(injectedBundleInitializationUserData.get(), *process)), 0);
+ process->send(Messages::WebProcess::InitializeWebProcess(parameters, WebContextUserMessageEncoder(injectedBundleInitializationUserData.get(), process)), 0);
#if PLATFORM(COCOA)
process->send(Messages::WebProcess::SetQOS(webProcessLatencyQOS(), webProcessThroughputQOS()), 0);
@@ -718,7 +718,7 @@
if (WebPreferences::anyPagesAreUsingPrivateBrowsing())
process->send(Messages::WebProcess::EnsurePrivateBrowsingSession(SessionID::legacyPrivateSessionID()), 0);
- m_processes.append(process);
+ m_processes.append(process.ptr());
if (m_processModel == ProcessModelSharedSecondaryProcess) {
for (size_t i = 0; i != m_messagesToInjectedBundlePostedToEmptyContext.size(); ++i) {
@@ -727,7 +727,7 @@
IPC::ArgumentEncoder messageData;
messageData.encode(message.first);
- messageData.encode(WebContextUserMessageEncoder(message.second.get(), *process));
+ messageData.encode(WebContextUserMessageEncoder(message.second.get(), process));
process->send(Messages::WebProcess::PostInjectedBundleMessage(IPC::DataReference(messageData.buffer(), messageData.bufferSize())), 0);
}
m_messagesToInjectedBundlePostedToEmptyContext.clear();
@@ -739,7 +739,7 @@
Inspector::RemoteInspector::shared();
#endif
- return *process;
+ return process;
}
void WebContext::warmInitialProcess()
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (177468 => 177469)
--- 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)
@@ -252,9 +252,9 @@
}
#endif // !LOG_DISABLED
-PassRefPtr<WebPageProxy> WebPageProxy::create(PageClient& pageClient, WebProcessProxy& process, uint64_t pageID, const WebPageConfiguration& configuration)
+Ref<WebPageProxy> WebPageProxy::create(PageClient& pageClient, WebProcessProxy& process, uint64_t pageID, const WebPageConfiguration& configuration)
{
- return adoptRef(new WebPageProxy(pageClient, process, pageID, configuration));
+ return adoptRef(*new WebPageProxy(pageClient, process, pageID, configuration));
}
WebPageProxy::WebPageProxy(PageClient& pageClient, WebProcessProxy& process, uint64_t pageID, const WebPageConfiguration& configuration)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (177468 => 177469)
--- 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)
@@ -246,7 +246,7 @@
, public IPC::MessageReceiver
, public IPC::MessageSender {
public:
- static PassRefPtr<WebPageProxy> create(PageClient&, WebProcessProxy&, uint64_t pageID, const WebPageConfiguration&);
+ static Ref<WebPageProxy> create(PageClient&, WebProcessProxy&, uint64_t pageID, const WebPageConfiguration&);
virtual ~WebPageProxy();
uint64_t pageID() const { return m_pageID; }
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (177468 => 177469)
--- 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)
@@ -83,9 +83,9 @@
return pageMap;
}
-PassRefPtr<WebProcessProxy> WebProcessProxy::create(WebContext& context)
+Ref<WebProcessProxy> WebProcessProxy::create(WebContext& context)
{
- return adoptRef(new WebProcessProxy(context));
+ return adoptRef(*new WebProcessProxy(context));
}
WebProcessProxy::WebProcessProxy(WebContext& context)
@@ -180,13 +180,15 @@
return globalPageMap().get(pageID);
}
-PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, const WebPageConfiguration& configuration)
+Ref<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, const WebPageConfiguration& configuration)
{
uint64_t pageID = generatePageID();
- RefPtr<WebPageProxy> webPage = WebPageProxy::create(pageClient, *this, pageID, configuration);
- m_pageMap.set(pageID, webPage.get());
- globalPageMap().set(pageID, webPage.get());
- return webPage.release();
+ Ref<WebPageProxy> webPage = WebPageProxy::create(pageClient, *this, pageID, configuration);
+
+ m_pageMap.set(pageID, webPage.ptr());
+ globalPageMap().set(pageID, webPage.ptr());
+
+ return webPage;
}
void WebProcessProxy::addExistingWebPage(WebPageProxy* webPage, uint64_t pageID)
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (177468 => 177469)
--- 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)
@@ -68,7 +68,7 @@
typedef HashMap<uint64_t, RefPtr<WebFrameProxy>> WebFrameProxyMap;
typedef HashMap<uint64_t, WebPageProxy*> WebPageProxyMap;
- static PassRefPtr<WebProcessProxy> create(WebContext&);
+ static Ref<WebProcessProxy> create(WebContext&);
~WebProcessProxy();
static WebProcessProxy* fromConnection(IPC::Connection* connection)
@@ -81,7 +81,7 @@
WebContext& context() { return m_context; }
static WebPageProxy* webPage(uint64_t pageID);
- PassRefPtr<WebPageProxy> createWebPage(PageClient&, const WebPageConfiguration&);
+ Ref<WebPageProxy> createWebPage(PageClient&, const WebPageConfiguration&);
void addExistingWebPage(WebPageProxy*, uint64_t pageID);
void removeWebPage(uint64_t pageID);
