2011-04-13 Anders Carlsson <andersca@apple.com>

        Reviewed by Adam Roben.

        Convert WebProcess over to using disableTermination/enableTermination
        https://bugs.webkit.org/show_bug.cgi?id=58485

        * PluginProcess/PluginProcess.cpp:
        (WebKit::PluginProcess::getSitesWithData):
        (WebKit::PluginProcess::clearSiteData):
        Use the LocalTerminationDisabler RAII class.

        * Shared/ChildProcess.h:
        (WebKit::ChildProcess::LocalTerminationDisabler::LocalTerminationDisabler):
        (WebKit::ChildProcess::LocalTerminationDisabler::~LocalTerminationDisabler):
        Add RAII class for calling disableTermination/enableTermination.

        * WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
        (WebKit::WebApplicationCacheManager::getApplicationCacheOrigins):
        (WebKit::WebApplicationCacheManager::deleteEntriesForOrigin):
        (WebKit::WebApplicationCacheManager::deleteAllEntries):
        Use the LocalTerminationDisabler RAII class.

        * WebProcess/Cookies/WebCookieManager.cpp:
        (WebKit::WebCookieManager::getHostnamesWithCookies):
        (WebKit::WebCookieManager::deleteCookiesForHostname):
        (WebKit::WebCookieManager::deleteAllCookies):
        (WebKit::WebCookieManager::startObservingCookieChanges):
        (WebKit::WebCookieManager::setHTTPCookieAcceptPolicy):
        (WebKit::WebCookieManager::getHTTPCookieAcceptPolicy):
        Use the LocalTerminationDisabler RAII class.

        * WebProcess/Downloads/Download.cpp:
        (WebKit::Download::Download):
        Call disableTermination().

        (WebKit::Download::~Download):
        Call enableTermination().

        * WebProcess/Downloads/DownloadManager.cpp:
        (WebKit::DownloadManager::downloadFinished):
        Remove call to terminateIfPossible.

        * WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp:
        (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
        (WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin):
        (WebKit::WebKeyValueStorageManager::deleteAllEntries):
        Use the LocalTerminationDisabler RAII class.

        * WebProcess/MediaCache/WebMediaCacheManager.cpp:
        (WebKit::WebMediaCacheManager::getHostnamesWithMediaCache):
        (WebKit::WebMediaCacheManager::clearCacheForHostname):
        (WebKit::WebMediaCacheManager::clearCacheForAllHostnames):
        Use the LocalTerminationDisabler RAII class.

        * WebProcess/ResourceCache/WebResourceCacheManager.cpp:
        (WebKit::WebResourceCacheManager::getCacheOrigins):
        (WebKit::WebResourceCacheManager::clearCacheForOrigin):
        (WebKit::WebResourceCacheManager::clearCacheForAllOrigins):
        Use the LocalTerminationDisabler RAII class.

        * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
        (WebKit::WebDatabaseManager::getDatabasesByOrigin):
        (WebKit::WebDatabaseManager::getDatabaseOrigins):
        (WebKit::WebDatabaseManager::deleteDatabaseWithNameForOrigin):
        (WebKit::WebDatabaseManager::deleteDatabasesForOrigin):
        (WebKit::WebDatabaseManager::deleteAllDatabases):
        (WebKit::WebDatabaseManager::setQuotaForOrigin):
        Use the LocalTerminationDisabler RAII class.

        * WebProcess/WebProcess.cpp:
        (WebKit::WebProcess::createWebPage):
        Call disableTermination().

        (WebKit::WebProcess::removeWebPage):
        Call enableTermination().

        (WebKit::WebProcess::shouldTerminate):
        Move logic from terminateIfPossible over here.

        (WebKit::WebProcess::terminate):
        Move logic from terminateIfPossible over here.

        (WebKit::WebProcess::getSitesWithPluginData):
        (WebKit::WebProcess::clearPluginSiteData):
        Use the LocalTerminationDisabler RAII class.

        * WebProcess/WebProcess.h:
        Publically inherit from ChildProcess, LocalTerminationDisabler needs to be accessible
        from the WebProcess class.


Canonical link: https://commits.webkit.org/73531@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@83774 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog

@@ -1,3 +1,94 @@
+2011-04-13  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Convert WebProcess over to using disableTermination/enableTermination
+        https://bugs.webkit.org/show_bug.cgi?id=58485
+
+        * PluginProcess/PluginProcess.cpp:
+        (WebKit::PluginProcess::getSitesWithData):
+        (WebKit::PluginProcess::clearSiteData):
+        Use the LocalTerminationDisabler RAII class.
+
+        * Shared/ChildProcess.h:
+        (WebKit::ChildProcess::LocalTerminationDisabler::LocalTerminationDisabler):
+        (WebKit::ChildProcess::LocalTerminationDisabler::~LocalTerminationDisabler):
+        Add RAII class for calling disableTermination/enableTermination.
+
+        * WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
+        (WebKit::WebApplicationCacheManager::getApplicationCacheOrigins):
+        (WebKit::WebApplicationCacheManager::deleteEntriesForOrigin):
+        (WebKit::WebApplicationCacheManager::deleteAllEntries):
+        Use the LocalTerminationDisabler RAII class.
+
+        * WebProcess/Cookies/WebCookieManager.cpp:
+        (WebKit::WebCookieManager::getHostnamesWithCookies):
+        (WebKit::WebCookieManager::deleteCookiesForHostname):
+        (WebKit::WebCookieManager::deleteAllCookies):
+        (WebKit::WebCookieManager::startObservingCookieChanges):
+        (WebKit::WebCookieManager::setHTTPCookieAcceptPolicy):
+        (WebKit::WebCookieManager::getHTTPCookieAcceptPolicy):
+        Use the LocalTerminationDisabler RAII class.
+
+        * WebProcess/Downloads/Download.cpp:
+        (WebKit::Download::Download):
+        Call disableTermination().
+
+        (WebKit::Download::~Download):
+        Call enableTermination().
+
+        * WebProcess/Downloads/DownloadManager.cpp:
+        (WebKit::DownloadManager::downloadFinished):
+        Remove call to terminateIfPossible.
+
+        * WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp:
+        (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
+        (WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin):
+        (WebKit::WebKeyValueStorageManager::deleteAllEntries):
+        Use the LocalTerminationDisabler RAII class.
+
+        * WebProcess/MediaCache/WebMediaCacheManager.cpp:
+        (WebKit::WebMediaCacheManager::getHostnamesWithMediaCache):
+        (WebKit::WebMediaCacheManager::clearCacheForHostname):
+        (WebKit::WebMediaCacheManager::clearCacheForAllHostnames):
+        Use the LocalTerminationDisabler RAII class.
+
+        * WebProcess/ResourceCache/WebResourceCacheManager.cpp:
+        (WebKit::WebResourceCacheManager::getCacheOrigins):
+        (WebKit::WebResourceCacheManager::clearCacheForOrigin):
+        (WebKit::WebResourceCacheManager::clearCacheForAllOrigins):
+        Use the LocalTerminationDisabler RAII class.
+
+        * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
+        (WebKit::WebDatabaseManager::getDatabasesByOrigin):
+        (WebKit::WebDatabaseManager::getDatabaseOrigins):
+        (WebKit::WebDatabaseManager::deleteDatabaseWithNameForOrigin):
+        (WebKit::WebDatabaseManager::deleteDatabasesForOrigin):
+        (WebKit::WebDatabaseManager::deleteAllDatabases):
+        (WebKit::WebDatabaseManager::setQuotaForOrigin):
+        Use the LocalTerminationDisabler RAII class.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::createWebPage):
+        Call disableTermination().
+
+        (WebKit::WebProcess::removeWebPage):
+        Call enableTermination().
+
+        (WebKit::WebProcess::shouldTerminate):
+        Move logic from terminateIfPossible over here.
+
+        (WebKit::WebProcess::terminate):
+        Move logic from terminateIfPossible over here.
+
+        (WebKit::WebProcess::getSitesWithPluginData):
+        (WebKit::WebProcess::clearPluginSiteData):
+        Use the LocalTerminationDisabler RAII class.
+
+        * WebProcess/WebProcess.h:
+        Publically inherit from ChildProcess, LocalTerminationDisabler needs to be accessible
+        from the WebProcess class.
+
 2011-04-13  Steve Falkenburg  <sfalken@apple.com>
 
         Reviewed by Adam Roben.

Source/WebKit2/PluginProcess/PluginProcess.cpp

@@ -167,20 +167,18 @@ void PluginProcess::createWebProcessConnection()
 
 void PluginProcess::getSitesWithData(uint64_t callbackID)
 {
-    disableTermination();
+    LocalTerminationDisabler terminationDisabler(*this);
 
     Vector<String> sites;
     if (NetscapePluginModule* module = netscapePluginModule())
         sites = module->sitesWithData();
 
     m_connection->send(Messages::PluginProcessProxy::DidGetSitesWithData(sites, callbackID), 0);
-
-    enableTermination();
 }
 
 void PluginProcess::clearSiteData(const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
 {
-    disableTermination();
+    LocalTerminationDisabler terminationDisabler(*this);
 
     if (NetscapePluginModule* module = netscapePluginModule()) {
         if (sites.isEmpty()) {
@@ -193,8 +191,6 @@ void PluginProcess::clearSiteData(const Vector<String>& sites, uint64_t flags, u
     }
 
     m_connection->send(Messages::PluginProcessProxy::DidClearSiteData(callbackID), 0);
-
-    enableTermination();
 }
 
 } // namespace WebKit

Source/WebKit2/Shared/ChildProcess.h

@@ -40,6 +40,23 @@ class ChildProcess : protected CoreIPC::Connection::Client {
     void disableTermination();
     void enableTermination();
 
+    class LocalTerminationDisabler {
+    public:
+        explicit LocalTerminationDisabler(ChildProcess& childProcess)
+            : m_childProcess(childProcess)
+        {
+            m_childProcess.disableTermination();
+        }
+
+        ~LocalTerminationDisabler()
+        {
+            m_childProcess.enableTermination();
+        }
+
+    private:
+        ChildProcess& m_childProcess;
+    };
+
 protected:
     explicit ChildProcess(double terminationTimeout);
     ~ChildProcess();

Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp

@@ -56,6 +56,8 @@ void WebApplicationCacheManager::didReceiveMessage(CoreIPC::Connection* connecti
 
 void WebApplicationCacheManager::getApplicationCacheOrigins(uint64_t callbackID)
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
     HashSet<RefPtr<SecurityOrigin>, SecurityOriginHash> origins;
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
@@ -79,27 +81,28 @@ void WebApplicationCacheManager::getApplicationCacheOrigins(uint64_t callbackID)
     }
 
     WebProcess::shared().connection()->send(Messages::WebApplicationCacheManagerProxy::DidGetApplicationCacheOrigins(identifiers, callbackID), 0);
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebApplicationCacheManager::deleteEntriesForOrigin(const SecurityOriginData& originData)
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
     if (!origin)
         return;
 
     ApplicationCache::deleteCacheForOrigin(origin.get());
 #endif
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebApplicationCacheManager::deleteAllEntries()
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     cacheStorage().deleteAllEntries();
 #endif
-    WebProcess::shared().terminateIfPossible();
 }
 
 } // namespace WebKit

Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp

@@ -54,6 +54,8 @@ void WebCookieManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIP
 
 void WebCookieManager::getHostnamesWithCookies(uint64_t callbackID)
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
     HashSet<String> hostnames;
 
     WebCore::getHostnamesWithCookies(hostnames);
@@ -62,25 +64,27 @@ void WebCookieManager::getHostnamesWithCookies(uint64_t callbackID)
     copyToVector(hostnames, hostnameList);
 
     WebProcess::shared().connection()->send(Messages::WebCookieManagerProxy::DidGetHostnamesWithCookies(hostnameList, callbackID), 0);
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebCookieManager::deleteCookiesForHostname(const String& hostname)
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
     WebCore::deleteCookiesForHostname(hostname);
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebCookieManager::deleteAllCookies()
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
     WebCore::deleteAllCookies();
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebCookieManager::startObservingCookieChanges()
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
     WebCore::startObservingCookieChanges();
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebCookieManager::stopObservingCookieChanges()
@@ -95,14 +99,14 @@ void WebCookieManager::dispatchCookiesDidChange()
 
 void WebCookieManager::setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
     platformSetHTTPCookieAcceptPolicy(policy);
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebCookieManager::getHTTPCookieAcceptPolicy(uint64_t callbackID)
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
     WebProcess::shared().connection()->send(Messages::WebCookieManagerProxy::DidGetHTTPCookieAcceptPolicy(platformGetHTTPCookieAcceptPolicy(), callbackID), 0);
-    WebProcess::shared().terminateIfPossible();
 }
 
 } // namespace WebKit

