diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:09:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:10:13 +0100 |
| commit | 470286ecfe79d59df14944e5b5d34630fc739391 (patch) | |
| tree | 43983212872e06cebefd2ae474418fa2908ca54c /Source/WebKit2/UIProcess/WebContext.cpp | |
| parent | 23037105e948c2065da5a937d3a2396b0ff45c1e (diff) | |
| download | qtwebkit-470286ecfe79d59df14944e5b5d34630fc739391.tar.gz | |
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/WebContext.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/WebContext.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp index f7ea141c2..3f818d1c1 100644 --- a/Source/WebKit2/UIProcess/WebContext.cpp +++ b/Source/WebKit2/UIProcess/WebContext.cpp @@ -322,10 +322,12 @@ void WebContext::setUsesNetworkProcess(bool usesNetworkProcess) #endif } -void WebContext::ensureSharedWebProcess() +WebProcessProxy* WebContext::ensureSharedWebProcess() { + ASSERT(m_processModel == ProcessModelSharedSecondaryProcess); if (m_processes.isEmpty()) createNewWebProcess(); + return m_processes[0].get(); } PassRefPtr<WebProcessProxy> WebContext::createNewWebProcess() @@ -559,8 +561,7 @@ PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient* pageClient, WebPa { RefPtr<WebProcessProxy> process; if (m_processModel == ProcessModelSharedSecondaryProcess) { - ensureSharedWebProcess(); - process = m_processes[0]; + process = ensureSharedWebProcess(); } else { if (m_haveInitialEmptyProcess) { process = m_processes.last(); @@ -580,17 +581,6 @@ PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient* pageClient, WebPa return process->createWebPage(pageClient, this, pageGroup); } -WebProcessProxy* WebContext::relaunchProcessIfNecessary() -{ - if (m_processModel == ProcessModelSharedSecondaryProcess) { - ensureSharedWebProcess(); - return m_processes[0].get(); - } - - ASSERT_NOT_REACHED(); - return 0; -} - DownloadProxy* WebContext::download(WebPageProxy* initiatingPage, const ResourceRequest& request) { if (m_processModel == ProcessModelSharedSecondaryProcess) { |