Changeset 139257 in webkit
- Timestamp:
- Jan 9, 2013 4:46:30 PM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r139241 r139257 1 2013-01-09 Alexey Proskuryakov <ap@apple.com> 2 3 [WK2] Get rid of LocalTerminationDisabler 4 https://bugs.webkit.org/show_bug.cgi?id=106501 5 6 Reviewed by Anders Carlsson. 7 8 LocalTerminationDisabler is no-op - termination timer can't fire inside its scope 9 even if not stopped. 10 11 * PluginProcess/PluginProcess.cpp: 12 (WebKit::PluginProcess::getSitesWithData): 13 (WebKit::PluginProcess::clearSiteData): 14 * Shared/ChildProcess.h: 15 * WebProcess/ApplicationCache/WebApplicationCacheManager.cpp: 16 (WebKit::WebApplicationCacheManager::getApplicationCacheOrigins): 17 (WebKit::WebApplicationCacheManager::deleteEntriesForOrigin): 18 (WebKit::WebApplicationCacheManager::deleteAllEntries): 19 (WebKit::WebApplicationCacheManager::setAppCacheMaximumSize): 20 * WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp: 21 (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins): 22 (WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin): 23 (WebKit::WebKeyValueStorageManager::deleteAllEntries): 24 * WebProcess/MediaCache/WebMediaCacheManager.cpp: 25 (WebKit::WebMediaCacheManager::getHostnamesWithMediaCache): 26 (WebKit::WebMediaCacheManager::clearCacheForHostname): 27 (WebKit::WebMediaCacheManager::clearCacheForAllHostnames): 28 * WebProcess/ResourceCache/WebResourceCacheManager.cpp: 29 (WebKit::WebResourceCacheManager::getCacheOrigins): 30 (WebKit::WebResourceCacheManager::clearCacheForOrigin): 31 (WebKit::WebResourceCacheManager::clearCacheForAllOrigins): 32 * WebProcess/WebCoreSupport/WebDatabaseManager.cpp: 33 (WebKit::WebDatabaseManager::getDatabasesByOrigin): 34 (WebKit::WebDatabaseManager::getDatabaseOrigins): 35 (WebKit::WebDatabaseManager::deleteDatabaseWithNameForOrigin): 36 (WebKit::WebDatabaseManager::deleteDatabasesForOrigin): 37 (WebKit::WebDatabaseManager::deleteAllDatabases): 38 (WebKit::WebDatabaseManager::setQuotaForOrigin): 39 * WebProcess/WebProcess.cpp: 40 (WebKit::WebProcess::getSitesWithPluginData): 41 (WebKit::WebProcess::clearPluginSiteData): 42 1 43 2013-01-09 Kiran Muppala <cmuppala@apple.com> 2 44 -
trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp
r138913 r139257 222 222 void PluginProcess::getSitesWithData(uint64_t callbackID) 223 223 { 224 LocalTerminationDisabler terminationDisabler(*this);225 226 224 Vector<String> sites; 227 225 if (NetscapePluginModule* module = netscapePluginModule()) … … 233 231 void PluginProcess::clearSiteData(const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID) 234 232 { 235 LocalTerminationDisabler terminationDisabler(*this);236 237 233 if (NetscapePluginModule* module = netscapePluginModule()) { 238 234 if (sites.isEmpty()) { -
trunk/Source/WebKit2/Shared/ChildProcess.h
r138913 r139257 52 52 void disableTermination(); 53 53 void enableTermination(); 54 55 class LocalTerminationDisabler {56 public:57 explicit LocalTerminationDisabler(ChildProcess& childProcess)58 : m_childProcess(childProcess)59 {60 m_childProcess.disableTermination();61 }62 63 ~LocalTerminationDisabler()64 {65 m_childProcess.enableTermination();66 }67 68 private:69 ChildProcess& m_childProcess;70 };71 54 72 55 void addMessageReceiver(CoreIPC::StringReference messageReceiverName, CoreIPC::MessageReceiver*); -
trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp
r138520 r139257 60 60 void WebApplicationCacheManager::getApplicationCacheOrigins(uint64_t callbackID) 61 61 { 62 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_childProcess);63 64 62 HashSet<RefPtr<SecurityOrigin>, SecurityOriginHash> origins; 65 63 … … 87 85 void WebApplicationCacheManager::deleteEntriesForOrigin(const SecurityOriginData& originData) 88 86 { 89 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_childProcess);90 91 87 RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port); 92 88 if (!origin) … … 98 94 void WebApplicationCacheManager::deleteAllEntries() 99 95 { 100 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_childProcess);101 102 96 cacheStorage().deleteAllEntries(); 103 97 } … … 105 99 void WebApplicationCacheManager::setAppCacheMaximumSize(uint64_t size) 106 100 { 107 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_childProcess);108 109 101 cacheStorage().setMaximumSize(size); 110 102 } -
trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp
r138514 r139257 92 92 void WebKeyValueStorageManager::getKeyValueStorageOrigins(uint64_t callbackID) 93 93 { 94 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);95 96 94 if (!StorageTracker::tracker().originsLoaded()) { 97 95 m_originsRequestCallbackIDs.append(callbackID); … … 124 122 void WebKeyValueStorageManager::deleteEntriesForOrigin(const SecurityOriginData& originData) 125 123 { 126 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);127 128 124 RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port); 129 125 if (!origin) … … 135 131 void WebKeyValueStorageManager::deleteAllEntries() 136 132 { 137 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);138 133 StorageTracker::tracker().deleteAllOrigins(); 139 134 } -
trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp
r138520 r139257 55 55 void WebMediaCacheManager::getHostnamesWithMediaCache(uint64_t callbackID) 56 56 { 57 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);58 59 57 Vector<String> mediaCacheHostnames; 60 58 … … 68 66 void WebMediaCacheManager::clearCacheForHostname(const String& hostname) 69 67 { 70 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);71 72 68 #if ENABLE(VIDEO) 73 69 HTMLMediaElement::clearMediaCacheForSite(hostname); … … 77 73 void WebMediaCacheManager::clearCacheForAllHostnames() 78 74 { 79 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);80 81 75 #if ENABLE(VIDEO) 82 76 HTMLMediaElement::clearMediaCache(); -
trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp
r138520 r139257 60 60 void WebResourceCacheManager::getCacheOrigins(uint64_t callbackID) const 61 61 { 62 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);63 64 62 MemoryCache::SecurityOriginSet origins; 65 63 memoryCache()->getOriginsWithCache(origins); … … 97 95 void WebResourceCacheManager::clearCacheForOrigin(SecurityOriginData originData, uint32_t cachesToClear) const 98 96 { 99 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);100 101 97 #if USE(CFURLCACHE) 102 98 ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear); … … 123 119 void WebResourceCacheManager::clearCacheForAllOrigins(uint32_t cachesToClear) const 124 120 { 125 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);126 127 121 ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear); 128 122 m_process->clearResourceCaches(resourceCachesToClear); -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp
r138514 r139257 68 68 void WebDatabaseManager::getDatabasesByOrigin(uint64_t callbackID) const 69 69 { 70 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);71 72 70 // FIXME: This could be made more efficient by adding a function to DatabaseManager 73 71 // to get both the origins and the Vector of DatabaseDetails for each origin in one … … 112 110 void WebDatabaseManager::getDatabaseOrigins(uint64_t callbackID) const 113 111 { 114 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);115 116 112 Vector<RefPtr<SecurityOrigin> > origins; 117 113 DatabaseManager::manager().origins(origins); … … 127 123 void WebDatabaseManager::deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, const String& originIdentifier) const 128 124 { 129 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);130 131 125 RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier); 132 126 if (!origin) … … 138 132 void WebDatabaseManager::deleteDatabasesForOrigin(const String& originIdentifier) const 139 133 { 140 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);141 142 134 RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier); 143 135 if (!origin) … … 149 141 void WebDatabaseManager::deleteAllDatabases() const 150 142 { 151 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);152 153 143 DatabaseManager::manager().deleteAllDatabases(); 154 144 } … … 156 146 void WebDatabaseManager::setQuotaForOrigin(const String& originIdentifier, unsigned long long quota) const 157 147 { 158 ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);159 160 148 // If the quota is set to a value lower than the current usage, that quota will 161 149 // "stick" but no data will be purged to meet the new quota. This will simply -
trunk/Source/WebKit2/WebProcess/WebProcess.cpp
r139066 r139257 730 730 void WebProcess::getSitesWithPluginData(const Vector<String>& pluginPaths, uint64_t callbackID) 731 731 { 732 LocalTerminationDisabler terminationDisabler(*this);733 734 732 HashSet<String> sitesSet; 735 733 … … 756 754 void WebProcess::clearPluginSiteData(const Vector<String>& pluginPaths, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID) 757 755 { 758 LocalTerminationDisabler terminationDisabler(*this);759 760 756 #if ENABLE(NETSCAPE_PLUGIN_API) 761 757 for (size_t i = 0; i < pluginPaths.size(); ++i) {
Note: See TracChangeset
for help on using the changeset viewer.