Changeset 223149 in webkit


Ignore:
Timestamp:
Oct 10, 2017 3:13:07 PM (7 years ago)
Author:
commit-queue@webkit.org
Message:

Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
​https://bugs.webkit.org/show_bug.cgi?id=178102

Patch by Sam Weinig <​sam@webkit.org> on 2017-10-10
Reviewed by Tim Horton.

Source/JavaScriptCore:

  • inspector/agents/InspectorDebuggerAgent.cpp:

(Inspector::InspectorDebuggerAgent::clearInspectorBreakpointState):

Source/WebCore:

  • Modules/geolocation/Geolocation.cpp:

(WebCore::Geolocation::Watchers::getNotifiersVector const):

  • Modules/indexeddb/IDBTransaction.cpp:

(WebCore::IDBTransaction::connectionClosedFromServer):

  • Modules/indexeddb/client/IDBConnectionProxy.cpp:

(WebCore::IDBClient::IDBConnectionProxy::connectionToServerLost):

  • Modules/indexeddb/server/UniqueIDBDatabase.cpp:

(WebCore::IDBServer::UniqueIDBDatabase::immediateCloseForUserDelete):

  • Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::getTracks const):

  • bindings/js/ScriptController.cpp:

(WebCore::ScriptController::windowProxies):

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::item const):

  • dom/Document.cpp:

(WebCore::Document::prepareForDestruction):

  • dom/DocumentMarkerController.cpp:

(WebCore::DocumentMarkerController::removeMarkers):

  • inspector/InspectorWorkerAgent.cpp:

(WebCore::InspectorWorkerAgent::disconnectFromAllWorkerInspectorProxies):

  • inspector/NetworkResourcesData.cpp:
  • loader/DocumentLoader.cpp:

(WebCore::cancelAll):
(WebCore::setAllDefersLoading):
(WebCore::areAllLoadersPageCacheAcceptable):

  • loader/cache/MemoryCache.cpp:

(WebCore::MemoryCache::forEachSessionResource):

  • loader/mac/DocumentLoaderMac.cpp:

(WebCore::scheduleAll):
(WebCore::unscheduleAll):

  • page/ResourceUsageThread.cpp:

(WebCore::ResourceUsageThread::notifyObservers):

  • platform/mediastream/MediaStreamPrivate.cpp:

(WebCore::MediaStreamPrivate::tracks const):

Replace copyKeysToVector / copyValuesToVector with copyToVector(map.keys()) / copyToVector(map.values())

Source/WebDriver:

  • SessionHost.cpp:

(WebDriver::SessionHost::inspectorDisconnected):

Source/WebKit:

  • NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::NetworkConnectionToWebProcess::didClose):

  • Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm:

(WebKit::dumpChangedLayers):

  • UIProcess/API/glib/WebKitWebContext.cpp:

(webkitWebContextInvalidateCustomProtocolRequests):

  • UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseContainerForall):

  • UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:

(-[WKWebViewContentProviderRegistry _mimeTypesWithCustomContentProviders]):

  • UIProcess/GenericCallback.h:

(WebKit::invalidateCallbackMap):

  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::shutDown):
(WebKit::WebProcessProxy::didClose):
(WebKit::WebProcessProxy::didBecomeUnresponsive):
(WebKit::WebProcessProxy::didBecomeResponsive):
(WebKit::WebProcessProxy::willChangeIsResponsive):
(WebKit::WebProcessProxy::didChangeIsResponsive):
(WebKit::WebProcessProxy::disconnectFramesFromPage):
(WebKit::WebProcessProxy::frameCountInPage const):
(WebKit::WebProcessProxy::requestTermination):

  • WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:

(WebKit::NPRuntimeObjectMap::invalidate):

  • WebProcess/Plugins/Netscape/NetscapePlugin.cpp:

(WebKit::NetscapePlugin::stopAllStreams):

  • WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::cancelAllStreams):

  • WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeContext.mm:

(WebKit::RemoteLayerTreeContext::buildTransaction):

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::didClose):

Source/WebKitLegacy:

  • WebCoreSupport/WebResourceLoadScheduler.cpp:

(WebResourceLoadScheduler::servePendingRequests):

Source/WebKitLegacy/mac:

  • History/WebHistory.mm:

(-[WebHistoryPrivate rebuildHistoryByDayIfNeeded:]):

  • Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::stopAllStreams):

  • WebCoreSupport/WebUserMediaClient.mm:

(WebUserMediaClient::pageDestroyed):

Source/WTF:

  • wtf/HashMap.h:

(WTF::copyKeysToVector): Deleted.
(WTF::copyValuesToVector): Deleted.

Remove copyKeysToVector and copyValuesToVector which are no longer used.

