Changeset 223238 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Oct 12, 2017, 8:38:42 AM (8 years ago)

Author:

[email protected]

Message:

Remove out-parameter variants of copyToVector
​https://bugs.webkit.org/show_bug.cgi?id=178155

Reviewed by Tim Horton.

Source/JavaScriptCore:

• inspector/ScriptDebugServer.cpp:

(Inspector::ScriptDebugServer::dispatchBreakpointActionLog):
(Inspector::ScriptDebugServer::dispatchBreakpointActionSound):
(Inspector::ScriptDebugServer::dispatchBreakpointActionProbe):
(Inspector::ScriptDebugServer::dispatchDidParseSource):
(Inspector::ScriptDebugServer::dispatchFailedToParseSource):
(Inspector::ScriptDebugServer::dispatchFunctionToListeners):

Replace out-parameter based copyToVector, with one that returns a Vector.

Source/WebCore:

• Modules/geolocation/Geolocation.cpp:

(WebCore::Geolocation::stopTimersForOneShots):
(WebCore::Geolocation::cancelAllRequests):
(WebCore::Geolocation::handleError):
(WebCore::Geolocation::makeSuccessCallbacks):

• Modules/indexeddb/IDBDatabase.cpp:

(WebCore::IDBDatabase::transaction):

• Modules/indexeddb/IDBGetAllResult.cpp:

(WebCore::IDBGetAllResult::allBlobFilePaths const):

• Modules/indexeddb/server/MemoryIndex.cpp:

(WebCore::IDBServer::MemoryIndex::notifyCursorsOfValueChange):
(WebCore::IDBServer::MemoryIndex::notifyCursorsOfAllRecordsChanged):

• css/CSSFontSelector.cpp:

(WebCore::CSSFontSelector::dispatchInvalidationCallbacks):

• dom/Document.cpp:

(WebCore::Document::moveNodeIteratorsToNewDocument):
(WebCore::Document::resume):
(WebCore::Document::didAssociateFormControlsTimerFired):

• dom/IdTargetObserverRegistry.cpp:

(WebCore::IdTargetObserverRegistry::notifyObserversInternal):

• dom/MutationObserver.cpp:

(WebCore::MutationObserver::notifyMutationObservers):

• dom/Node.cpp:

(WebCore::Document::invalidateNodeListAndCollectionCaches):

• dom/RadioButtonGroups.cpp:
• dom/ScriptExecutionContext.cpp:

(WebCore::ScriptExecutionContext::dispatchMessagePortEvents):
(WebCore::ScriptExecutionContext::stopActiveDOMObjects):

• loader/appcache/ApplicationCacheGroup.cpp:

(WebCore::ApplicationCacheGroup::checkIfLoadIsComplete):
(WebCore::ApplicationCacheGroup::deliverDelayedMainResources):

• loader/cache/MemoryCache.cpp:

(WebCore::MemoryCache::forEachResource):
(WebCore::MemoryCache::pruneDeadResourcesToSize):

• page/DOMWindow.cpp:

(WebCore::DOMWindow::willDestroyCachedFrame):
(WebCore::DOMWindow::willDestroyDocumentInFrame):
(WebCore::DOMWindow::willDetachDocumentFromFrame):
(WebCore::DOMWindow::disconnectDOMWindowProperties):
(WebCore::DOMWindow::reconnectDOMWindowProperties):

• page/FrameView.cpp:

(WebCore::collectAndProtectWidgets):

• page/MemoryRelease.cpp:

(WebCore::releaseCriticalMemory):

• page/Performance.cpp:

(WebCore::Performance::queueEntry):

• platform/cocoa/PasteboardCocoa.mm:

(WebCore::Pasteboard::typesForLegacyUnsafeBindings):

• platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::FontCache::systemFontFamilies):

• platform/ios/PlatformPasteboardIOS.mm:

(WebCore::PlatformPasteboard::typesSafeForDOMToReadAndWrite const):

• platform/ios/WebCoreMotionManager.mm:

(-[WebCoreMotionManager sendAccelerometerData:]):
(-[WebCoreMotionManager sendMotionData:withHeading:]):

• platform/mac/PlatformPasteboardMac.mm:

(WebCore::PlatformPasteboard::typesSafeForDOMToReadAndWrite const):

• platform/network/cocoa/WebCoreNSURLSession.mm:

(-[WebCoreNSURLSession invalidateAndCancel]):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::endAndCommitUpdateScrollInfoAfterLayoutTransaction):

• rendering/RenderBlockLineLayout.cpp:

(WebCore::setLogicalWidthForTextRun):

• rendering/RenderDeprecatedFlexibleBox.cpp:

(WebCore::FlexBoxIterator::next):

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::paintObject):

Replace out-parameter based copyToVector, with one that returns a Vector.

Source/WebKit:

• Shared/API/Cocoa/_WKRemoteObjectInterface.mm:

(-[_WKRemoteObjectInterface debugDescription]):

• Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp:

(WebKit::dump):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::resetState):

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::createNewWebProcess):

• UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:

(WebKit::WebsiteDataStore::parameters):

• UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::pendingCookies const):

• UIProcess/ios/ProcessAssertionIOS.mm:

(-[WKProcessAssertionBackgroundTaskManager _notifyClientsOfImminentSuspension]):

• WebProcess/Cookies/WebCookieManager.cpp:

