Changeset 82873 in webkit


Ignore:
Timestamp:
Apr 4, 2011 2:17:39 PM (13 years ago)
Author:
andersca@apple.com
Message:

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

Reviewed by Dan Bernstein.

Get rid of WebContext::process() in more places
​https://bugs.webkit.org/show_bug.cgi?id=57787

Migrate calls to WebContext::process() over to sendToAllProcesses and
sendToAllProcessesRelaunchingThemIfNecessary.

Add FIXMEs for things that need to be fixed in order to support multiple web processes.


  • UIProcess/Downloads/DownloadProxy.cpp: (WebKit::DownloadProxy::cancel):
  • UIProcess/Plugins/WebPluginSiteDataManager.cpp: (WebKit::WebPluginSiteDataManager::getSitesWithData): (WebKit::WebPluginSiteDataManager::clearSiteData):
  • UIProcess/VisitedLinkProvider.cpp: (WebKit::VisitedLinkProvider::pendingVisitedLinksTimerFired):
  • UIProcess/WebApplicationCacheManagerProxy.cpp: (WebKit::WebApplicationCacheManagerProxy::getApplicationCacheOrigins): (WebKit::WebApplicationCacheManagerProxy::deleteEntriesForOrigin): (WebKit::WebApplicationCacheManagerProxy::deleteAllEntries):
  • UIProcess/WebCookieManagerProxy.cpp: (WebKit::WebCookieManagerProxy::getHostnamesWithCookies): (WebKit::WebCookieManagerProxy::getHTTPCookieAcceptPolicy):
  • UIProcess/WebDatabaseManagerProxy.cpp: (WebKit::WebDatabaseManagerProxy::getDatabasesByOrigin): (WebKit::WebDatabaseManagerProxy::getDatabaseOrigins): (WebKit::WebDatabaseManagerProxy::deleteDatabaseWithNameForOrigin): (WebKit::WebDatabaseManagerProxy::deleteDatabasesForOrigin): (WebKit::WebDatabaseManagerProxy::deleteAllDatabases): (WebKit::WebDatabaseManagerProxy::setQuotaForOrigin):
  • UIProcess/WebGeolocationManagerProxy.cpp: (WebKit::WebGeolocationManagerProxy::providerDidChangePosition): (WebKit::WebGeolocationManagerProxy::providerDidFailToDeterminePosition):
  • UIProcess/WebIconDatabase.cpp: (WebKit::WebIconDatabase::getLoadDecisionForIconURL): (WebKit::WebIconDatabase::didFinishURLImport):
  • UIProcess/WebKeyValueStorageManagerProxy.cpp: (WebKit::WebKeyValueStorageManagerProxy::getKeyValueStorageOrigins): (WebKit::WebKeyValueStorageManagerProxy::deleteEntriesForOrigin): (WebKit::WebKeyValueStorageManagerProxy::deleteAllEntries):
  • UIProcess/WebMediaCacheManagerProxy.cpp: (WebKit::WebMediaCacheManagerProxy::getHostnamesWithMediaCache): (WebKit::WebMediaCacheManagerProxy::clearCacheForHostname): (WebKit::WebMediaCacheManagerProxy::clearCacheForAllHostnames):
  • UIProcess/WebResourceCacheManagerProxy.cpp: (WebKit::WebResourceCacheManagerProxy::getCacheOrigins): (WebKit::WebResourceCacheManagerProxy::clearCacheForOrigin): (WebKit::WebResourceCacheManagerProxy::clearCacheForAllOrigins):
