From 470286ecfe79d59df14944e5b5d34630fc739391 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 22 Nov 2012 09:09:45 +0100 Subject: Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485) Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66 Reviewed-by: Simon Hausmann --- Source/WebKit2/UIProcess/WebContext.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'Source/WebKit2/UIProcess/WebContext.cpp') 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 WebContext::createNewWebProcess() @@ -559,8 +561,7 @@ PassRefPtr WebContext::createWebPage(PageClient* pageClient, WebPa { RefPtr 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 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) { -- cgit v1.2.1