Source/WebKit2/WebProcess/Downloads/Download.cpp

@@ -52,11 +52,15 @@ Download::Download(uint64_t downloadID, const ResourceRequest& request)
 #endif
 {
     ASSERT(m_downloadID);
+
+    WebProcess::shared().disableTermination();
 }
 
 Download::~Download()
 {
     platformInvalidate();
+
+    WebProcess::shared().enableTermination();
 }
 
 CoreIPC::Connection* Download::connection() const

Source/WebKit2/WebProcess/Downloads/DownloadManager.cpp

@@ -77,8 +77,6 @@ void DownloadManager::downloadFinished(Download* download)
     m_downloads.remove(download->downloadID());
 
     delete download;
-
-    WebProcess::shared().terminateIfPossible();
 }
 
 } // namespace WebKit

Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp

@@ -57,6 +57,8 @@ void WebKeyValueStorageManager::didReceiveMessage(CoreIPC::Connection* connectio
 
 void WebKeyValueStorageManager::getKeyValueStorageOrigins(uint64_t callbackID)
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
     Vector<RefPtr<SecurityOrigin> > coreOrigins;
 
     StorageTracker::tracker().origins(coreOrigins);
@@ -76,23 +78,23 @@ void WebKeyValueStorageManager::getKeyValueStorageOrigins(uint64_t callbackID)
     }
 
     WebProcess::shared().connection()->send(Messages::WebKeyValueStorageManagerProxy::DidGetKeyValueStorageOrigins(identifiers, callbackID), 0);
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebKeyValueStorageManager::deleteEntriesForOrigin(const SecurityOriginData& originData)
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
     RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
     if (!origin)
         return;
 
     StorageTracker::tracker().deleteOrigin(origin.get());
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebKeyValueStorageManager::deleteAllEntries()
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
     StorageTracker::tracker().deleteAllOrigins();
