Changeset 223317 in webkit

Timestamp:

Oct 14, 2017 8:07:44 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Remove HashCountedSet's copyToVector functions
​https://bugs.webkit.org/show_bug.cgi?id=178215

Patch by Sam Weinig <​sam@webkit.org> on 2017-10-14
Reviewed by Daniel Bates.

Source/WebCore:

• page/DeviceController.cpp:

(WebCore::DeviceController::dispatchDeviceEvent):
(WebCore::DeviceController::fireDeviceEvent):

Replace use of HashCountedSet's copyToVector functions with copyToVector(hashCountedSet.values()).

Source/WTF:

• wtf/HashCountedSet.h:

(WTF::copyToVector): Deleted.

They are replaced by either copyToVector(hashCountedSet) or copyToVector(hashCountedSet.values())

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/HashCountedSet.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/DeviceController.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2017-10-14  Sam Weinig  <sam@webkit.org>
+
+        Remove HashCountedSet's copyToVector functions
+        https://bugs.webkit.org/show_bug.cgi?id=178215
+
+        Reviewed by Daniel Bates.
+
+        * wtf/HashCountedSet.h:
+        (WTF::copyToVector): Deleted.
+        
+            They are replaced by either copyToVector(hashCountedSet) or copyToVector(hashCountedSet.values())
+
 2017-10-13  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WTF/wtf/HashCountedSet.h

@@ -310 +310 @@
 }
 
-template<typename Value, typename HashFunctions, typename Traits, typename VectorType>
-inline void copyToVector(const HashCountedSet<Value, HashFunctions, Traits>& collection, VectorType& vector)
-{
-    typedef typename HashCountedSet<Value, HashFunctions, Traits>::const_iterator iterator;
-
-    vector.resize(collection.size());
-
-    iterator it = collection.begin();
-    iterator end = collection.end();
-    for (unsigned i = 0; it != end; ++it, ++i)
-        vector[i] = *it;
-}
-
-template<typename Value, typename HashFunctions, typename Traits>
-inline void copyToVector(const HashCountedSet<Value, HashFunctions, Traits>& collection, Vector<Value>& vector)
-{
-    typedef typename HashCountedSet<Value, HashFunctions, Traits>::const_iterator iterator;
-
-    vector.resize(collection.size());
-
-    iterator it = collection.begin();
-    iterator end = collection.end();
-    for (unsigned i = 0; it != end; ++it, ++i)
-        vector[i] = (*it).key;
-}
-
 } // namespace WTF
 
 using WTF::HashCountedSet;
-
-

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-14  Sam Weinig  <sam@webkit.org>
+
+        Remove HashCountedSet's copyToVector functions
+        https://bugs.webkit.org/show_bug.cgi?id=178215
+
+        Reviewed by Daniel Bates.
+
+        * page/DeviceController.cpp:
+        (WebCore::DeviceController::dispatchDeviceEvent):
+        (WebCore::DeviceController::fireDeviceEvent):
+        
+            Replace use of HashCountedSet's copyToVector functions with copyToVector(hashCountedSet.values()).
+
 2017-10-13  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/page/DeviceController.cpp

@@ -73 +73 @@
 void DeviceController::dispatchDeviceEvent(Event& event)
 {
-    Vector<RefPtr<DOMWindow>> listenerVector;
-    copyToVector(m_listeners, listenerVector);
-    for (auto& listener : listenerVector) {
+    for (auto& listener : copyToVector(m_listeners.values())) {
         auto document = listener->document();
         if (document && !document->activeDOMObjectsAreSuspended() && !document->activeDOMObjectsAreStopped())
@@ -87 +85 @@
 
     m_timer.stop();
-    Vector<RefPtr<DOMWindow>> listenerVector;
-    copyToVector(m_lastEventListeners, listenerVector);
+    auto listenerVector = copyToVector(m_lastEventListeners.values());
     m_lastEventListeners.clear();
     for (auto& listener : listenerVector) {