Location:
trunk/Source/WebKit2
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r82870 r82873  
     12011-04-04  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Dan Bernstein.
     4
     5        Get rid of WebContext::process() in more places
     6        https://bugs.webkit.org/show_bug.cgi?id=57787
     7
     8        Migrate calls to WebContext::process() over to sendToAllProcesses and
     9        sendToAllProcessesRelaunchingThemIfNecessary.
     10
     11        Add FIXMEs for things that need to be fixed in order to support multiple web processes.
     12               
     13        * UIProcess/Downloads/DownloadProxy.cpp:
     14        (WebKit::DownloadProxy::cancel):
     15        * UIProcess/Plugins/WebPluginSiteDataManager.cpp:
     16        (WebKit::WebPluginSiteDataManager::getSitesWithData):
     17        (WebKit::WebPluginSiteDataManager::clearSiteData):
     18        * UIProcess/VisitedLinkProvider.cpp:
     19        (WebKit::VisitedLinkProvider::pendingVisitedLinksTimerFired):
     20        * UIProcess/WebApplicationCacheManagerProxy.cpp:
     21        (WebKit::WebApplicationCacheManagerProxy::getApplicationCacheOrigins):
     22        (WebKit::WebApplicationCacheManagerProxy::deleteEntriesForOrigin):
     23        (WebKit::WebApplicationCacheManagerProxy::deleteAllEntries):
     24        * UIProcess/WebCookieManagerProxy.cpp:
     25        (WebKit::WebCookieManagerProxy::getHostnamesWithCookies):
     26        (WebKit::WebCookieManagerProxy::getHTTPCookieAcceptPolicy):
     27        * UIProcess/WebDatabaseManagerProxy.cpp:
     28        (WebKit::WebDatabaseManagerProxy::getDatabasesByOrigin):
     29        (WebKit::WebDatabaseManagerProxy::getDatabaseOrigins):
     30        (WebKit::WebDatabaseManagerProxy::deleteDatabaseWithNameForOrigin):
     31        (WebKit::WebDatabaseManagerProxy::deleteDatabasesForOrigin):
     32        (WebKit::WebDatabaseManagerProxy::deleteAllDatabases):
     33        (WebKit::WebDatabaseManagerProxy::setQuotaForOrigin):
     34        * UIProcess/WebGeolocationManagerProxy.cpp:
     35        (WebKit::WebGeolocationManagerProxy::providerDidChangePosition):
     36        (WebKit::WebGeolocationManagerProxy::providerDidFailToDeterminePosition):
     37        * UIProcess/WebIconDatabase.cpp:
     38        (WebKit::WebIconDatabase::getLoadDecisionForIconURL):
     39        (WebKit::WebIconDatabase::didFinishURLImport):
     40        * UIProcess/WebKeyValueStorageManagerProxy.cpp:
     41        (WebKit::WebKeyValueStorageManagerProxy::getKeyValueStorageOrigins):
     42        (WebKit::WebKeyValueStorageManagerProxy::deleteEntriesForOrigin):
     43        (WebKit::WebKeyValueStorageManagerProxy::deleteAllEntries):
     44        * UIProcess/WebMediaCacheManagerProxy.cpp:
     45        (WebKit::WebMediaCacheManagerProxy::getHostnamesWithMediaCache):
     46        (WebKit::WebMediaCacheManagerProxy::clearCacheForHostname):
     47        (WebKit::WebMediaCacheManagerProxy::clearCacheForAllHostnames):
     48        * UIProcess/WebResourceCacheManagerProxy.cpp:
     49        (WebKit::WebResourceCacheManagerProxy::getCacheOrigins):
     50        (WebKit::WebResourceCacheManagerProxy::clearCacheForOrigin):
     51        (WebKit::WebResourceCacheManagerProxy::clearCacheForAllOrigins):
     52
    1532011-04-04  Alexey Proskuryakov  <ap@apple.com>
    254

  • trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp

    r82364 r82873  
    6666        return;
    6767
    68     m_webContext->process()->send(Messages::WebProcess::CancelDownload(m_downloadID), 0);
     68    // FIXME (Multi-WebProcess): Downloads shouldn't be handled in the web process.
     69    m_webContext->sendToAllProcesses(Messages::WebProcess::CancelDownload(m_downloadID));
    6970}
    7071

  • trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp

    r82312 r82873  
    168168    Vector<String> pluginPaths;
    169169    m_webContext->pluginInfoStore()->getPluginPaths(pluginPaths);
    170     m_webContext->ensureWebProcess();   
    171     m_webContext->process()->send(Messages::WebProcess::GetSitesWithPluginData(pluginPaths, callbackID), 0);
     170
     171    // FIXME (Multi-WebProcess): When multi-process is enabled, we must always use a plug-in process for this,
     172    // so this code should just be removed.
     173    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebProcess::GetSitesWithPluginData(pluginPaths, callbackID));
    172174#endif
    173175}
    … …  
    227229    Vector<String> pluginPaths;
    228230    m_webContext->pluginInfoStore()->getPluginPaths(pluginPaths);
    229     m_webContext->ensureWebProcess();   
    230     m_webContext->process()->send(Messages::WebProcess::ClearPluginSiteData(pluginPaths, sitesVector, flags, maxAgeInSeconds, callbackID), 0);
     231
     232    // FIXME (Multi-WebProcess): When multi-process is enabled, we must always use a plug-in process for this,
     233    // so this code should just be removed.
     234    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebProcess::ClearPluginSiteData(pluginPaths, sitesVector, flags, maxAgeInSeconds, callbackID));
    231235#endif
    232236}

  • trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp

    r76916 r82873  
    164164            return;
    165165
    166         m_context->process()->send(Messages::WebProcess::SetVisitedLinkTable(handle), 0);
     166        // FIXME (Multi-WebProcess): Encoding a handle will null it out so we need to create a new
     167        // handle for every process. Maybe the ArgumentEncoder should handle this.
     168        m_context->sendToAllProcesses(Messages::WebProcess::SetVisitedLinkTable(handle));
    167169    }
    168170   
    169171    // We now need to let the web process know that we've added links.
    170172    if (m_webProcessHasVisitedLinkState && addedVisitedLinks.size() <= 20) {
    171         m_context->process()->send(Messages::WebProcess::VisitedLinkStateChanged(addedVisitedLinks), 0);
     173        m_context->sendToAllProcesses(Messages::WebProcess::VisitedLinkStateChanged(addedVisitedLinks));
    172174        return;
    173175    }
    174176   
    175177    // Just recalculate all the visited links.
    176     m_context->process()->send(Messages::WebProcess::AllVisitedLinkStateChanged(), 0);
     178    m_context->sendToAllProcesses(Messages::WebProcess::AllVisitedLinkStateChanged());
    177179    m_webProcessHasVisitedLinkState = true;
    178180}

  • trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp

    r82458 r82873  
    6666{
    6767    RefPtr<ArrayCallback> callback = prpCallback;
    68     m_webContext->relaunchProcessIfNecessary();
    6968   
    7069    uint64_t callbackID = callback->callbackID();
    7170    m_arrayCallbacks.set(callbackID, callback.release());
    72     m_webContext->process()->send(Messages::WebApplicationCacheManager::GetApplicationCacheOrigins(callbackID), 0);
     71
     72    // FIXME (Multi-WebProcess): The application cache shouldn't be stored in the web process.
     73    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebApplicationCacheManager::GetApplicationCacheOrigins(callbackID));
    7374}
    7475   
    … …  
    8182void WebApplicationCacheManagerProxy::deleteEntriesForOrigin(WebSecurityOrigin* origin)
    8283{
    83     m_webContext->relaunchProcessIfNecessary();
    84    
    8584    SecurityOriginData securityOriginData;
    8685    securityOriginData.protocol = origin->protocol();
    … …  
    8887    securityOriginData.port = origin->port();
    8988
    90     m_webContext->process()->send(Messages::WebApplicationCacheManager::DeleteEntriesForOrigin(securityOriginData), 0);
     89    // FIXME (Multi-WebProcess): The application cache shouldn't be stored in the web process.
     90    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebApplicationCacheManager::DeleteEntriesForOrigin(securityOriginData));
    9191}
    9292
    9393void WebApplicationCacheManagerProxy::deleteAllEntries()
    9494{
    95     m_webContext->relaunchProcessIfNecessary();
    96     m_webContext->process()->send(Messages::WebApplicationCacheManager::DeleteAllEntries(), 0);
     95    // FIXME (Multi-WebProcess): The application cache shouldn't be stored in the web process.
     96    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebApplicationCacheManager::DeleteAllEntries());
    9797}
    9898

  • trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp

    r82856 r82873  
    7474
    7575    RefPtr<ArrayCallback> callback = prpCallback;
    76     m_webContext->relaunchProcessIfNecessary();
    77    
    7876    uint64_t callbackID = callback->callbackID();
    7977    m_arrayCallbacks.set(callbackID, callback.release());
    80     m_webContext->process()->send(Messages::WebCookieManager::GetHostnamesWithCookies(callbackID), 0);
     78
     79    // FIXME (Multi-WebProcess): Cookies shouldn't be stored in the web process.
     80    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebCookieManager::GetHostnamesWithCookies(callbackID));
    8181}
    8282   
    … …  
    142142
    143143    RefPtr<HTTPCookieAcceptPolicyCallback> callback = prpCallback;
    144     m_webContext->relaunchProcessIfNecessary();
    145144
    146145    uint64_t callbackID = callback->callbackID();
    147146    m_httpCookieAcceptPolicyCallbacks.set(callbackID, callback.release());
    148     m_webContext->process()->send(Messages::WebCookieManager::GetHTTPCookieAcceptPolicy(callbackID), 0);
     147
     148    // FIXME (Multi-WebProcess): Cookies shouldn't be stored in the web process.
     149    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebCookieManager::GetHTTPCookieAcceptPolicy(callbackID));
    149150}
    150151

  • trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp

    r82458 r82873  
    117117{
    118118    RefPtr<ArrayCallback> callback = prpCallback;
    119     m_webContext->relaunchProcessIfNecessary();
    120119    uint64_t callbackID = callback->callbackID();
    121120    m_arrayCallbacks.set(callbackID, callback.release());
    122     m_webContext->process()->send(Messages::WebDatabaseManager::GetDatabasesByOrigin(callbackID), 0);
    123 }
    124 
     121
     122    // FIXME (Multi-WebProcess): Databases shouldn't be stored in the web process.
     123    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebDatabaseManager::GetDatabasesByOrigin(callbackID));
     124}
    125125
    126126void WebDatabaseManagerProxy::didGetDatabasesByOrigin(const Vector<OriginAndDatabases>& originAndDatabasesVector, uint64_t callbackID)
    … …  
    170170{
    171171    RefPtr<ArrayCallback> callback = prpCallback;
    172     m_webContext->relaunchProcessIfNecessary();
    173172    uint64_t callbackID = callback->callbackID();
    174173    m_arrayCallbacks.set(callbackID, callback.release());
    175     m_webContext->process()->send(Messages::WebDatabaseManager::GetDatabaseOrigins(callbackID), 0);
     174
     175    // FIXME (Multi-WebProcess): Databases shouldn't be stored in the web process.
     176    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebDatabaseManager::GetDatabaseOrigins(callbackID));
    176177}
    177178
    … …  
    195196void WebDatabaseManagerProxy::deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, WebSecurityOrigin* origin)
    196197{
    197     m_webContext->relaunchProcessIfNecessary();
    198     m_webContext->process()->send(Messages::WebDatabaseManager::DeleteDatabaseWithNameForOrigin(databaseIdentifier, origin->databaseIdentifier()), 0);
     198    // FIXME (Multi-WebProcess): Databases shouldn't be stored in the web process.
     199    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebDatabaseManager::DeleteDatabaseWithNameForOrigin(databaseIdentifier, origin->databaseIdentifier()));
    199200}
    200201
    201202void WebDatabaseManagerProxy::deleteDatabasesForOrigin(WebSecurityOrigin* origin)
    202203{
    203     m_webContext->relaunchProcessIfNecessary();
    204     m_webContext->process()->send(Messages::WebDatabaseManager::DeleteDatabasesForOrigin(origin->databaseIdentifier()), 0);
     204    // FIXME (Multi-WebProcess): Databases shouldn't be stored in the web process.
     205    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebDatabaseManager::DeleteDatabasesForOrigin(origin->databaseIdentifier()));
    205206}
    206207
    207208void WebDatabaseManagerProxy::deleteAllDatabases()
    208209{
    209     m_webContext->relaunchProcessIfNecessary();
    210     m_webContext->process()->send(Messages::WebDatabaseManager::DeleteAllDatabases(), 0);
     210    // FIXME (Multi-WebProcess): Databases shouldn't be stored in the web process.
     211    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebDatabaseManager::DeleteAllDatabases());
    211212}
    212213
    213214void WebDatabaseManagerProxy::setQuotaForOrigin(WebSecurityOrigin* origin, uint64_t quota)
    214215{
    215     m_webContext->relaunchProcessIfNecessary();
    216     m_webContext->process()->send(Messages::WebDatabaseManager::SetQuotaForOrigin(origin->databaseIdentifier(), quota), 0);
     216    // FIXME (Multi-WebProcess): Databases shouldn't be stored in the web process.
     217    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebDatabaseManager::SetQuotaForOrigin(origin->databaseIdentifier(), quota));
    217218}
    218219

  • trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp

    r76916 r82873  
    6262        return;
    6363
    64     // FIXME: Should this check for a valid process?
    65     m_context->process()->send(Messages::WebGeolocationManager::DidChangePosition(position->data()), 0);
     64    m_context->sendToAllProcesses(Messages::WebGeolocationManager::DidChangePosition(position->data()));
    6665}
    6766
    … …  
    7170        return;
    7271
    73     // FIXME: Should this check for a valid process?
    74     m_context->process()->send(Messages::WebGeolocationManager::DidFailToDeterminePosition(), 0);
     72    m_context->sendToAllProcesses(Messages::WebGeolocationManager::DidFailToDeterminePosition());
    7573}
    7674

  • trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp

    r82839 r82873  
    156156
    157157    if (!m_iconDatabaseImpl || !m_iconDatabaseImpl->isOpen() || iconURL.isEmpty()) {
    158         m_webContext->process()->send(Messages::WebIconDatabaseProxy::ReceivedIconLoadDecision(static_cast<int>(IconLoadNo), callbackID), 0);
     158        // FIXME (Multi-WebProcess): We need to know which connection to send this message to.
     159        m_webContext->sendToAllProcesses(Messages::WebIconDatabaseProxy::ReceivedIconLoadDecision(static_cast<int>(IconLoadNo), callbackID));
    159160        return;
    160161    }
    … …  
    169170        return;   
    170171    }
    171    
    172     m_webContext->process()->send(Messages::WebIconDatabaseProxy::ReceivedIconLoadDecision((int)decision, callbackID), 0);
     172
     173    // FIXME (Multi-WebProcess): We need to know which connection to send this message to.
     174    m_webContext->sendToAllProcesses(Messages::WebIconDatabaseProxy::ReceivedIconLoadDecision((int)decision, callbackID));
    173175}
    174176
    … …  
    244246        ASSERT(decision != IconLoadUnknown);
    245247
    246         m_webContext->process()->send(Messages::WebIconDatabaseProxy::ReceivedIconLoadDecision(static_cast<int>(decision), i->first), 0);
     248        // FIXME (Multi-WebProcess): We need to know which connection to send this message to.
     249        m_webContext->sendToAllProcesses(Messages::WebIconDatabaseProxy::ReceivedIconLoadDecision(static_cast<int>(decision), i->first));
    247250    }
    248251   

  • trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.cpp

    r82458 r82873  
    6666{
    6767    RefPtr<ArrayCallback> callback = prpCallback;
    68     m_webContext->relaunchProcessIfNecessary();
    69    
    7068    uint64_t callbackID = callback->callbackID();
    7169    m_arrayCallbacks.set(callbackID, callback.release());
    72     m_webContext->process()->send(Messages::WebKeyValueStorageManager::GetKeyValueStorageOrigins(callbackID), 0);
     70
     71    // FIXME (Multi-WebProcess): Should key-value storage be handled in the web process?
     72    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebKeyValueStorageManager::GetKeyValueStorageOrigins(callbackID));
    7373}
    7474   
    … …  
    8181void WebKeyValueStorageManagerProxy::deleteEntriesForOrigin(WebSecurityOrigin* origin)
    8282{
    83     m_webContext->relaunchProcessIfNecessary();
    84    
    8583    SecurityOriginData securityOriginData;
    8684    securityOriginData.protocol = origin->protocol();
    … …  
    8886    securityOriginData.port = origin->port();
    8987
    90     m_webContext->process()->send(Messages::WebKeyValueStorageManager::DeleteEntriesForOrigin(securityOriginData), 0);
     88    // FIXME (Multi-WebProcess): Should key-value storage be handled in the web process?
     89    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebKeyValueStorageManager::DeleteEntriesForOrigin(securityOriginData));
    9190}
    9291
    9392void WebKeyValueStorageManagerProxy::deleteAllEntries()
    9493{
    95     m_webContext->relaunchProcessIfNecessary();
    96     m_webContext->process()->send(Messages::WebKeyValueStorageManager::DeleteAllEntries(), 0);
     94    // FIXME (Multi-WebProcess): Should key-value storage be handled in the web process?
     95    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebKeyValueStorageManager::DeleteAllEntries());
    9796}
    9897

  • trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp

    r82458 r82873  
    6565{
    6666    RefPtr<ArrayCallback> callback = prpCallback;
    67     m_webContext->relaunchProcessIfNecessary();
    68    
    6967    uint64_t callbackID = callback->callbackID();
    7068    m_arrayCallbacks.set(callbackID, callback.release());
    71     m_webContext->process()->send(Messages::WebMediaCacheManager::GetHostnamesWithMediaCache(callbackID), 0);
     69
     70    // FIXME (Multi-WebProcess): When we're sending this to multiple processes, we need to aggregate the
     71    // callback data when it comes back.
     72    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebMediaCacheManager::GetHostnamesWithMediaCache(callbackID));
    7273}
    7374   
    … …  
    9192void WebMediaCacheManagerProxy::clearCacheForHostname(const String& hostname)
    9293{
    93     m_webContext->relaunchProcessIfNecessary();
    94     m_webContext->process()->send(Messages::WebMediaCacheManager::ClearCacheForHostname(hostname), 0);
     94    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebMediaCacheManager::ClearCacheForHostname(hostname));
    9595}
    9696
    9797void WebMediaCacheManagerProxy::clearCacheForAllHostnames()
    9898{
    99     m_webContext->relaunchProcessIfNecessary();
    100     m_webContext->process()->send(Messages::WebMediaCacheManager::ClearCacheForAllHostnames(), 0);
     99    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebMediaCacheManager::ClearCacheForAllHostnames());
    101100}
    102101

  • trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp

    r82458 r82873  
    6868    uint64_t callbackID = callback->callbackID();
    6969    m_arrayCallbacks.set(callbackID, callback.release());
    70     m_webContext->process()->send(Messages::WebResourceCacheManager::GetCacheOrigins(callbackID), 0);
     70
     71    // FIXME (Multi-WebProcess): When multi-process is enabled, we need to aggregate the callback data from all processes.
     72    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebResourceCacheManager::GetCacheOrigins(callbackID));
    7173}
    7274
    … …  
    7981void WebResourceCacheManagerProxy::clearCacheForOrigin(WebSecurityOrigin* origin)
    8082{
    81     m_webContext->relaunchProcessIfNecessary();
    82 
    8383    SecurityOriginData securityOrigin;
    8484    securityOrigin.protocol = origin->protocol();
    8585    securityOrigin.host = origin->host();
    8686    securityOrigin.port = origin->port();
    87     m_webContext->process()->send(Messages::WebResourceCacheManager::ClearCacheForOrigin(securityOrigin), 0);
     87
     88    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebResourceCacheManager::ClearCacheForOrigin(securityOrigin));
    8889}
    8990
    9091void WebResourceCacheManagerProxy::clearCacheForAllOrigins()
    9192{
    92     m_webContext->relaunchProcessIfNecessary();
    93     m_webContext->process()->send(Messages::WebResourceCacheManager::ClearCacheForAllOrigins(), 0);
     93    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebResourceCacheManager::ClearCacheForAllOrigins());
    9494}
    9595
Note: See TracChangeset for help on using the changeset viewer.