Location:
trunk/Source
Files:
42 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r223142 r223149  
     12017-10-10  Sam Weinig  <sam@webkit.org>
     2
     3        Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
     4        https://bugs.webkit.org/show_bug.cgi?id=178102
     5
     6        Reviewed by Tim Horton.
     7
     8        * inspector/agents/InspectorDebuggerAgent.cpp:
     9        (Inspector::InspectorDebuggerAgent::clearInspectorBreakpointState):
     10
    1112017-10-10  Michael Saboff  <msaboff@apple.com>
    212

  • trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp

    r220036 r223149  
    10721072{
    10731073    ErrorString dummyError;
    1074     Vector<String> breakpointIdentifiers;
    1075     copyKeysToVector(m_breakpointIdentifierToDebugServerBreakpointIDs, breakpointIdentifiers);
    1076     for (const String& identifier : breakpointIdentifiers)
     1074    for (const String& identifier : copyToVector(m_breakpointIdentifierToDebugServerBreakpointIDs.keys()))
    10771075        removeBreakpoint(dummyError, identifier);
    10781076

  • trunk/Source/WTF/ChangeLog

    r223122 r223149  
     12017-10-10  Sam Weinig  <sam@webkit.org>
     2
     3        Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
     4        https://bugs.webkit.org/show_bug.cgi?id=178102
     5
     6        Reviewed by Tim Horton.
     7
     8        * wtf/HashMap.h:
     9        (WTF::copyKeysToVector): Deleted.
     10        (WTF::copyValuesToVector): Deleted.
     11       
     12            Remove copyKeysToVector and copyValuesToVector which are no longer used.
     13
    1142017-10-09  Youenn Fablet  <youenn@apple.com>
    215

  • trunk/Source/WTF/wtf/HashMap.h

    r223061 r223149  
    590590}
    591591
    592 template<typename T, typename U, typename V, typename W, typename X, typename Y>
    593 inline void copyKeysToVector(const HashMap<T, U, V, W, X>& collection, Y& vector)
    594 {
    595     typedef typename HashMap<T, U, V, W, X>::const_iterator::Keys iterator;
    596    
    597     vector.resize(collection.size());
    598    
    599     iterator it = collection.begin().keys();
    600     iterator end = collection.end().keys();
    601     for (unsigned i = 0; it != end; ++it, ++i)
    602         vector[i] = *it;
    603 } 
    604 
    605 template<typename T, typename U, typename V, typename W, typename X, typename Y>
    606 inline void copyValuesToVector(const HashMap<T, U, V, W, X>& collection, Y& vector)
    607 {
    608     typedef typename HashMap<T, U, V, W, X>::const_iterator::Values iterator;
    609    
    610     vector.resize(collection.size());
    611    
    612     iterator it = collection.begin().values();
    613     iterator end = collection.end().values();
    614     for (unsigned i = 0; it != end; ++it, ++i)
    615         vector[i] = *it;
    616 }   
    617 
    618592} // namespace WTF
    619593

  • trunk/Source/WebCore/ChangeLog

    r223148 r223149  
     12017-10-10  Sam Weinig  <sam@webkit.org>
     2
     3        Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
     4        https://bugs.webkit.org/show_bug.cgi?id=178102
     5
     6        Reviewed by Tim Horton.
     7
     8        * Modules/geolocation/Geolocation.cpp:
     9        (WebCore::Geolocation::Watchers::getNotifiersVector const):
     10        * Modules/indexeddb/IDBTransaction.cpp:
     11        (WebCore::IDBTransaction::connectionClosedFromServer):
     12        * Modules/indexeddb/client/IDBConnectionProxy.cpp:
     13        (WebCore::IDBClient::IDBConnectionProxy::connectionToServerLost):
     14        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
     15        (WebCore::IDBServer::UniqueIDBDatabase::immediateCloseForUserDelete):
     16        * Modules/mediastream/MediaStream.cpp:
     17        (WebCore::MediaStream::getTracks const):
     18        * bindings/js/ScriptController.cpp:
     19        (WebCore::ScriptController::windowProxies):
     20        * css/CSSComputedStyleDeclaration.cpp:
     21        (WebCore::CSSComputedStyleDeclaration::item const):
     22        * dom/Document.cpp:
     23        (WebCore::Document::prepareForDestruction):
     24        * dom/DocumentMarkerController.cpp:
     25        (WebCore::DocumentMarkerController::removeMarkers):
     26        * inspector/InspectorWorkerAgent.cpp:
     27        (WebCore::InspectorWorkerAgent::disconnectFromAllWorkerInspectorProxies):
     28        * inspector/NetworkResourcesData.cpp:
     29        * loader/DocumentLoader.cpp:
     30        (WebCore::cancelAll):
     31        (WebCore::setAllDefersLoading):
     32        (WebCore::areAllLoadersPageCacheAcceptable):
     33        * loader/cache/MemoryCache.cpp:
     34        (WebCore::MemoryCache::forEachSessionResource):
     35        * loader/mac/DocumentLoaderMac.cpp:
     36        (WebCore::scheduleAll):
     37        (WebCore::unscheduleAll):
     38        * page/ResourceUsageThread.cpp:
     39        (WebCore::ResourceUsageThread::notifyObservers):
     40        * platform/mediastream/MediaStreamPrivate.cpp:
     41        (WebCore::MediaStreamPrivate::tracks const):
     42
     43            Replace copyKeysToVector / copyValuesToVector with copyToVector(map.keys()) / copyToVector(map.values())
     44
    1452017-10-10  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
    246

  • trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp

    r222374 r223149  
    128128void Geolocation::Watchers::getNotifiersVector(GeoNotifierVector& copy) const
    129129{
    130     copyValuesToVector(m_idToNotifierMap, copy);
     130    copy = copyToVector(m_idToNotifierMap.values());
    131131}
    132132

  • trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp

    r222250 r223149  
    13691369    abortInProgressOperations(error);
    13701370
    1371     Vector<RefPtr<IDBClient::TransactionOperation>> operations;
    1372     copyValuesToVector(m_transactionOperationMap, operations);
    1373 
     1371    auto operations = copyToVector(m_transactionOperationMap.values());
    13741372    for (auto& operation : operations) {
    13751373        m_currentlyCompletingRequest = nullptr;

  • trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp

    r218048 r223149  
    423423    {
    424424        Locker<Lock> locker(m_databaseConnectionMapLock);
    425         copyKeysToVector(m_databaseConnectionMap, databaseConnectionIdentifiers);
     425        databaseConnectionIdentifiers = copyToVector(m_databaseConnectionMap.keys());
    426426    }
    427427
    … …  
    442442    {
    443443        Locker<Lock> locker(m_openDBRequestMapLock);
    444         copyKeysToVector(m_openDBRequestMap, openDBRequestIdentifiers);
     444        openDBRequestIdentifiers = copyToVector(m_openDBRequestMap.keys());
    445445    }
    446446

  • trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp

    r219901 r223149  
    18141814
    18151815    // Error out all transactions
    1816     Vector<IDBResourceIdentifier> inProgressIdentifiers;
    1817     copyKeysToVector(m_inProgressTransactions, inProgressIdentifiers);
    1818     for (auto& identifier : inProgressIdentifiers)
     1816    for (auto& identifier : copyToVector(m_inProgressTransactions.keys()))
    18191817        m_inProgressTransactions.get(identifier)->abortWithoutCallback();
    18201818
    … …  
    18261824
    18271825    // Error out all pending callbacks
    1828     Vector<uint64_t> callbackIdentifiers;
    18291826    IDBError error = IDBError::userDeleteError();
    18301827    IDBKeyData keyData;
    18311828    IDBGetResult getResult;
    18321829
    1833     copyKeysToVector(m_errorCallbacks, callbackIdentifiers);
    1834     for (auto identifier : callbackIdentifiers)
     1830    for (auto identifier : copyToVector(m_errorCallbacks.keys()))
    18351831        performErrorCallback(identifier, error);
    18361832
    1837     callbackIdentifiers.clear();
    1838     copyKeysToVector(m_keyDataCallbacks, callbackIdentifiers);
    1839     for (auto identifier : callbackIdentifiers)
     1833    for (auto identifier : copyToVector(m_keyDataCallbacks.keys()))
    18401834        performKeyDataCallback(identifier, error, keyData);
    18411835
    1842     callbackIdentifiers.clear();
    1843     copyKeysToVector(m_getResultCallbacks, callbackIdentifiers);
    1844     for (auto identifier : callbackIdentifiers)
     1836    for (auto identifier : copyToVector(m_getResultCallbacks.keys()))
    18451837        performGetResultCallback(identifier, error, getResult);
    18461838
    1847     callbackIdentifiers.clear();
    1848     copyKeysToVector(m_countCallbacks, callbackIdentifiers);
    1849     for (auto identifier : callbackIdentifiers)
     1839    for (auto identifier : copyToVector(m_countCallbacks.keys()))
    18501840        performCountCallback(identifier, error, 0);
    18511841
    … …  
    18621852
    18631853    // Close all open connections
    1864     ListHashSet<RefPtr<UniqueIDBDatabaseConnection>> openDatabaseConnections = m_openDatabaseConnections;
     1854    auto openDatabaseConnections = m_openDatabaseConnections;
    18651855    for (auto& connection : openDatabaseConnections)
    18661856        connectionClosedFromServer(*connection);

  • trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

    r221277 r223149  
    178178MediaStreamTrackVector MediaStream::getTracks() const
    179179{
    180     MediaStreamTrackVector tracks;
    181     tracks.reserveCapacity(m_trackSet.size());
    182     copyValuesToVector(m_trackSet, tracks);
    183 
    184     return tracks;
     180    return copyToVector(m_trackSet.values());
    185181}
    186182

  • trunk/Source/WebCore/bindings/js/ScriptController.cpp

    r219051 r223149  
    282282Vector<JSC::Strong<JSDOMWindowProxy>> ScriptController::windowProxies()
    283283{
    284     Vector<JSC::Strong<JSDOMWindowProxy>> windowProxies;
    285     copyValuesToVector(m_windowProxies, windowProxies);
    286     return windowProxies;
     284    return copyToVector(m_windowProxies.values());
    287285}
    288286

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r222259 r223149  
    40964096    if (index >= customProperties.size())
    40974097        return String();
    4098    
    4099     Vector<String, 4> results;
    4100     copyKeysToVector(customProperties, results);
     4098
     4099    auto results = copyToVector(customProperties.keys());
    41014100    return results.at(index);
    41024101}

  • trunk/Source/WebCore/dom/Document.cpp

    r223028 r223149  
    23392339#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    23402340    if (!m_clientToIDMap.isEmpty() && page()) {
    2341         Vector<WebCore::MediaPlaybackTargetClient*> clients;
    2342         copyKeysToVector(m_clientToIDMap, clients);
    2343         for (auto* client : clients)
     2341        for (auto* client : copyToVector(m_clientToIDMap.keys()))
    23442342            removePlaybackTargetPickerClient(*client);
    23452343    }

  • trunk/Source/WebCore/dom/DocumentMarkerController.cpp

    r222993 r223149  
    573573    ASSERT(!m_markers.isEmpty());
    574574   
    575     MarkerMap::iterator iterator = m_markers.find(node);
     575    auto iterator = m_markers.find(node);
    576576    if (iterator != m_markers.end())
    577577        removeMarkersFromList(iterator, markerTypes);
    … …  
    584584    ASSERT(!m_markers.isEmpty());
    585585
    586     Vector<RefPtr<Node>> nodesWithMarkers;
    587     copyKeysToVector(m_markers, nodesWithMarkers);
    588     for (auto& node : nodesWithMarkers) {
     586    for (auto& node : copyToVector(m_markers.keys())) {
    589587        auto iterator = m_markers.find(node);
    590588        if (iterator != m_markers.end())

  • trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp

    r208010 r223149  
    146146void InspectorWorkerAgent::disconnectFromAllWorkerInspectorProxies()
    147147{
    148     Vector<WorkerInspectorProxy*> proxies;
    149     copyValuesToVector(m_connectedProxies, proxies);
    150     for (auto* proxy : proxies)
     148    for (auto* proxy : copyToVector(m_connectedProxies.values()))
    151149        proxy->disconnectFromWorkerInspectorController();
    152150

  • trunk/Source/WebCore/inspector/NetworkResourcesData.cpp

    r210828 r223149  
    263263Vector<NetworkResourcesData::ResourceData*> NetworkResourcesData::resources()
    264264{
    265     Vector<NetworkResourcesData::ResourceData*> resources;
    266     copyValuesToVector(m_requestIdToResourceDataMap, resources);
    267     return resources;
     265    return copyToVector(m_requestIdToResourceDataMap.values());
    268266}
    269267

  • trunk/Source/WebCore/loader/DocumentLoader.cpp

    r222492 r223149  
    101101static void cancelAll(const ResourceLoaderMap& loaders)
    102102{
    103     Vector<RefPtr<ResourceLoader>> loadersCopy;
    104     copyValuesToVector(loaders, loadersCopy);
    105     for (auto& loader : loadersCopy)
     103    for (auto& loader : copyToVector(loaders.values()))
    106104        loader->cancel();
    107105}
    … …  
    109107static void setAllDefersLoading(const ResourceLoaderMap& loaders, bool defers)
    110108{
    111     Vector<RefPtr<ResourceLoader>> loadersCopy;
    112     copyValuesToVector(loaders, loadersCopy);
    113     for (auto& loader : loadersCopy)
     109    for (auto& loader : copyToVector(loaders.values()))
    114110        loader->setDefersLoading(defers);
    115111}
    … …  
    117113static bool areAllLoadersPageCacheAcceptable(const ResourceLoaderMap& loaders)
    118114{
    119     Vector<RefPtr<ResourceLoader>> loadersCopy;
    120     copyValuesToVector(loaders, loadersCopy);
    121     for (auto& loader : loadersCopy) {
     115    for (auto& loader : copyToVector(loaders.values())) {
    122116        if (!loader->frameLoader() || !loader->frameLoader()->frame().page())
    123117            return false;

  • trunk/Source/WebCore/loader/cache/MemoryCache.cpp

    r220857 r223149  
    279279        return;
    280280
    281     Vector<CachedResourceHandle<CachedResource>> resourcesForSession;
    282     copyValuesToVector(*it->value, resourcesForSession);
    283 
    284     for (auto& resource : resourcesForSession)
     281    for (auto& resource : copyToVector(it->value->values()))
    285282        function(*resource);
    286283}

  • trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp

    r207585 r223149  
    3838static void scheduleAll(const ResourceLoaderMap& loaders, SchedulePair& pair)
    3939{
    40     Vector<RefPtr<ResourceLoader>> loadersCopy;
    41     copyValuesToVector(loaders, loadersCopy);
    42     for (auto& loader : loadersCopy)
     40    for (auto& loader : copyToVector(loaders.values()))
    4341        loader->schedule(pair);
    4442}
    … …  
    4644static void unscheduleAll(const ResourceLoaderMap& loaders, SchedulePair& pair)
    4745{
    48     Vector<RefPtr<ResourceLoader>> loadersCopy;
    49     copyValuesToVector(loaders, loadersCopy);
    50     for (auto& loader : loadersCopy)
     46    for (auto& loader : copyToVector(loaders.values()))
    5147        loader->unschedule(pair);
    5248}

  • trunk/Source/WebCore/page/ResourceUsageThread.cpp

    r218816 r223149  
    8787            auto& resourceUsageThread = ResourceUsageThread::singleton();
    8888            LockHolder locker(resourceUsageThread.m_lock);
    89             copyValuesToVector(resourceUsageThread.m_observers, functions);
     89            functions = copyToVector(resourceUsageThread.m_observers.values());
    9090        }
    9191

  • trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp

    r222422 r223149  
    9292MediaStreamTrackPrivateVector MediaStreamPrivate::tracks() const
    9393{
    94     MediaStreamTrackPrivateVector tracks;
    95     tracks.reserveCapacity(m_trackSet.size());
    96     copyValuesToVector(m_trackSet, tracks);
    97 
    98     return tracks;
     94    return copyToVector(m_trackSet.values());
    9995}
    10096

  • trunk/Source/WebDriver/ChangeLog

    r222703 r223149  
     12017-10-10  Sam Weinig  <sam@webkit.org>
     2
     3        Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
     4        https://bugs.webkit.org/show_bug.cgi?id=178102
     5
     6        Reviewed by Tim Horton.
     7
     8        * SessionHost.cpp:
     9        (WebDriver::SessionHost::inspectorDisconnected):
     10
    1112017-10-02  Carlos Garcia Campos  <cgarcia@igalia.com>
    212

  • trunk/Source/WebDriver/SessionHost.cpp

    r220794 r223149  
    3737{
    3838    // Browser closed or crashed, finish all pending commands with error.
    39     Vector<long> messages;
    40     copyKeysToVector(m_commandRequests, messages);
    41     for (auto messageID : messages) {
     39    for (auto messageID : copyToVector(m_commandRequests.keys())) {
    4240        auto responseHandler = m_commandRequests.take(messageID);
    4341        responseHandler({ nullptr, true });

  • trunk/Source/WebKit/ChangeLog

    r223146 r223149  
     12017-10-10  Sam Weinig  <sam@webkit.org>
     2
     3        Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
     4        https://bugs.webkit.org/show_bug.cgi?id=178102
     5
     6        Reviewed by Tim Horton.
     7
     8        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
     9        (WebKit::NetworkConnectionToWebProcess::didClose):
     10        * Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm:
     11        (WebKit::dumpChangedLayers):
     12        * UIProcess/API/glib/WebKitWebContext.cpp:
     13        (webkitWebContextInvalidateCustomProtocolRequests):
     14        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
     15        (webkitWebViewBaseContainerForall):
     16        * UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
     17        (-[WKWebViewContentProviderRegistry _mimeTypesWithCustomContentProviders]):
     18        * UIProcess/GenericCallback.h:
     19        (WebKit::invalidateCallbackMap):
     20        * UIProcess/WebProcessProxy.cpp:
     21        (WebKit::WebProcessProxy::shutDown):
     22        (WebKit::WebProcessProxy::didClose):
     23        (WebKit::WebProcessProxy::didBecomeUnresponsive):
     24        (WebKit::WebProcessProxy::didBecomeResponsive):
     25        (WebKit::WebProcessProxy::willChangeIsResponsive):
     26        (WebKit::WebProcessProxy::didChangeIsResponsive):
     27        (WebKit::WebProcessProxy::disconnectFramesFromPage):
     28        (WebKit::WebProcessProxy::frameCountInPage const):
     29        (WebKit::WebProcessProxy::requestTermination):
     30        * WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
     31        (WebKit::NPRuntimeObjectMap::invalidate):
     32        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
     33        (WebKit::NetscapePlugin::stopAllStreams):
     34        * WebProcess/Plugins/PluginView.cpp:
     35        (WebKit::PluginView::cancelAllStreams):
     36        * WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeContext.mm:
     37        (WebKit::RemoteLayerTreeContext::buildTransaction):
     38        * WebProcess/WebProcess.cpp:
     39        (WebKit::WebProcess::didClose):
     40
    1412017-10-10  Adrian Perez de Castro  <aperez@igalia.com>
    242

  • trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp

    r222938 r223149  
    169169    Ref<NetworkConnectionToWebProcess> protector(*this);
    170170
    171     Vector<RefPtr<NetworkResourceLoader>> loaders;
    172     copyValuesToVector(m_networkResourceLoaders, loaders);
    173     for (auto& loader : loaders)
     171    for (auto& loader : copyToVector(m_networkResourceLoaders.values()))
    174172        loader->abort();
    175173    ASSERT(m_networkResourceLoaders.isEmpty());

  • trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm

    r222233 r223149  
    745745
    746746    // Dump the layer properties sorted by layer ID.
    747     Vector<GraphicsLayer::PlatformLayerID> layerIDs;
    748     copyKeysToVector(changedLayerProperties, layerIDs);
     747    auto layerIDs = copyToVector(changedLayerProperties.keys());
    749748    std::sort(layerIDs.begin(), layerIDs.end());
    750749

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp

    r222967 r223149  
    16191619void webkitWebContextInvalidateCustomProtocolRequests(WebKitWebContext* context, LegacyCustomProtocolManagerProxy& manager)
    16201620{
    1621     Vector<GRefPtr<WebKitURISchemeRequest>> requests;
    1622     copyValuesToVector(context->priv->uriSchemeRequests, requests);
    1623     for (auto& request : requests) {
     1621    for (auto& request : copyToVector(context->priv->uriSchemeRequests.values())) {
    16241622        if (webkitURISchemeRequestGetManager(request.get()) == &manager)
    16251623            webkitURISchemeRequestInvalidate(request.get());

  • trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp

    r222855 r223149  
    476476    WebKitWebViewBasePrivate* priv = webView->priv;
    477477
    478     Vector<GtkWidget*> children;
    479     copyKeysToVector(priv->children, children);
    480     for (const auto& child : children) {
     478    for (const auto& child : copyToVector(priv->children.keys())) {
    481479        if (priv->children.contains(child))
    482480            (*callback)(child, callbackData);

  • trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm

    r195928 r223149  
    9090- (Vector<String>)_mimeTypesWithCustomContentProviders
    9191{
    92     Vector<String> mimeTypes;
    93     copyKeysToVector(_contentProviderForMIMEType, mimeTypes);
    94     return mimeTypes;
     92    return copyToVector(_contentProviderForMIMEType.keys());
    9593}
    9694

  • trunk/Source/WebKit/UIProcess/GenericCallback.h

    r218985 r223149  
    164164void invalidateCallbackMap(HashMap<uint64_t, T>& callbackMap, CallbackBase::Error error)
    165165{
    166     Vector<T> callbacks;
    167     copyValuesToVector(callbackMap, callbacks);
    168     for (auto& callback : callbacks)
     166    for (auto& callback : copyToVector(callbackMap.values()))
    169167        callback->invalidate(error);
    170168

  • trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

    r222824 r223149  
    182182    m_tokenForHoldingLockedFiles = nullptr;
    183183
    184     Vector<RefPtr<WebFrameProxy>> frames;
    185     copyValuesToVector(m_frameMap, frames);
    186 
    187     for (size_t i = 0, size = frames.size(); i < size; ++i)
    188         frames[i]->webProcessWillShutDown();
     184    for (auto& frame : copyToVector(m_frameMap.values()))
     185        frame->webProcessWillShutDown();
    189186    m_frameMap.clear();
    190187
    191     for (VisitedLinkStore* visitedLinkStore : m_visitedLinkStores)
     188    for (auto* visitedLinkStore : m_visitedLinkStores)
    192189        visitedLinkStore->removeProcess(*this);
    193190    m_visitedLinkStores.clear();
    194191
    195     for (WebUserContentControllerProxy* webUserContentControllerProxy : m_webUserContentControllerProxies)
     192    for (auto* webUserContentControllerProxy : m_webUserContentControllerProxies)
    196193        webUserContentControllerProxy->removeProcess(*this);
    197194    m_webUserContentControllerProxies.clear();
    … …  
    626623    webConnection()->didClose();
    627624
    628     Vector<RefPtr<WebPageProxy>> pages;
    629     copyValuesToVector(m_pageMap, pages);
     625    auto pages = copyToVector(m_pageMap.values());
    630626
    631627    shutDown();
    632628
    633     for (size_t i = 0, size = pages.size(); i < size; ++i)
    634         pages[i]->processDidTerminate(ProcessTerminationReason::Crash);
     629    for (auto& page : pages)
     630        page->processDidTerminate(ProcessTerminationReason::Crash);
    635631
    636632}
    … …  
    654650    m_isResponsive = NoOrMaybe::No;
    655651
    656     Vector<RefPtr<WebPageProxy>> pages;
    657     copyValuesToVector(m_pageMap, pages);
    658 
    659652    auto isResponsiveCallbacks = WTFMove(m_isResponsiveCallbacks);
    660653
    661     for (auto& page : pages)
     654    for (auto& page : copyToVector(m_pageMap.values()))
    662655        page->processDidBecomeUnresponsive();
    663656
    … …  
    671664    m_isResponsive = NoOrMaybe::Maybe;
    672665
    673     Vector<RefPtr<WebPageProxy>> pages;
    674     copyValuesToVector(m_pageMap, pages);
    675     for (auto& page : pages)
     666    for (auto& page : copyToVector(m_pageMap.values()))
    676667        page->processDidBecomeResponsive();
    677668}
    … …  
    679670void WebProcessProxy::willChangeIsResponsive()
    680671{
    681     Vector<RefPtr<WebPageProxy>> pages;
    682     copyValuesToVector(m_pageMap, pages);
    683     for (auto& page : pages)
     672    for (auto& page : copyToVector(m_pageMap.values()))
    684673        page->willChangeProcessIsResponsive();
    685674}
    … …  
    687676void WebProcessProxy::didChangeIsResponsive()
    688677{
    689     Vector<RefPtr<WebPageProxy>> pages;
    690     copyValuesToVector(m_pageMap, pages);
    691     for (auto& page : pages)
     678    for (auto& page : copyToVector(m_pageMap.values()))
    692679        page->didChangeProcessIsResponsive();
    693680}
    … …  
    749736void WebProcessProxy::disconnectFramesFromPage(WebPageProxy* page)
    750737{
    751     Vector<RefPtr<WebFrameProxy>> frames;
    752     copyValuesToVector(m_frameMap, frames);
    753     for (size_t i = 0, size = frames.size(); i < size; ++i) {
    754         if (frames[i]->page() == page)
    755             frames[i]->webProcessWillShutDown();
     738    for (auto& frame : copyToVector(m_frameMap.values())) {
     739        if (frame->page() == page)
     740            frame->webProcessWillShutDown();
    756741    }
    757742}
    … …  
    760745{
    761746    size_t result = 0;
    762     for (HashMap<uint64_t, RefPtr<WebFrameProxy>>::const_iterator iter = m_frameMap.begin(); iter != m_frameMap.end(); ++iter) {
    763         if (iter->value->page() == page)
     747    for (auto& frame : m_frameMap.values()) {
     748        if (frame->page() == page)
    764749            ++result;
    765750    }
    … …  
    889874        webConnection()->didClose();
    890875
    891     Vector<RefPtr<WebPageProxy>> pages;
    892     copyValuesToVector(m_pageMap, pages);
     876    auto pages = copyToVector(m_pageMap.values());
    893877
    894878    shutDown();
    895879
    896     for (size_t i = 0, size = pages.size(); i < size; ++i)
    897         pages[i]->processDidTerminate(reason);
     880    for (auto& page : pages)
     881        page->processDidTerminate(reason);
    898882}
    899883

  • trunk/Source/WebKit/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp

    r215160 r223149  
    201201void NPRuntimeObjectMap::invalidate()
    202202{
    203     Vector<NPJSObject*> npJSObjects;
    204     copyValuesToVector(m_npJSObjects, npJSObjects);
    205 
    206203    // Deallocate all the object wrappers so we won't leak any JavaScript objects.
    207     for (size_t i = 0; i < npJSObjects.size(); ++i)
    208         deallocateNPObject(npJSObjects[i]);
     204    for (auto& npJSObject : copyToVector(m_npJSObjects.values()))
     205        deallocateNPObject(npJSObject);
    209206   
    210207    // We shouldn't have any NPJSObjects left now.

  • trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

    r221610 r223149  
    569569void NetscapePlugin::stopAllStreams()
    570570{
    571     Vector<RefPtr<NetscapePluginStream>> streams;
    572     copyValuesToVector(m_streams, streams);
    573 
    574     for (size_t i = 0; i < streams.size(); ++i)
    575         streams[i]->stop(NPRES_USER_BREAK);
     571    for (auto& stream : copyToVector(m_streams.values()))
     572        stream->stop(NPRES_USER_BREAK);
    576573}
    577574

  • trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp

    r222392 r223149  
    12851285void PluginView::cancelAllStreams()
    12861286{
    1287     Vector<RefPtr<Stream>> streams;
    1288     copyValuesToVector(m_streams, streams);
    1289    
    1290     for (size_t i = 0; i < streams.size(); ++i)
    1291         streams[i]->cancel();
     1287    for (auto& stream : copyToVector(m_streams.values()))
     1288        stream->cancel();
    12921289
    12931290    // Cancelling a stream removes it from the m_streams map, so if we cancel all streams the map should be empty.

  • trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeContext.mm

    r221536 r223149  
    127127    m_currentTransaction = nullptr;
    128128
    129     Vector<RemoteLayerTreeTransaction::LayerCreationProperties> createdLayerProperties;
    130     copyValuesToVector(m_createdLayers, createdLayerProperties);
    131     transaction.setCreatedLayers(WTFMove(createdLayerProperties));
     129    transaction.setCreatedLayers(copyToVector(m_createdLayers.values()));
    132130    transaction.setDestroyedLayerIDs(WTFMove(m_destroyedLayers));
    133131   

  • trunk/Source/WebKit/WebProcess/WebProcess.cpp

    r222772 r223149  
    666666{
    667667#ifndef NDEBUG
    668     // Close all the live pages.
    669     Vector<RefPtr<WebPage>> pages;
    670     copyValuesToVector(m_pageMap, pages);
    671     for (auto& page : pages)
     668    for (auto& page : copyToVector(m_pageMap.values()))
    672669        page->close();
    673     pages.clear();
    674670
    675671    GCController::singleton().garbageCollectSoon();

  • trunk/Source/WebKitLegacy/ChangeLog

    r223070 r223149  
     12017-10-10  Sam Weinig  <sam@webkit.org>
     2
     3        Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
     4        https://bugs.webkit.org/show_bug.cgi?id=178102
     5
     6        Reviewed by Tim Horton.
     7
     8        * WebCoreSupport/WebResourceLoadScheduler.cpp:
     9        (WebResourceLoadScheduler::servePendingRequests):
     10
    1112017-10-09  Per Arne Vollan  <pvollan@apple.com>
    212

  • trunk/Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.cpp

    r222673 r223149  
    223223    servePendingRequests(m_nonHTTPProtocolHost, minimumPriority);
    224224
    225     Vector<HostInformation*> hostsToServe;
    226     copyValuesToVector(m_hosts, hostsToServe);
    227 
    228     for (auto* host : hostsToServe) {
     225    for (auto* host : copyToVector(m_hosts.values())) {
    229226        if (host->hasRequests())
    230227            servePendingRequests(host, minimumPriority);

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r223047 r223149  
     12017-10-10  Sam Weinig  <sam@webkit.org>
     2
     3        Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
     4        https://bugs.webkit.org/show_bug.cgi?id=178102
     5
     6        Reviewed by Tim Horton.
     7
     8        * History/WebHistory.mm:
     9        (-[WebHistoryPrivate rebuildHistoryByDayIfNeeded:]):
     10        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
     11        (WebKit::NetscapePluginInstanceProxy::stopAllStreams):
     12        * WebCoreSupport/WebUserMediaClient.mm:
     13        (WebUserMediaClient::pageDestroyed):
     14
    1152017-10-09  Robin Morisset  <rmorisset@apple.com>
    216

  • trunk/Source/WebKitLegacy/mac/History/WebHistory.mm

    r220506 r223149  
    367367    // We clear all the values to present a consistent state when sending the notifications.
    368368    // We keep a reference to the entries for rebuilding the history after the notification.
    369     Vector <RetainPtr<NSMutableArray>> entryArrays;
    370     copyValuesToVector(*_entriesByDate, entryArrays);
     369    auto entryArrays = copyToVector(_entriesByDate->values());
    371370    _entriesByDate->clear();
    372371   

  • trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm

    r222896 r223149  
    294294void NetscapePluginInstanceProxy::stopAllStreams()
    295295{
    296     Vector<RefPtr<HostedNetscapePluginStream>> streamsCopy;
    297     copyValuesToVector(m_streams, streamsCopy);
    298     for (size_t i = 0; i < streamsCopy.size(); i++)
    299         streamsCopy[i]->stop();
     296    for (auto& stream : copyToVector(m_streams.values()))
     297        stream->stop();
    300298}
    301299

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebUserMediaClient.mm

    r216816 r223149  
    110110{
    111111    auto& requestsMap = userMediaRequestsMap();
    112     Vector<RetainPtr<WebUserMediaPolicyListener>> pendingRequests;
    113     copyValuesToVector(requestsMap, pendingRequests);
     112    auto pendingRequests = copyToVector(requestsMap.values());
    114113    requestsMap.clear();
    115114
    … …  
    120119
    121120    auto& checkMap = userMediaCheckMap();
    122     Vector<RetainPtr<WebUserMediaPolicyCheckerListener>> pendingChecks;
    123     copyValuesToVector(checkMap, pendingChecks);
     121    auto pendingChecks = copyToVector(checkMap.values());
    124122    checkMap.clear();
    125123
Note: See TracChangeset for help on using the changeset viewer.