Changeset 21221 in webkit for trunk/JavaScriptCore/wtf/Vector.h

Timestamp:

May 2, 2007, 6:11:05 AM (18 years ago)

Author:

harrison

Message:

JavaScriptCore:

Reviewed by Antti.

<rdar://problem/5174862> Crash resulting from DeprecatedString::insert()

Added insertion support for more than one value.

• wtf/Vector.h: (WTF::::insert): Added support for inserting multiple values.

(WTF::::prepend):
New. Insert at the start of vectors. Convenient for vectors used as strings.

LayoutTests:

Reviewed by Antti.

• test for <rdar://problem/5174862> Crash resulting from DeprecatedString::insert()

• editing/selection/move-by-sentence-001-expected.checksum: Added.
• editing/selection/move-by-sentence-001-expected.png: Added.
• editing/selection/move-by-sentence-001-expected.txt: Added.
• editing/selection/move-by-sentence-001.html: Added.

WebCore:

Reviewed by Antti.

<rdar://problem/5174862> Crash resulting from DeprecatedString::insert()

Test added: editing/selection/move-by-sentence-001.html

• editing/visible_units.cpp: (WebCore::previousBoundary): (WebCore::nextBoundary): Use a UChar Vector instead of DeprecatedString. Avoid creating an extra string for secure bullet replacement unless it is actually needed.

• platform/DeprecatedString.cpp: (WebCore::DeprecatedString::insert): Call forceUnicode() before setLength(), so that only the unicode buffer is resized.

(WebCore::DeprecatedString::setLength):

Adjust the unicode buffer even if the ascii buffer is valid.

File:

• trunk/JavaScriptCore/wtf/Vector.h (modified) (2 diffs)

trunk/JavaScriptCore/wtf/Vector.h

@@ -445 +445 @@
         template<typename U, size_t c> void append(const Vector<U, c>&);
 
+        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 prepend(const U*, size_t);
+        template<typename U> void prepend(const U&);
+        template<typename U, size_t c> void prepend(const Vector<U, c>&);
 
         void remove(size_t position);
@@ -637 +643 @@
         append(val.begin(), val.size());
     }
-    
+
+    template<typename T, size_t inlineCapacity> template<typename U>
+    void Vector<T, inlineCapacity>::insert(size_t position, const U* data, size_t dataSize)
+    {
+        ASSERT(position <= size());
+        size_t newSize = m_size + dataSize;
+        if (newSize > capacity())
+            data = expandCapacity(newSize, data);
+        T* spot = begin() + position;
+        TypeOperations::moveOverlapping(spot, end(), spot + dataSize);
+        for (size_t i = 0; i < dataSize; ++i)
+            new (&spot[i]) T(data[i]);
+        m_size = newSize;
+    }
+     
     template<typename T, size_t inlineCapacity> template<typename U>
     inline void Vector<T, inlineCapacity>::insert(size_t position, const U& val)
     {
         ASSERT(position <= size());
-        const U* ptr = &val;
+        const U* data = &val;
         if (size() == capacity())
-            ptr = expandCapacity(size() + 1, ptr);
+            data = expandCapacity(size() + 1, data);
         T* spot = begin() + position;
         TypeOperations::moveOverlapping(spot, end(), spot + 1);
-        new (spot) T(*ptr);
+        new (spot) T(*data);
         ++m_size;
     }
-
+   
+    template<typename T, size_t inlineCapacity> template<typename U, size_t c>
+    inline void Vector<T, inlineCapacity>::insert(size_t position, const Vector<U, c>& val)
+    {
+        insert(position, val.begin(), val.size());
+    }
+
+    template<typename T, size_t inlineCapacity> template<typename U>
+    void Vector<T, inlineCapacity>::prepend(const U* data, size_t dataSize)
+    {
+        insert(0, data, dataSize);
+    }
+
+    template<typename T, size_t inlineCapacity> template<typename U>
+    inline void Vector<T, inlineCapacity>::prepend(const U& val)
+    {
+        insert(0, val);
+    }
+   
+    template<typename T, size_t inlineCapacity> template<typename U, size_t c>
+    inline void Vector<T, inlineCapacity>::prepend(const Vector<U, c>& val)
+    {
+        insert(0, val.begin(), val.size());
+    }
+    
     template<typename T, size_t inlineCapacity>
     inline void Vector<T, inlineCapacity>::remove(size_t position)