WebKit2: Need a way to keep the WebProcess alive for testing purposes.

Jessie Berlin · Jessie Berlin · commit 7dc969592654 · 2011-04-15T17:41:23.000Z
https://bugs.webkit.org/show_bug.cgi?id=58592 Reviewed by Sam Weinig. * UIProcess/API/C/WKContext.cpp: (WKContextDisableProcessTermination): (WKContextEnableProcessTermination): * UIProcess/API/C/WKContextPrivate.h: * UIProcess/WebContext.cpp: (WebKit::WebContext::WebContext): Initialize m_processTerminationEnabled to true. (WebKit::WebContext::enableProcessTermination): Set m_processTerminationEnabled to true, and try to terminate the web process. (WebKit::WebContext::shouldTerminate): If !m_processTerminationEnabled, return false. * UIProcess/WebContext.h: (WebKit::WebContext::disableProcessTermination): Set m_processTerminationEnabled to false; Canonical link: https://commits.webkit.org/73742@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@83988 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,26 @@
+2011-04-15  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        WebKit2: Need a way to keep the WebProcess alive for testing purposes.
+        https://bugs.webkit.org/show_bug.cgi?id=58592
+
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextDisableProcessTermination):
+        (WKContextEnableProcessTermination):
+        * UIProcess/API/C/WKContextPrivate.h:
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::WebContext):
+        Initialize m_processTerminationEnabled to true.
+        (WebKit::WebContext::enableProcessTermination):
+        Set m_processTerminationEnabled to true, and try to terminate the web process.
+        (WebKit::WebContext::shouldTerminate):
+        If !m_processTerminationEnabled, return false.
+        * UIProcess/WebContext.h:
+        (WebKit::WebContext::disableProcessTermination):
+        Set m_processTerminationEnabled to false;
+
 2011-04-15  Nancy Piedra  <nancy.piedra@nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/Source/WebKit2/UIProcess/API/C/WKContext.cpp b/Source/WebKit2/UIProcess/API/C/WKContext.cpp
@@ -217,3 +217,13 @@ void WKContextSetLocalStorageDirectory(WKContextRef contextRef, WKStringRef loca
 {
     toImpl(contextRef)->setLocalStorageDirectory(toImpl(localStorageDirectory)->string());
 }
+
+void WKContextDisableProcessTermination(WKContextRef contextRef)
+{
+    toImpl(contextRef)->disableProcessTermination();
+}
+
+void WKContextEnableProcessTermination(WKContextRef contextRef)
+{
+    toImpl(contextRef)->enableProcessTermination();
+}
diff --git a/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h b/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h
@@ -61,6 +61,11 @@ WK_EXPORT void WKContextSetIconDatabasePath(WKContextRef context, WKStringRef ic
 WK_EXPORT void WKContextSetDatabaseDirectory(WKContextRef context, WKStringRef databaseDirectory);
 WK_EXPORT void WKContextSetLocalStorageDirectory(WKContextRef context, WKStringRef localStorageDirectory);
 
+// FIXME: This is a workaround for testing purposes only and should be removed once a better
+// solution has been found for testing.
+WK_EXPORT void WKContextDisableProcessTermination(WKContextRef context);
+WK_EXPORT void WKContextEnableProcessTermination(WKContextRef context);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp
@@ -126,6 +126,7 @@ WebContext::WebContext(ProcessModel processModel, const String& injectedBundlePa
     , m_shouldPaintNativeControls(true)
     , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyAlways)
 #endif
+    , m_processTerminationEnabled(true)
 {
 #ifndef NDEBUG
     WebKit::initializeLogChannelsIfNecessary();
@@ -261,11 +262,21 @@ void WebContext::ensureWebProcess()
     m_pendingMessagesToPostToInjectedBundle.clear();
 }
 
+void WebContext::enableProcessTermination()
+{
+    m_processTerminationEnabled = true;
+    if (shouldTerminate(m_process.get()))
+        m_process->terminate();
+}
+
 bool WebContext::shouldTerminate(WebProcessProxy* process)
 {
     // FIXME: Once we support multiple processes per context, this assertion won't hold.
     ASSERT(process == m_process);
 
+    if (!m_processTerminationEnabled)
+        return false;
+
     if (!m_downloads.isEmpty())
         return false;
 
diff --git a/Source/WebKit2/UIProcess/WebContext.h b/Source/WebKit2/UIProcess/WebContext.h
@@ -168,6 +168,9 @@ class WebContext : public APIObject {
 
     bool shouldTerminate(WebProcessProxy*);
 
+    void disableProcessTermination() { m_processTerminationEnabled = false; }
+    void enableProcessTermination();
+
 private:
     WebContext(ProcessModel, const String& injectedBundlePath);
 
@@ -260,6 +263,8 @@ class WebContext : public APIObject {
     String m_overrideDatabaseDirectory;
     String m_overrideIconDatabasePath;
     String m_overrideLocalStorageDirectory;
+
+    bool m_processTerminationEnabled;
 };
 
 template<typename U> inline bool WebContext::sendToAllProcesses(const U& message)

Original file line number	Diff line number	Diff line change
`@@ -217,3 +217,13 @@ void WKContextSetLocalStorageDirectory(WKContextRef contextRef, WKStringRef loca`
`217`	`217`	`{`
`218`	`218`	`toImpl(contextRef)->setLocalStorageDirectory(toImpl(localStorageDirectory)->string());`
`219`	`219`	`}`
	`220`	`+`
	`221`	`+void WKContextDisableProcessTermination(WKContextRef contextRef)`
	`222`	`+{`
	`223`	`+ toImpl(contextRef)->disableProcessTermination();`
	`224`	`+}`
	`225`	`+`
	`226`	`+void WKContextEnableProcessTermination(WKContextRef contextRef)`
	`227`	`+{`
	`228`	`+ toImpl(contextRef)->enableProcessTermination();`
	`229`	`+}`