-    WebProcess::shared().terminateIfPossible();
 }
 
 } // namespace WebKit

Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp

@@ -53,30 +53,33 @@ void WebMediaCacheManager::didReceiveMessage(CoreIPC::Connection* connection, Co
 
 void WebMediaCacheManager::getHostnamesWithMediaCache(uint64_t callbackID)
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
     Vector<String> mediaCacheHostnames;
 
 #if ENABLE(VIDEO)
     HTMLMediaElement::getSitesInMediaCache(mediaCacheHostnames);
 #endif
 
     WebProcess::shared().connection()->send(Messages::WebMediaCacheManagerProxy::DidGetHostnamesWithMediaCache(mediaCacheHostnames, callbackID), 0);
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebMediaCacheManager::clearCacheForHostname(const String& hostname)
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
 #if ENABLE(VIDEO)
     HTMLMediaElement::clearMediaCacheForSite(hostname);
 #endif
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebMediaCacheManager::clearCacheForAllHostnames()
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
 #if ENABLE(VIDEO)
     HTMLMediaElement::clearMediaCache();
 #endif
-    WebProcess::shared().terminateIfPossible();
 }
 
 } // namespace WebKit

Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp

@@ -63,6 +63,8 @@ void WebResourceCacheManager::didReceiveMessage(CoreIPC::Connection* connection,
 
 void WebResourceCacheManager::getCacheOrigins(uint64_t callbackID) const
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
     MemoryCache::SecurityOriginSet origins;
     memoryCache()->getOriginsWithCache(origins);
 
@@ -94,11 +96,12 @@ void WebResourceCacheManager::getCacheOrigins(uint64_t callbackID) const
     }
 
     WebProcess::shared().connection()->send(Messages::WebResourceCacheManagerProxy::DidGetCacheOrigins(identifiers, callbackID), 0);
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebResourceCacheManager::clearCacheForOrigin(SecurityOriginData originData, uint32_t cachesToClear) const
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
 #if USE(CFURLCACHE)
     ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear);
 #else
@@ -120,15 +123,15 @@ void WebResourceCacheManager::clearCacheForOrigin(SecurityOriginData originData,
         clearCFURLCacheForHostNames(hostArray.get());
     }
 #endif
-    WebProcess::shared().terminateIfPossible();
 }
 
 void WebResourceCacheManager::clearCacheForAllOrigins(uint32_t cachesToClear) const
 {
+    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
     ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear);
 
     WebProcess::shared().clearResourceCaches(resourceCachesToClear);
-    WebProcess::shared().terminateIfPossible();
 }
 
 } // namespace WebKit