diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
| commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
| tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/WebKit2/WebProcess/WebProcess.cpp | |
| parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
| download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz | |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/WebKit2/WebProcess/WebProcess.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebProcess.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/Source/WebKit2/WebProcess/WebProcess.cpp b/Source/WebKit2/WebProcess/WebProcess.cpp index 1490ff3ca..ef86bf3d4 100644 --- a/Source/WebKit2/WebProcess/WebProcess.cpp +++ b/Source/WebKit2/WebProcess/WebProcess.cpp @@ -133,11 +133,8 @@ WebProcess& WebProcess::shared() return process; } -static const double shutdownTimeout = 60; - WebProcess::WebProcess() - : ChildProcess(shutdownTimeout) - , m_inDidClose(false) + : m_inDidClose(false) , m_shouldTrackVisitedLinks(true) , m_hasSetCacheModel(false) , m_cacheModel(CacheModelDocumentViewer) @@ -256,10 +253,6 @@ void WebProcess::initializeWebProcess(const WebProcessCreationParameters& parame for (size_t i = 0; i < parameters.mimeTypesWithCustomRepresentation.size(); ++i) m_mimeTypesWithCustomRepresentations.add(parameters.mimeTypesWithCustomRepresentation[i]); - -#if PLATFORM(MAC) - m_presenterApplicationPid = parameters.presenterApplicationPid; -#endif if (parameters.shouldAlwaysUseComplexTextCodePath) setAlwaysUsesComplexTextCodePath(true); @@ -274,6 +267,8 @@ void WebProcess::initializeWebProcess(const WebProcessCreationParameters& parame #if ENABLE(PLUGIN_PROCESS) m_disablePluginProcessMessageTimeout = parameters.disablePluginProcessMessageTimeout; #endif + + setTerminationTimeout(parameters.terminationTimeout); } void WebProcess::setShouldTrackVisitedLinks(bool shouldTrackVisitedLinks) @@ -917,10 +912,10 @@ static void fromCountedSetToHashMap(TypeCountSet* countedSet, HashMap<String, ui static void getWebCoreMemoryCacheStatistics(Vector<HashMap<String, uint64_t> >& result) { - DEFINE_STATIC_LOCAL(String, imagesString, ("Images")); - DEFINE_STATIC_LOCAL(String, cssString, ("CSS")); - DEFINE_STATIC_LOCAL(String, xslString, ("XSL")); - DEFINE_STATIC_LOCAL(String, javaScriptString, ("JavaScript")); + DEFINE_STATIC_LOCAL(String, imagesString, (ASCIILiteral("Images"))); + DEFINE_STATIC_LOCAL(String, cssString, (ASCIILiteral("CSS"))); + DEFINE_STATIC_LOCAL(String, xslString, (ASCIILiteral("XSL"))); + DEFINE_STATIC_LOCAL(String, javaScriptString, (ASCIILiteral("JavaScript"))); MemoryCache::Statistics memoryCacheStatistics = memoryCache()->getStatistics(); |