Diff
Modified: trunk/Source/WebKit2/ChangeLog (139256 => 139257)
--- trunk/Source/WebKit2/ChangeLog 2013-01-10 00:44:57 UTC (rev 139256)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-10 00:46:30 UTC (rev 139257)
@@ -1,3 +1,45 @@
+2013-01-09 Alexey Proskuryakov <[email protected]>
+
+ [WK2] Get rid of LocalTerminationDisabler
+ https://bugs.webkit.org/show_bug.cgi?id=106501
+
+ Reviewed by Anders Carlsson.
+
+ LocalTerminationDisabler is no-op - termination timer can't fire inside its scope
+ even if not stopped.
+
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::getSitesWithData):
+ (WebKit::PluginProcess::clearSiteData):
+ * Shared/ChildProcess.h:
+ * WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
+ (WebKit::WebApplicationCacheManager::getApplicationCacheOrigins):
+ (WebKit::WebApplicationCacheManager::deleteEntriesForOrigin):
+ (WebKit::WebApplicationCacheManager::deleteAllEntries):
+ (WebKit::WebApplicationCacheManager::setAppCacheMaximumSize):
+ * WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp:
+ (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
+ (WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin):
+ (WebKit::WebKeyValueStorageManager::deleteAllEntries):
+ * WebProcess/MediaCache/WebMediaCacheManager.cpp:
+ (WebKit::WebMediaCacheManager::getHostnamesWithMediaCache):
+ (WebKit::WebMediaCacheManager::clearCacheForHostname):
+ (WebKit::WebMediaCacheManager::clearCacheForAllHostnames):
+ * WebProcess/ResourceCache/WebResourceCacheManager.cpp:
+ (WebKit::WebResourceCacheManager::getCacheOrigins):
+ (WebKit::WebResourceCacheManager::clearCacheForOrigin):
+ (WebKit::WebResourceCacheManager::clearCacheForAllOrigins):
+ * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
+ (WebKit::WebDatabaseManager::getDatabasesByOrigin):
+ (WebKit::WebDatabaseManager::getDatabaseOrigins):
+ (WebKit::WebDatabaseManager::deleteDatabaseWithNameForOrigin):
+ (WebKit::WebDatabaseManager::deleteDatabasesForOrigin):
+ (WebKit::WebDatabaseManager::deleteAllDatabases):
+ (WebKit::WebDatabaseManager::setQuotaForOrigin):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::getSitesWithPluginData):
+ (WebKit::WebProcess::clearPluginSiteData):
+
2013-01-09 Kiran Muppala <[email protected]>
Add user defaults to override system proxy settings for NetworkProcess on Mac
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (139256 => 139257)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2013-01-10 00:44:57 UTC (rev 139256)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2013-01-10 00:46:30 UTC (rev 139257)
@@ -221,8 +221,6 @@
void PluginProcess::getSitesWithData(uint64_t callbackID)
{
- LocalTerminationDisabler terminationDisabler(*this);
-
Vector<String> sites;
if (NetscapePluginModule* module = netscapePluginModule())
sites = module->sitesWithData();
@@ -232,8 +230,6 @@
void PluginProcess::clearSiteData(const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
{
- LocalTerminationDisabler terminationDisabler(*this);
-
if (NetscapePluginModule* module = netscapePluginModule()) {
if (sites.isEmpty()) {
// Clear everything.
Modified: trunk/Source/WebKit2/Shared/ChildProcess.h (139256 => 139257)
--- trunk/Source/WebKit2/Shared/ChildProcess.h 2013-01-10 00:44:57 UTC (rev 139256)
+++ trunk/Source/WebKit2/Shared/ChildProcess.h 2013-01-10 00:46:30 UTC (rev 139257)
@@ -52,23 +52,6 @@
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;
- };
-
void addMessageReceiver(CoreIPC::StringReference messageReceiverName, CoreIPC::MessageReceiver*);
void addMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID, CoreIPC::MessageReceiver*);
void removeMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID);
Modified: trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp (139256 => 139257)
--- trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp 2013-01-10 00:44:57 UTC (rev 139256)
+++ trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp 2013-01-10 00:46:30 UTC (rev 139257)
@@ -59,8 +59,6 @@
void WebApplicationCacheManager::getApplicationCacheOrigins(uint64_t callbackID)
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_childProcess);
-
HashSet<RefPtr<SecurityOrigin>, SecurityOriginHash> origins;
cacheStorage().getOriginsWithCache(origins);
@@ -86,8 +84,6 @@
void WebApplicationCacheManager::deleteEntriesForOrigin(const SecurityOriginData& originData)
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_childProcess);
-
RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
if (!origin)
return;
@@ -97,15 +93,11 @@
void WebApplicationCacheManager::deleteAllEntries()
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_childProcess);
-
cacheStorage().deleteAllEntries();
}
void WebApplicationCacheManager::setAppCacheMaximumSize(uint64_t size)
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_childProcess);
-
cacheStorage().setMaximumSize(size);
}
Modified: trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp (139256 => 139257)
--- trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp 2013-01-10 00:44:57 UTC (rev 139256)
+++ trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp 2013-01-10 00:46:30 UTC (rev 139257)
@@ -91,8 +91,6 @@
void WebKeyValueStorageManager::getKeyValueStorageOrigins(uint64_t callbackID)
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
if (!StorageTracker::tracker().originsLoaded()) {
m_originsRequestCallbackIDs.append(callbackID);
return;
@@ -123,8 +121,6 @@
void WebKeyValueStorageManager::deleteEntriesForOrigin(const SecurityOriginData& originData)
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
if (!origin)
return;
@@ -134,7 +130,6 @@
void WebKeyValueStorageManager::deleteAllEntries()
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
StorageTracker::tracker().deleteAllOrigins();
}
Modified: trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp (139256 => 139257)
--- trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp 2013-01-10 00:44:57 UTC (rev 139256)
+++ trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp 2013-01-10 00:46:30 UTC (rev 139257)
@@ -54,8 +54,6 @@
void WebMediaCacheManager::getHostnamesWithMediaCache(uint64_t callbackID)
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
Vector<String> mediaCacheHostnames;
#if ENABLE(VIDEO)
@@ -67,8 +65,6 @@
void WebMediaCacheManager::clearCacheForHostname(const String& hostname)
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
#if ENABLE(VIDEO)
HTMLMediaElement::clearMediaCacheForSite(hostname);
#endif
@@ -76,8 +72,6 @@
void WebMediaCacheManager::clearCacheForAllHostnames()
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
#if ENABLE(VIDEO)
HTMLMediaElement::clearMediaCache();
#endif
Modified: trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp (139256 => 139257)
--- trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp 2013-01-10 00:44:57 UTC (rev 139256)
+++ trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp 2013-01-10 00:46:30 UTC (rev 139257)
@@ -59,8 +59,6 @@
void WebResourceCacheManager::getCacheOrigins(uint64_t callbackID) const
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
MemoryCache::SecurityOriginSet origins;
memoryCache()->getOriginsWithCache(origins);
@@ -96,8 +94,6 @@
void WebResourceCacheManager::clearCacheForOrigin(SecurityOriginData originData, uint32_t cachesToClear) const
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
#if USE(CFURLCACHE)
ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear);
#else
@@ -122,8 +118,6 @@
void WebResourceCacheManager::clearCacheForAllOrigins(uint32_t cachesToClear) const
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear);
m_process->clearResourceCaches(resourceCachesToClear);
}
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp (139256 => 139257)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2013-01-10 00:44:57 UTC (rev 139256)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2013-01-10 00:46:30 UTC (rev 139257)
@@ -67,8 +67,6 @@
void WebDatabaseManager::getDatabasesByOrigin(uint64_t callbackID) const
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
// FIXME: This could be made more efficient by adding a function to DatabaseManager
// to get both the origins and the Vector of DatabaseDetails for each origin in one
// shot. That would avoid taking the numerous locks this requires.
@@ -111,8 +109,6 @@
void WebDatabaseManager::getDatabaseOrigins(uint64_t callbackID) const
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
Vector<RefPtr<SecurityOrigin> > origins;
DatabaseManager::manager().origins(origins);
@@ -126,8 +122,6 @@
void WebDatabaseManager::deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, const String& originIdentifier) const
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
if (!origin)
return;
@@ -137,8 +131,6 @@
void WebDatabaseManager::deleteDatabasesForOrigin(const String& originIdentifier) const
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
if (!origin)
return;
@@ -148,15 +140,11 @@
void WebDatabaseManager::deleteAllDatabases() const
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
DatabaseManager::manager().deleteAllDatabases();
}
void WebDatabaseManager::setQuotaForOrigin(const String& originIdentifier, unsigned long long quota) const
{
- ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
-
// If the quota is set to a value lower than the current usage, that quota will
// "stick" but no data will be purged to meet the new quota. This will simply
// prevent new data from being added to databases in that origin.
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (139256 => 139257)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-01-10 00:44:57 UTC (rev 139256)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-01-10 00:46:30 UTC (rev 139257)
@@ -729,8 +729,6 @@
#if ENABLE(NETSCAPE_PLUGIN_API) && !ENABLE(PLUGIN_PROCESS)
void WebProcess::getSitesWithPluginData(const Vector<String>& pluginPaths, uint64_t callbackID)
{
- LocalTerminationDisabler terminationDisabler(*this);
-
HashSet<String> sitesSet;
#if ENABLE(NETSCAPE_PLUGIN_API)
@@ -755,8 +753,6 @@
void WebProcess::clearPluginSiteData(const Vector<String>& pluginPaths, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
{
- LocalTerminationDisabler terminationDisabler(*this);
-
#if ENABLE(NETSCAPE_PLUGIN_API)
for (size_t i = 0; i < pluginPaths.size(); ++i) {
RefPtr<NetscapePluginModule> netscapePluginModule = NetscapePluginModule::getOrCreate(pluginPaths[i]);
