Changeset 139257 in webkit


Ignore:
Timestamp:
Jan 9, 2013 4:46:30 PM (11 years ago)
Author:
ap@apple.com
Message:

[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):
Location:
trunk/Source/WebKit2
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r139241 r139257  
     12013-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
    1432013-01-09  Kiran Muppala  <cmuppala@apple.com>
    244
  • trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp

    r138913 r139257  
    222222void PluginProcess::getSitesWithData(uint64_t callbackID)
    223223{
    224     LocalTerminationDisabler terminationDisabler(*this);
    225 
    226224    Vector<String> sites;
    227225    if (NetscapePluginModule* module = netscapePluginModule())
     
    233231void PluginProcess::clearSiteData(const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
    234232{
    235     LocalTerminationDisabler terminationDisabler(*this);
    236 
    237233    if (NetscapePluginModule* module = netscapePluginModule()) {
    238234        if (sites.isEmpty()) {
  • trunk/Source/WebKit2/Shared/ChildProcess.h

    r138913 r139257  
    5252    void disableTermination();
    5353    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     };
    7154
    7255    void addMessageReceiver(CoreIPC::StringReference messageReceiverName, CoreIPC::MessageReceiver*);
  • trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp

    r138520 r139257  
    6060void WebApplicationCacheManager::getApplicationCacheOrigins(uint64_t callbackID)
    6161{
    62     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_childProcess);
    63 
    6462    HashSet<RefPtr<SecurityOrigin>, SecurityOriginHash> origins;
    6563
     
    8785void WebApplicationCacheManager::deleteEntriesForOrigin(const SecurityOriginData& originData)
    8886{
    89     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_childProcess);
    90 
    9187    RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
    9288    if (!origin)
     
    9894void WebApplicationCacheManager::deleteAllEntries()
    9995{
    100     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_childProcess);
    101 
    10296    cacheStorage().deleteAllEntries();
    10397}
     
    10599void WebApplicationCacheManager::setAppCacheMaximumSize(uint64_t size)
    106100{
    107     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_childProcess);
    108 
    109101    cacheStorage().setMaximumSize(size);
    110102}
  • trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp

    r138514 r139257  
    9292void WebKeyValueStorageManager::getKeyValueStorageOrigins(uint64_t callbackID)
    9393{
    94     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    95 
    9694    if (!StorageTracker::tracker().originsLoaded()) {
    9795        m_originsRequestCallbackIDs.append(callbackID);
     
    124122void WebKeyValueStorageManager::deleteEntriesForOrigin(const SecurityOriginData& originData)
    125123{
    126     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    127 
    128124    RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
    129125    if (!origin)
     
    135131void WebKeyValueStorageManager::deleteAllEntries()
    136132{
    137     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    138133    StorageTracker::tracker().deleteAllOrigins();
    139134}
  • trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp

    r138520 r139257  
    5555void WebMediaCacheManager::getHostnamesWithMediaCache(uint64_t callbackID)
    5656{
    57     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    58 
    5957    Vector<String> mediaCacheHostnames;
    6058
     
    6866void WebMediaCacheManager::clearCacheForHostname(const String& hostname)
    6967{
    70     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    71 
    7268#if ENABLE(VIDEO)
    7369    HTMLMediaElement::clearMediaCacheForSite(hostname);
     
    7773void WebMediaCacheManager::clearCacheForAllHostnames()
    7874{
    79     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    80 
    8175#if ENABLE(VIDEO)
    8276    HTMLMediaElement::clearMediaCache();
  • trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp

    r138520 r139257  
    6060void WebResourceCacheManager::getCacheOrigins(uint64_t callbackID) const
    6161{
    62     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    63 
    6462    MemoryCache::SecurityOriginSet origins;
    6563    memoryCache()->getOriginsWithCache(origins);
     
    9795void WebResourceCacheManager::clearCacheForOrigin(SecurityOriginData originData, uint32_t cachesToClear) const
    9896{
    99     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    100 
    10197#if USE(CFURLCACHE)
    10298    ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear);
     
    123119void WebResourceCacheManager::clearCacheForAllOrigins(uint32_t cachesToClear) const
    124120{
    125     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    126 
    127121    ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear);
    128122    m_process->clearResourceCaches(resourceCachesToClear);
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp

    r138514 r139257  
    6868void WebDatabaseManager::getDatabasesByOrigin(uint64_t callbackID) const
    6969{
    70     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    71 
    7270    // FIXME: This could be made more efficient by adding a function to DatabaseManager
    7371    // to get both the origins and the Vector of DatabaseDetails for each origin in one
     
    112110void WebDatabaseManager::getDatabaseOrigins(uint64_t callbackID) const
    113111{
    114     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    115 
    116112    Vector<RefPtr<SecurityOrigin> > origins;
    117113    DatabaseManager::manager().origins(origins);
     
    127123void WebDatabaseManager::deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, const String& originIdentifier) const
    128124{
    129     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    130 
    131125    RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
    132126    if (!origin)
     
    138132void WebDatabaseManager::deleteDatabasesForOrigin(const String& originIdentifier) const
    139133{
    140     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    141 
    142134    RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
    143135    if (!origin)
     
    149141void WebDatabaseManager::deleteAllDatabases() const
    150142{
    151     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    152 
    153143    DatabaseManager::manager().deleteAllDatabases();
    154144}
     
    156146void WebDatabaseManager::setQuotaForOrigin(const String& originIdentifier, unsigned long long quota) const
    157147{
    158     ChildProcess::LocalTerminationDisabler terminationDisabler(*m_process);
    159 
    160148    // If the quota is set to a value lower than the current usage, that quota will
    161149    // "stick" but no data will be purged to meet the new quota. This will simply
  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r139066 r139257  
    730730void WebProcess::getSitesWithPluginData(const Vector<String>& pluginPaths, uint64_t callbackID)
    731731{
    732     LocalTerminationDisabler terminationDisabler(*this);
    733 
    734732    HashSet<String> sitesSet;
    735733
     
    756754void WebProcess::clearPluginSiteData(const Vector<String>& pluginPaths, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
    757755{
    758     LocalTerminationDisabler terminationDisabler(*this);
    759 
    760756#if ENABLE(NETSCAPE_PLUGIN_API)
    761757    for (size_t i = 0; i < pluginPaths.size(); ++i) {
Note: See TracChangeset for help on using the changeset viewer.