Changeset 157074 in webkit

Timestamp:

Oct 7, 2013 6:28:18 PM (11 years ago)

Author:

Darin Adler

Message:

Make Vector::insert work for move-only types
​https://bugs.webkit.org/show_bug.cgi?id=122429

Reviewed by Anders Carlsson.

Source/WebCore:

• history/HistoryItem.cpp:

(WebCore::HistoryItem::padDailyCountsForNewVisit): Call insertVector.
Also added some inline capacity, which should make this faster.

Source/WTF:

• wtf/Vector.h:

(WTF::Vector::insert): Take an rvalue reference instead of a const reference.
(WTF::Vector::insertVector): Renamed to avoid overloading troubles, analogous
to what we did for appendVector.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Vector.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/history/HistoryItem.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-10-07  Darin Adler  <darin@apple.com>
+
+        Make Vector::insert work for move-only types
+        https://bugs.webkit.org/show_bug.cgi?id=122429
+
+        Reviewed by Anders Carlsson.
+
+        * wtf/Vector.h:
+        (WTF::Vector::insert): Take an rvalue reference instead of a const reference.
+        (WTF::Vector::insertVector): Renamed to avoid overloading troubles, analogous
+        to what we did for appendVector.
+
 2013-10-07  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WTF/wtf/Vector.h

@@ -645 +645 @@
 
     template<typename U> void insert(size_t position, const U*, size_t);
-    template<typename U> void insert(size_t position, const U&);
-    template<typename U, size_t c> void insert(size_t position, const Vector<U, c>&);
+    template<typename U> void insert(size_t position, U&&);
+    template<typename U, size_t c> void insertVector(size_t position, const Vector<U, c>&);
 
     void remove(size_t position);
@@ -1092 +1092 @@
  
 template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
-inline void Vector<T, inlineCapacity, OverflowHandler>::insert(size_t position, const U& val)
+inline void Vector<T, inlineCapacity, OverflowHandler>::insert(size_t position, U&& value)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(position <= size());
-    const U* data = &val;
+
+    auto ptr = const_cast<typename std::remove_const<typename std::remove_reference<U>::type>::type*>(std::addressof(value));
     if (size() == capacity()) {
-        data = expandCapacity(size() + 1, data);
+        ptr = expandCapacity(size() + 1, ptr);
         ASSERT(begin());
     }
+
     T* spot = begin() + position;
     TypeOperations::moveOverlapping(spot, end(), spot + 1);
-    new (NotNull, spot) T(*data);
+    new (NotNull, spot) T(std::forward<U>(*ptr));
     ++m_size;
 }
 
 template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U, size_t c>
-inline void Vector<T, inlineCapacity, OverflowHandler>::insert(size_t position, const Vector<U, c>& val)
+inline void Vector<T, inlineCapacity, OverflowHandler>::insertVector(size_t position, const Vector<U, c>& val)
 {
     insert(position, val.begin(), val.size());

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-07  Darin Adler  <darin@apple.com>
+
+        Make Vector::insert work for move-only types
+        https://bugs.webkit.org/show_bug.cgi?id=122429
+
+        Reviewed by Anders Carlsson.
+
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::padDailyCountsForNewVisit): Call insertVector.
+        Also added some inline capacity, which should make this faster.
+
 2013-10-07  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/history/HistoryItem.cpp

@@ -332 +332 @@
 
     if (daysElapsed < 0)
-      daysElapsed = 0;
-
-    Vector<int> padding;
+        daysElapsed = 0;
+
+    Vector<int, 32> padding;
     padding.fill(0, daysElapsed);
-    m_dailyVisitCounts.insert(0, padding);
+    m_dailyVisitCounts.insertVector(0, padding);
 }