Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (223148 => 223149)
--- trunk/Source/_javascript_Core/ChangeLog 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-10-10 22:13:07 UTC (rev 223149)
@@ -1,3 +1,13 @@
+2017-10-10 Sam Weinig <s...@webkit.org>
+
+ Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
+ https://bugs.webkit.org/show_bug.cgi?id=178102
+
+ Reviewed by Tim Horton.
+
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::clearInspectorBreakpointState):
+
2017-10-10 Michael Saboff <msab...@apple.com>
Unreviewed build fix.
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp (223148 => 223149)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -1071,9 +1071,7 @@
void InspectorDebuggerAgent::clearInspectorBreakpointState()
{
ErrorString dummyError;
- Vector<String> breakpointIdentifiers;
- copyKeysToVector(m_breakpointIdentifierToDebugServerBreakpointIDs, breakpointIdentifiers);
- for (const String& identifier : breakpointIdentifiers)
+ for (const String& identifier : copyToVector(m_breakpointIdentifierToDebugServerBreakpointIDs.keys()))
removeBreakpoint(dummyError, identifier);
m_javaScriptBreakpoints.clear();
Modified: trunk/Source/WTF/ChangeLog (223148 => 223149)
--- trunk/Source/WTF/ChangeLog 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WTF/ChangeLog 2017-10-10 22:13:07 UTC (rev 223149)
@@ -1,3 +1,16 @@
+2017-10-10 Sam Weinig <s...@webkit.org>
+
+ Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
+ https://bugs.webkit.org/show_bug.cgi?id=178102
+
+ Reviewed by Tim Horton.
+
+ * wtf/HashMap.h:
+ (WTF::copyKeysToVector): Deleted.
+ (WTF::copyValuesToVector): Deleted.
+
+ Remove copyKeysToVector and copyValuesToVector which are no longer used.
+
2017-10-09 Youenn Fablet <you...@apple.com>
Vector should be able to easily create from a list of movable only items
Modified: trunk/Source/WTF/wtf/HashMap.h (223148 => 223149)
--- trunk/Source/WTF/wtf/HashMap.h 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WTF/wtf/HashMap.h 2017-10-10 22:13:07 UTC (rev 223149)
@@ -589,32 +589,6 @@
vector[i] = { (*it).key, (*it).value };
}
-template<typename T, typename U, typename V, typename W, typename X, typename Y>
-inline void copyKeysToVector(const HashMap<T, U, V, W, X>& collection, Y& vector)
-{
- typedef typename HashMap<T, U, V, W, X>::const_iterator::Keys iterator;
-
- vector.resize(collection.size());
-
- iterator it = collection.begin().keys();
- iterator end = collection.end().keys();
- for (unsigned i = 0; it != end; ++it, ++i)
- vector[i] = *it;
-}
-
-template<typename T, typename U, typename V, typename W, typename X, typename Y>
-inline void copyValuesToVector(const HashMap<T, U, V, W, X>& collection, Y& vector)
-{
- typedef typename HashMap<T, U, V, W, X>::const_iterator::Values iterator;
-
- vector.resize(collection.size());
-
- iterator it = collection.begin().values();
- iterator end = collection.end().values();
- for (unsigned i = 0; it != end; ++it, ++i)
- vector[i] = *it;
-}
-
} // namespace WTF
using WTF::HashMap;
Modified: trunk/Source/WebCore/ChangeLog (223148 => 223149)
--- trunk/Source/WebCore/ChangeLog 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/ChangeLog 2017-10-10 22:13:07 UTC (rev 223149)
@@ -1,3 +1,47 @@
+2017-10-10 Sam Weinig <s...@webkit.org>
+
+ Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
+ https://bugs.webkit.org/show_bug.cgi?id=178102
+
+ Reviewed by Tim Horton.
+
+ * 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())
+
2017-10-10 Yoshiaki Jitsukawa <yoshiaki.jitsuk...@sony.com>
Fix MSVC build with ENCRYPTED_MEDIA enabled
Modified: trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp (223148 => 223149)
--- trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -127,7 +127,7 @@
void Geolocation::Watchers::getNotifiersVector(GeoNotifierVector& copy) const
{
- copyValuesToVector(m_idToNotifierMap, copy);
+ copy = copyToVector(m_idToNotifierMap.values());
}
Ref<Geolocation> Geolocation::create(ScriptExecutionContext* context)
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (223148 => 223149)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -1368,9 +1368,7 @@
abortInProgressOperations(error);
- Vector<RefPtr<IDBClient::TransactionOperation>> operations;
- copyValuesToVector(m_transactionOperationMap, operations);
-
+ auto operations = copyToVector(m_transactionOperationMap.values());
for (auto& operation : operations) {
m_currentlyCompletingRequest = nullptr;
m_transactionOperationsInProgressQueue.append(operation.get());
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (223148 => 223149)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -422,7 +422,7 @@
Vector<uint64_t> databaseConnectionIdentifiers;
{
Locker<Lock> locker(m_databaseConnectionMapLock);
- copyKeysToVector(m_databaseConnectionMap, databaseConnectionIdentifiers);
+ databaseConnectionIdentifiers = copyToVector(m_databaseConnectionMap.keys());
}
for (auto connectionIdentifier : databaseConnectionIdentifiers) {
@@ -441,7 +441,7 @@
Vector<IDBResourceIdentifier> openDBRequestIdentifiers;
{
Locker<Lock> locker(m_openDBRequestMapLock);
- copyKeysToVector(m_openDBRequestMap, openDBRequestIdentifiers);
+ openDBRequestIdentifiers = copyToVector(m_openDBRequestMap.keys());
}
for (auto& requestIdentifier : openDBRequestIdentifiers) {
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (223148 => 223149)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -1813,9 +1813,7 @@
ASSERT(isMainThread());
// Error out all transactions
- Vector<IDBResourceIdentifier> inProgressIdentifiers;
- copyKeysToVector(m_inProgressTransactions, inProgressIdentifiers);
- for (auto& identifier : inProgressIdentifiers)
+ for (auto& identifier : copyToVector(m_inProgressTransactions.keys()))
m_inProgressTransactions.get(identifier)->abortWithoutCallback();
ASSERT(m_inProgressTransactions.isEmpty());
@@ -1825,28 +1823,20 @@
m_objectStoreWriteTransactions.clear();
// Error out all pending callbacks
- Vector<uint64_t> callbackIdentifiers;
IDBError error = IDBError::userDeleteError();
IDBKeyData keyData;
IDBGetResult getResult;
- copyKeysToVector(m_errorCallbacks, callbackIdentifiers);
- for (auto identifier : callbackIdentifiers)
+ for (auto identifier : copyToVector(m_errorCallbacks.keys()))
performErrorCallback(identifier, error);
- callbackIdentifiers.clear();
- copyKeysToVector(m_keyDataCallbacks, callbackIdentifiers);
- for (auto identifier : callbackIdentifiers)
+ for (auto identifier : copyToVector(m_keyDataCallbacks.keys()))
performKeyDataCallback(identifier, error, keyData);
- callbackIdentifiers.clear();
- copyKeysToVector(m_getResultCallbacks, callbackIdentifiers);
- for (auto identifier : callbackIdentifiers)
+ for (auto identifier : copyToVector(m_getResultCallbacks.keys()))
performGetResultCallback(identifier, error, getResult);
- callbackIdentifiers.clear();
- copyKeysToVector(m_countCallbacks, callbackIdentifiers);
- for (auto identifier : callbackIdentifiers)
+ for (auto identifier : copyToVector(m_countCallbacks.keys()))
performCountCallback(identifier, error, 0);
// Error out all IDBOpenDBRequests
@@ -1861,7 +1851,7 @@
m_pendingOpenDBRequests.clear();
// Close all open connections
- ListHashSet<RefPtr<UniqueIDBDatabaseConnection>> openDatabaseConnections = m_openDatabaseConnections;
+ auto openDatabaseConnections = m_openDatabaseConnections;
for (auto& connection : openDatabaseConnections)
connectionClosedFromServer(*connection);
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (223148 => 223149)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -177,11 +177,7 @@
MediaStreamTrackVector MediaStream::getTracks() const
{
- MediaStreamTrackVector tracks;
- tracks.reserveCapacity(m_trackSet.size());
- copyValuesToVector(m_trackSet, tracks);
-
- return tracks;
+ return copyToVector(m_trackSet.values());
}
void MediaStream::trackDidEnd()
Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (223148 => 223149)
--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -281,9 +281,7 @@
Vector<JSC::Strong<JSDOMWindowProxy>> ScriptController::windowProxies()
{
- Vector<JSC::Strong<JSDOMWindowProxy>> windowProxies;
- copyValuesToVector(m_windowProxies, windowProxies);
- return windowProxies;
+ return copyToVector(m_windowProxies.values());
}
void ScriptController::getAllWorlds(Vector<Ref<DOMWrapperWorld>>& worlds)
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (223148 => 223149)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -4095,9 +4095,8 @@
const auto& customProperties = style->customProperties();
if (index >= customProperties.size())
return String();
-
- Vector<String, 4> results;
- copyKeysToVector(customProperties, results);
+
+ auto results = copyToVector(customProperties.keys());
return results.at(index);
}
Modified: trunk/Source/WebCore/dom/Document.cpp (223148 => 223149)
--- trunk/Source/WebCore/dom/Document.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -2338,9 +2338,7 @@
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
if (!m_clientToIDMap.isEmpty() && page()) {
- Vector<WebCore::MediaPlaybackTargetClient*> clients;
- copyKeysToVector(m_clientToIDMap, clients);
- for (auto* client : clients)
+ for (auto* client : copyToVector(m_clientToIDMap.keys()))
removePlaybackTargetPickerClient(*client);
}
#endif
Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (223148 => 223149)
--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -572,7 +572,7 @@
return;
ASSERT(!m_markers.isEmpty());
- MarkerMap::iterator iterator = m_markers.find(node);
+ auto iterator = m_markers.find(node);
if (iterator != m_markers.end())
removeMarkersFromList(iterator, markerTypes);
}
@@ -583,9 +583,7 @@
return;
ASSERT(!m_markers.isEmpty());
- Vector<RefPtr<Node>> nodesWithMarkers;
- copyKeysToVector(m_markers, nodesWithMarkers);
- for (auto& node : nodesWithMarkers) {
+ for (auto& node : copyToVector(m_markers.keys())) {
auto iterator = m_markers.find(node);
if (iterator != m_markers.end())
removeMarkersFromList(iterator, markerTypes);
Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp (223148 => 223149)
--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -145,9 +145,7 @@
void InspectorWorkerAgent::disconnectFromAllWorkerInspectorProxies()
{
- Vector<WorkerInspectorProxy*> proxies;
- copyValuesToVector(m_connectedProxies, proxies);
- for (auto* proxy : proxies)
+ for (auto* proxy : copyToVector(m_connectedProxies.values()))
proxy->disconnectFromWorkerInspectorController();
m_connectedProxies.clear();
Modified: trunk/Source/WebCore/inspector/NetworkResourcesData.cpp (223148 => 223149)
--- trunk/Source/WebCore/inspector/NetworkResourcesData.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/inspector/NetworkResourcesData.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -262,9 +262,7 @@
Vector<NetworkResourcesData::ResourceData*> NetworkResourcesData::resources()
{
- Vector<NetworkResourcesData::ResourceData*> resources;
- copyValuesToVector(m_requestIdToResourceDataMap, resources);
- return resources;
+ return copyToVector(m_requestIdToResourceDataMap.values());
}
NetworkResourcesData::ResourceData* NetworkResourcesData::resourceDataForRequestId(const String& requestId)
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (223148 => 223149)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -100,25 +100,19 @@
static void cancelAll(const ResourceLoaderMap& loaders)
{
- Vector<RefPtr<ResourceLoader>> loadersCopy;
- copyValuesToVector(loaders, loadersCopy);
- for (auto& loader : loadersCopy)
+ for (auto& loader : copyToVector(loaders.values()))
loader->cancel();
}
static void setAllDefersLoading(const ResourceLoaderMap& loaders, bool defers)
{
- Vector<RefPtr<ResourceLoader>> loadersCopy;
- copyValuesToVector(loaders, loadersCopy);
- for (auto& loader : loadersCopy)
+ for (auto& loader : copyToVector(loaders.values()))
loader->setDefersLoading(defers);
}
static bool areAllLoadersPageCacheAcceptable(const ResourceLoaderMap& loaders)
{
- Vector<RefPtr<ResourceLoader>> loadersCopy;
- copyValuesToVector(loaders, loadersCopy);
- for (auto& loader : loadersCopy) {
+ for (auto& loader : copyToVector(loaders.values())) {
if (!loader->frameLoader() || !loader->frameLoader()->frame().page())
return false;
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (223148 => 223149)
--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -278,10 +278,7 @@
if (it == m_sessionResources.end())
return;
- Vector<CachedResourceHandle<CachedResource>> resourcesForSession;
- copyValuesToVector(*it->value, resourcesForSession);
-
- for (auto& resource : resourcesForSession)
+ for (auto& resource : copyToVector(it->value->values()))
function(*resource);
}
Modified: trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp (223148 => 223149)
--- trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -37,17 +37,13 @@
static void scheduleAll(const ResourceLoaderMap& loaders, SchedulePair& pair)
{
- Vector<RefPtr<ResourceLoader>> loadersCopy;
- copyValuesToVector(loaders, loadersCopy);
- for (auto& loader : loadersCopy)
+ for (auto& loader : copyToVector(loaders.values()))
loader->schedule(pair);
}
static void unscheduleAll(const ResourceLoaderMap& loaders, SchedulePair& pair)
{
- Vector<RefPtr<ResourceLoader>> loadersCopy;
- copyValuesToVector(loaders, loadersCopy);
- for (auto& loader : loadersCopy)
+ for (auto& loader : copyToVector(loaders.values()))
loader->unschedule(pair);
}
Modified: trunk/Source/WebCore/page/ResourceUsageThread.cpp (223148 => 223149)
--- trunk/Source/WebCore/page/ResourceUsageThread.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/page/ResourceUsageThread.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -86,7 +86,7 @@
{
auto& resourceUsageThread = ResourceUsageThread::singleton();
LockHolder locker(resourceUsageThread.m_lock);
- copyValuesToVector(resourceUsageThread.m_observers, functions);
+ functions = copyToVector(resourceUsageThread.m_observers.values());
}
for (auto& function : functions)
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (223148 => 223149)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -91,11 +91,7 @@
MediaStreamTrackPrivateVector MediaStreamPrivate::tracks() const
{
- MediaStreamTrackPrivateVector tracks;
- tracks.reserveCapacity(m_trackSet.size());
- copyValuesToVector(m_trackSet, tracks);
-
- return tracks;
+ return copyToVector(m_trackSet.values());
}
void MediaStreamPrivate::updateActiveState(NotifyClientOption notifyClientOption)
Modified: trunk/Source/WebDriver/ChangeLog (223148 => 223149)
--- trunk/Source/WebDriver/ChangeLog 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebDriver/ChangeLog 2017-10-10 22:13:07 UTC (rev 223149)
@@ -1,3 +1,13 @@
+2017-10-10 Sam Weinig <s...@webkit.org>
+
+ Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
+ https://bugs.webkit.org/show_bug.cgi?id=178102
+
+ Reviewed by Tim Horton.
+
+ * SessionHost.cpp:
+ (WebDriver::SessionHost::inspectorDisconnected):
+
2017-10-02 Carlos Garcia Campos <cgar...@igalia.com>
WebDriver: HTTP status code is not correct for some of the errors
Modified: trunk/Source/WebDriver/SessionHost.cpp (223148 => 223149)
--- trunk/Source/WebDriver/SessionHost.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebDriver/SessionHost.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -36,9 +36,7 @@
void SessionHost::inspectorDisconnected()
{
// Browser closed or crashed, finish all pending commands with error.
- Vector<long> messages;
- copyKeysToVector(m_commandRequests, messages);
- for (auto messageID : messages) {
+ for (auto messageID : copyToVector(m_commandRequests.keys())) {
auto responseHandler = m_commandRequests.take(messageID);
responseHandler({ nullptr, true });
}
Modified: trunk/Source/WebKit/ChangeLog (223148 => 223149)
--- trunk/Source/WebKit/ChangeLog 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/ChangeLog 2017-10-10 22:13:07 UTC (rev 223149)
@@ -1,3 +1,43 @@
+2017-10-10 Sam Weinig <s...@webkit.org>
+
+ Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
+ https://bugs.webkit.org/show_bug.cgi?id=178102
+
+ Reviewed by Tim Horton.
+
+ * 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):
+
2017-10-10 Adrian Perez de Castro <ape...@igalia.com>
[WPE] Header cairo.h is used in GLib API headers but cannot be found
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (223148 => 223149)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -168,9 +168,7 @@
// Protect ourself as we might be otherwise be deleted during this function.
Ref<NetworkConnectionToWebProcess> protector(*this);
- Vector<RefPtr<NetworkResourceLoader>> loaders;
- copyValuesToVector(m_networkResourceLoaders, loaders);
- for (auto& loader : loaders)
+ for (auto& loader : copyToVector(m_networkResourceLoaders.values()))
loader->abort();
ASSERT(m_networkResourceLoaders.isEmpty());
Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm (223148 => 223149)
--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm 2017-10-10 22:13:07 UTC (rev 223149)
@@ -744,8 +744,7 @@
ts << "changed-layers";
// Dump the layer properties sorted by layer ID.
- Vector<GraphicsLayer::PlatformLayerID> layerIDs;
- copyKeysToVector(changedLayerProperties, layerIDs);
+ auto layerIDs = copyToVector(changedLayerProperties.keys());
std::sort(layerIDs.begin(), layerIDs.end());
for (auto& layerID : layerIDs) {
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (223148 => 223149)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -1618,9 +1618,7 @@
void webkitWebContextInvalidateCustomProtocolRequests(WebKitWebContext* context, LegacyCustomProtocolManagerProxy& manager)
{
- Vector<GRefPtr<WebKitURISchemeRequest>> requests;
- copyValuesToVector(context->priv->uriSchemeRequests, requests);
- for (auto& request : requests) {
+ for (auto& request : copyToVector(context->priv->uriSchemeRequests.values())) {
if (webkitURISchemeRequestGetManager(request.get()) == &manager)
webkitURISchemeRequestInvalidate(request.get());
}
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (223148 => 223149)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -475,9 +475,7 @@
WebKitWebViewBase* webView = WEBKIT_WEB_VIEW_BASE(container);
WebKitWebViewBasePrivate* priv = webView->priv;
- Vector<GtkWidget*> children;
- copyKeysToVector(priv->children, children);
- for (const auto& child : children) {
+ for (const auto& child : copyToVector(priv->children.keys())) {
if (priv->children.contains(child))
(*callback)(child, callbackData);
}
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm (223148 => 223149)
--- trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm 2017-10-10 22:13:07 UTC (rev 223149)
@@ -89,9 +89,7 @@
- (Vector<String>)_mimeTypesWithCustomContentProviders
{
- Vector<String> mimeTypes;
- copyKeysToVector(_contentProviderForMIMEType, mimeTypes);
- return mimeTypes;
+ return copyToVector(_contentProviderForMIMEType.keys());
}
@end
Modified: trunk/Source/WebKit/UIProcess/GenericCallback.h (223148 => 223149)
--- trunk/Source/WebKit/UIProcess/GenericCallback.h 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/UIProcess/GenericCallback.h 2017-10-10 22:13:07 UTC (rev 223149)
@@ -163,9 +163,7 @@
template<typename T>
void invalidateCallbackMap(HashMap<uint64_t, T>& callbackMap, CallbackBase::Error error)
{
- Vector<T> callbacks;
- copyValuesToVector(callbackMap, callbacks);
- for (auto& callback : callbacks)
+ for (auto& callback : copyToVector(callbackMap.values()))
callback->invalidate(error);
callbackMap.clear();
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (223148 => 223149)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -181,18 +181,15 @@
m_backgroundResponsivenessTimer.invalidate();
m_tokenForHoldingLockedFiles = nullptr;
- Vector<RefPtr<WebFrameProxy>> frames;
- copyValuesToVector(m_frameMap, frames);
-
- for (size_t i = 0, size = frames.size(); i < size; ++i)
- frames[i]->webProcessWillShutDown();
+ for (auto& frame : copyToVector(m_frameMap.values()))
+ frame->webProcessWillShutDown();
m_frameMap.clear();
- for (VisitedLinkStore* visitedLinkStore : m_visitedLinkStores)
+ for (auto* visitedLinkStore : m_visitedLinkStores)
visitedLinkStore->removeProcess(*this);
m_visitedLinkStores.clear();
- for (WebUserContentControllerProxy* webUserContentControllerProxy : m_webUserContentControllerProxies)
+ for (auto* webUserContentControllerProxy : m_webUserContentControllerProxies)
webUserContentControllerProxy->removeProcess(*this);
m_webUserContentControllerProxies.clear();
@@ -625,13 +622,12 @@
webConnection()->didClose();
- Vector<RefPtr<WebPageProxy>> pages;
- copyValuesToVector(m_pageMap, pages);
+ auto pages = copyToVector(m_pageMap.values());
shutDown();
- for (size_t i = 0, size = pages.size(); i < size; ++i)
- pages[i]->processDidTerminate(ProcessTerminationReason::Crash);
+ for (auto& page : pages)
+ page->processDidTerminate(ProcessTerminationReason::Crash);
}
@@ -653,12 +649,9 @@
{
m_isResponsive = NoOrMaybe::No;
- Vector<RefPtr<WebPageProxy>> pages;
- copyValuesToVector(m_pageMap, pages);
-
auto isResponsiveCallbacks = WTFMove(m_isResponsiveCallbacks);
- for (auto& page : pages)
+ for (auto& page : copyToVector(m_pageMap.values()))
page->processDidBecomeUnresponsive();
bool isWebProcessResponsive = false;
@@ -670,25 +663,19 @@
{
m_isResponsive = NoOrMaybe::Maybe;
- Vector<RefPtr<WebPageProxy>> pages;
- copyValuesToVector(m_pageMap, pages);
- for (auto& page : pages)
+ for (auto& page : copyToVector(m_pageMap.values()))
page->processDidBecomeResponsive();
}
void WebProcessProxy::willChangeIsResponsive()
{
- Vector<RefPtr<WebPageProxy>> pages;
- copyValuesToVector(m_pageMap, pages);
- for (auto& page : pages)
+ for (auto& page : copyToVector(m_pageMap.values()))
page->willChangeProcessIsResponsive();
}
void WebProcessProxy::didChangeIsResponsive()
{
- Vector<RefPtr<WebPageProxy>> pages;
- copyValuesToVector(m_pageMap, pages);
- for (auto& page : pages)
+ for (auto& page : copyToVector(m_pageMap.values()))
page->didChangeProcessIsResponsive();
}
@@ -748,11 +735,9 @@
void WebProcessProxy::disconnectFramesFromPage(WebPageProxy* page)
{
- Vector<RefPtr<WebFrameProxy>> frames;
- copyValuesToVector(m_frameMap, frames);
- for (size_t i = 0, size = frames.size(); i < size; ++i) {
- if (frames[i]->page() == page)
- frames[i]->webProcessWillShutDown();
+ for (auto& frame : copyToVector(m_frameMap.values())) {
+ if (frame->page() == page)
+ frame->webProcessWillShutDown();
}
}
@@ -759,8 +744,8 @@
size_t WebProcessProxy::frameCountInPage(WebPageProxy* page) const
{
size_t result = 0;
- for (HashMap<uint64_t, RefPtr<WebFrameProxy>>::const_iterator iter = m_frameMap.begin(); iter != m_frameMap.end(); ++iter) {
- if (iter->value->page() == page)
+ for (auto& frame : m_frameMap.values()) {
+ if (frame->page() == page)
++result;
}
return result;
@@ -888,13 +873,12 @@
if (webConnection())
webConnection()->didClose();
- Vector<RefPtr<WebPageProxy>> pages;
- copyValuesToVector(m_pageMap, pages);
+ auto pages = copyToVector(m_pageMap.values());
shutDown();
- for (size_t i = 0, size = pages.size(); i < size; ++i)
- pages[i]->processDidTerminate(reason);
+ for (auto& page : pages)
+ page->processDidTerminate(reason);
}
void WebProcessProxy::stopResponsivenessTimer()
Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp (223148 => 223149)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -200,12 +200,9 @@
void NPRuntimeObjectMap::invalidate()
{
- Vector<NPJSObject*> npJSObjects;
- copyValuesToVector(m_npJSObjects, npJSObjects);
-
// Deallocate all the object wrappers so we won't leak any _javascript_ objects.
- for (size_t i = 0; i < npJSObjects.size(); ++i)
- deallocateNPObject(npJSObjects[i]);
+ for (auto& npJSObject : copyToVector(m_npJSObjects.values()))
+ deallocateNPObject(npJSObject);
// We shouldn't have any NPJSObjects left now.
ASSERT(m_npJSObjects.isEmpty());
Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (223148 => 223149)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -568,11 +568,8 @@
void NetscapePlugin::stopAllStreams()
{
- Vector<RefPtr<NetscapePluginStream>> streams;
- copyValuesToVector(m_streams, streams);
-
- for (size_t i = 0; i < streams.size(); ++i)
- streams[i]->stop(NPRES_USER_BREAK);
+ for (auto& stream : copyToVector(m_streams.values()))
+ stream->stop(NPRES_USER_BREAK);
}
bool NetscapePlugin::allowPopups() const
Modified: trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp (223148 => 223149)
--- trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -1284,11 +1284,8 @@
void PluginView::cancelAllStreams()
{
- Vector<RefPtr<Stream>> streams;
- copyValuesToVector(m_streams, streams);
-
- for (size_t i = 0; i < streams.size(); ++i)
- streams[i]->cancel();
+ for (auto& stream : copyToVector(m_streams.values()))
+ stream->cancel();
// Cancelling a stream removes it from the m_streams map, so if we cancel all streams the map should be empty.
ASSERT(m_streams.isEmpty());
Modified: trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeContext.mm (223148 => 223149)
--- trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeContext.mm 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeContext.mm 2017-10-10 22:13:07 UTC (rev 223149)
@@ -126,9 +126,7 @@
rootLayerRemote.recursiveBuildTransaction(*this, transaction);
m_currentTransaction = nullptr;
- Vector<RemoteLayerTreeTransaction::LayerCreationProperties> createdLayerProperties;
- copyValuesToVector(m_createdLayers, createdLayerProperties);
- transaction.setCreatedLayers(WTFMove(createdLayerProperties));
+ transaction.setCreatedLayers(copyToVector(m_createdLayers.values()));
transaction.setDestroyedLayerIDs(WTFMove(m_destroyedLayers));
m_createdLayers.clear();
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (223148 => 223149)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -665,12 +665,8 @@
void WebProcess::didClose(IPC::Connection&)
{
#ifndef NDEBUG
- // Close all the live pages.
- Vector<RefPtr<WebPage>> pages;
- copyValuesToVector(m_pageMap, pages);
- for (auto& page : pages)
+ for (auto& page : copyToVector(m_pageMap.values()))
page->close();
- pages.clear();
GCController::singleton().garbageCollectSoon();
FontCache::singleton().invalidate();
Modified: trunk/Source/WebKitLegacy/ChangeLog (223148 => 223149)
--- trunk/Source/WebKitLegacy/ChangeLog 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKitLegacy/ChangeLog 2017-10-10 22:13:07 UTC (rev 223149)
@@ -1,3 +1,13 @@
+2017-10-10 Sam Weinig <s...@webkit.org>
+
+ Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
+ https://bugs.webkit.org/show_bug.cgi?id=178102
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebResourceLoadScheduler.cpp:
+ (WebResourceLoadScheduler::servePendingRequests):
+
2017-10-09 Per Arne Vollan <pvol...@apple.com>
[Win] Link error: cannot open input file 'WebKitLegacyGUID.lib'
Modified: trunk/Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.cpp (223148 => 223149)
--- trunk/Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.cpp 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.cpp 2017-10-10 22:13:07 UTC (rev 223149)
@@ -222,10 +222,7 @@
servePendingRequests(m_nonHTTPProtocolHost, minimumPriority);
- Vector<HostInformation*> hostsToServe;
- copyValuesToVector(m_hosts, hostsToServe);
-
- for (auto* host : hostsToServe) {
+ for (auto* host : copyToVector(m_hosts.values())) {
if (host->hasRequests())
servePendingRequests(host, minimumPriority);
else
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (223148 => 223149)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2017-10-10 22:13:07 UTC (rev 223149)
@@ -1,3 +1,17 @@
+2017-10-10 Sam Weinig <s...@webkit.org>
+
+ Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
+ https://bugs.webkit.org/show_bug.cgi?id=178102
+
+ Reviewed by Tim Horton.
+
+ * History/WebHistory.mm:
+ (-[WebHistoryPrivate rebuildHistoryByDayIfNeeded:]):
+ * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+ (WebKit::NetscapePluginInstanceProxy::stopAllStreams):
+ * WebCoreSupport/WebUserMediaClient.mm:
+ (WebUserMediaClient::pageDestroyed):
+
2017-10-09 Robin Morisset <rmoris...@apple.com>
Make the names of the options consistent
Modified: trunk/Source/WebKitLegacy/mac/History/WebHistory.mm (223148 => 223149)
--- trunk/Source/WebKitLegacy/mac/History/WebHistory.mm 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKitLegacy/mac/History/WebHistory.mm 2017-10-10 22:13:07 UTC (rev 223149)
@@ -366,8 +366,7 @@
{
// We clear all the values to present a consistent state when sending the notifications.
// We keep a reference to the entries for rebuilding the history after the notification.
- Vector <RetainPtr<NSMutableArray>> entryArrays;
- copyValuesToVector(*_entriesByDate, entryArrays);
+ auto entryArrays = copyToVector(_entriesByDate->values());
_entriesByDate->clear();
NSMutableDictionary *entriesByURL = _entriesByURL;
Modified: trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (223148 => 223149)
--- trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2017-10-10 22:13:07 UTC (rev 223149)
@@ -293,10 +293,8 @@
void NetscapePluginInstanceProxy::stopAllStreams()
{
- Vector<RefPtr<HostedNetscapePluginStream>> streamsCopy;
- copyValuesToVector(m_streams, streamsCopy);
- for (size_t i = 0; i < streamsCopy.size(); i++)
- streamsCopy[i]->stop();
+ for (auto& stream : copyToVector(m_streams.values()))
+ stream->stop();
}
void NetscapePluginInstanceProxy::cleanup()
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebUserMediaClient.mm (223148 => 223149)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebUserMediaClient.mm 2017-10-10 21:51:47 UTC (rev 223148)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebUserMediaClient.mm 2017-10-10 22:13:07 UTC (rev 223149)
@@ -109,8 +109,7 @@
void WebUserMediaClient::pageDestroyed()
{
auto& requestsMap = userMediaRequestsMap();
- Vector<RetainPtr<WebUserMediaPolicyListener>> pendingRequests;
- copyValuesToVector(requestsMap, pendingRequests);
+ auto pendingRequests = copyToVector(requestsMap.values());
requestsMap.clear();
for (auto& request : pendingRequests)
@@ -119,8 +118,7 @@
ASSERT(userMediaRequestsMap().isEmpty());
auto& checkMap = userMediaCheckMap();
- Vector<RetainPtr<WebUserMediaPolicyCheckerListener>> pendingChecks;
- copyValuesToVector(checkMap, pendingChecks);
+ auto pendingChecks = copyToVector(checkMap.values());
checkMap.clear();
for (auto& check : pendingChecks)