(WebKit::WebCookieManager::getHostnamesWithCookies):

• WebProcess/Geolocation/WebGeolocationManager.cpp:

(WebKit::WebGeolocationManager::didChangePosition):
(WebKit::WebGeolocationManager::didFailToDeterminePosition):

• WebProcess/Network/WebLoaderStrategy.cpp:

(WebKit::WebLoaderStrategy::internallyFailedLoadTimerFired):

Replace out-parameter based copyToVector, with one that returns a Vector.

Source/WebKitLegacy/ios:

• Misc/WebGeolocationProviderIOS.mm:

(-[WebGeolocationProviderIOS _handlePendingInitialPosition:]):
(-[WebGeolocationProviderIOS positionChanged:]):
(-[WebGeolocationProviderIOS errorOccurred:]):
(-[WebGeolocationProviderIOS resetGeolocation]):

Replace out-parameter based copyToVector, with one that returns a Vector.

Source/WebKitLegacy/mac:

• Plugins/WebNetscapePluginView.mm:

(-[WebNetscapePluginView destroyPlugin]):

• WebView/WebHTMLRepresentation.mm:

(newArrayWithStrings):

Replace out-parameter based copyToVector, with one that returns a Vector.

Source/WTF:

• wtf/HashMap.h:

(WTF::copyToVector): Deleted.

• wtf/HashSet.h:

(WTF::copyToVector): Deleted.

Remove copyToVector.

• wtf/Vector.h:

(WTF::copyToVectorSpecialization):

Add another version of copyToVector, called copyToVectorSpecialization, that allows
you to specify the entire specialization for the Vector you want to copy to. This
can be useful if you want your resulting Vector to have an inline capacity.

Tools:

• DumpRenderTree/JavaScriptThreading.cpp:

(stopJavaScriptThreads):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/ScriptDebugServer.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-10-11  Sam Weinig  <[email protected]>
+
+        Remove out-parameter variants of copyToVector
+        https://bugs.webkit.org/show_bug.cgi?id=178155
+
+        Reviewed by Tim Horton.
+
+        * inspector/ScriptDebugServer.cpp:
+        (Inspector::ScriptDebugServer::dispatchBreakpointActionLog):
+        (Inspector::ScriptDebugServer::dispatchBreakpointActionSound):
+        (Inspector::ScriptDebugServer::dispatchBreakpointActionProbe):
+        (Inspector::ScriptDebugServer::dispatchDidParseSource):
+        (Inspector::ScriptDebugServer::dispatchFailedToParseSource):
+        (Inspector::ScriptDebugServer::dispatchFunctionToListeners):
+            
+            Replace out-parameter based copyToVector, with one that returns a Vector.
+
 2017-10-12  Yusuke Suzuki  <[email protected]>
 

trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp

@@ -146 +146 @@
     SetForScope<bool> change(m_callingListeners, true);
 
-    Vector<ScriptDebugListener*> listenersCopy;
-    copyToVector(m_listeners, listenersCopy);
-    for (auto* listener : listenersCopy)
+    for (auto* listener : copyToVector(m_listeners))
         listener->breakpointActionLog(*exec, message);
 }
@@ -162 +160 @@
     SetForScope<bool> change(m_callingListeners, true);
 
-    Vector<ScriptDebugListener*> listenersCopy;
-    copyToVector(m_listeners, listenersCopy);
-    for (auto* listener : listenersCopy)
+    for (auto* listener : copyToVector(m_listeners))
         listener->breakpointActionSound(breakpointActionIdentifier);
 }
@@ -180 +176 @@
     unsigned sampleId = m_nextProbeSampleId++;
 
-    Vector<ScriptDebugListener*> listenersCopy;
-    copyToVector(m_listeners, listenersCopy);
-    for (auto* listener : listenersCopy)
+    for (auto* listener : copyToVector(m_listeners))
         listener->breakpointActionProbe(*exec, action, m_currentProbeBatchId, sampleId, sampleValue);
 }
@@ -222 +216 @@
         script.endColumn = sourceLength - lastLineStart;
 
-    Vector<ScriptDebugListener*> copy;
-    copyToVector(listeners, copy);
-    for (size_t i = 0; i < copy.size(); ++i)
-        copy[i]->didParseSource(sourceID, script);
+    for (auto* listener : copyToVector(listeners))
+        listener->didParseSource(sourceID, script);
 }
 
@@ -234 +226 @@
     int firstLine = sourceProvider->startPosition().m_line.oneBasedInt();
 
-    Vector<ScriptDebugListener*> copy;
-    copyToVector(listeners, copy);
-    for (size_t i = 0; i < copy.size(); ++i)
-        copy[i]->failedToParseSource(url, data, firstLine, errorLine, errorMessage);
+    for (auto* listener : copyToVector(listeners))
+        listener->failedToParseSource(url, data, firstLine, errorLine, errorMessage);
 }
 
@@ -272 +262 @@
 void ScriptDebugServer::dispatchFunctionToListeners(const ListenerSet& listeners, JavaScriptExecutionCallback callback)
 {
-    Vector<ScriptDebugListener*> copy;
-    copyToVector(listeners, copy);
-    for (size_t i = 0; i < copy.size(); ++i)
-        (this->*callback)(copy[i]);
+    for (auto* listener : copyToVector(listeners))
+        (this->*callback)(listener);
 }