Changeset 176293 in webkit

Timestamp:

Nov 18, 2014, 4:17:27 PM (12 years ago)

Author:

Chris Dumez

Message:

Have Vector::capacity() return an unsigned instead of a size_t
​https://bugs.webkit.org/show_bug.cgi?id=138842

Reviewed by Andreas Kling.

Source/WebCore:

Update the code base now that Vector::capacity() returns an unsigned
type instead of a size_t.

No new tests, no behavior change.

• editing/TextIterator.cpp:

(WebCore::SearchBuffer::append):
(WebCore::SearchBuffer::prependContext):
(WebCore::SearchBuffer::search):
(WebCore::SearchBuffer::length):

• platform/SharedBuffer.cpp:

(WebCore::SharedBuffer::duplicateDataBufferIfNecessary):

Source/WTF:

Have Vector::capacity() return an unsigned instead of a size_t as
capacity is stored as an unsigned internally.

• wtf/Vector.h:

(WTF::Vector::capacity):
(WTF::OverflowHandler>::expandCapacity):
(WTF::OverflowHandler>::tryExpandCapacity):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Vector.h (modified) (3 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/TextIterator.cpp (modified) (8 diffs)
• WebCore/platform/SharedBuffer.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-11-18  Chris Dumez  <cdumez@apple.com>
+
+        Have Vector::capacity() return an unsigned instead of a size_t
+        https://bugs.webkit.org/show_bug.cgi?id=138842
+
+        Reviewed by Andreas Kling.
+
+        Have Vector::capacity() return an unsigned instead of a size_t as
+        capacity is stored as an unsigned internally.
+
+        * wtf/Vector.h:
+        (WTF::Vector::capacity):
+        (WTF::OverflowHandler>::expandCapacity):
+        (WTF::OverflowHandler>::tryExpandCapacity):
+
 2014-11-18  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WTF/wtf/Vector.h

@@ -611 +611 @@
     size_t size() const { return m_size; }
     static ptrdiff_t sizeMemoryOffset() { return OBJECT_OFFSETOF(Vector, m_size); }
-    size_t capacity() const { return Base::capacity(); }
+    unsigned capacity() const { return Base::capacity(); }
     bool isEmpty() const { return !size(); }
 
@@ -876 +876 @@
 void Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(unsigned newMinCapacity)
 {
-    reserveCapacity(std::max(newMinCapacity, std::max(16u, static_cast<unsigned>(capacity() + capacity() / 4 + 1))));
+    reserveCapacity(std::max(newMinCapacity, std::max(16u, capacity() + capacity() / 4 + 1)));
 }
 
@@ -894 +894 @@
 bool Vector<T, inlineCapacity, OverflowHandler>::tryExpandCapacity(unsigned newMinCapacity)
 {
-    return tryReserveCapacity(std::max(newMinCapacity, std::max(16u, static_cast<unsigned>(capacity() + capacity() / 4 + 1))));
+    return tryReserveCapacity(std::max(newMinCapacity, std::max(16u, capacity() + capacity() / 4 + 1)));
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-18  Chris Dumez  <cdumez@apple.com>
+
+        Have Vector::capacity() return an unsigned instead of a size_t
+        https://bugs.webkit.org/show_bug.cgi?id=138842
+
+        Reviewed by Andreas Kling.
+
+        Update the code base now that Vector::capacity() returns an unsigned
+        type instead of a size_t.
+
+        No new tests, no behavior change.
+
+        * editing/TextIterator.cpp:
+        (WebCore::SearchBuffer::append):
+        (WebCore::SearchBuffer::prependContext):
+        (WebCore::SearchBuffer::search):
+        (WebCore::SearchBuffer::length):
+        * platform/SharedBuffer.cpp:
+        (WebCore::SharedBuffer::duplicateDataBufferIfNecessary):
+
 2014-11-18  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/editing/TextIterator.cpp

@@ -101 +101 @@
 
     Vector<UChar> m_buffer;
-    size_t m_overlap;
-    size_t m_prefixLength;
+    unsigned m_overlap;
+    unsigned m_prefixLength;
     bool m_atBreak;
     bool m_needsMoreContext;
@@ -114 +114 @@
 private:
     void append(UChar, bool isCharacterStart);
-    size_t length() const;
+    unsigned length() const;
 
     String m_target;
@@ -2011 +2011 @@
     } else if (m_buffer.size() == m_buffer.capacity()) {
         memcpy(m_buffer.data(), m_buffer.data() + m_buffer.size() - m_overlap, m_overlap * sizeof(UChar));
-        m_prefixLength -= std::min(m_prefixLength, m_buffer.size() - m_overlap);
+        m_prefixLength -= std::min(m_prefixLength, static_cast<unsigned>(m_buffer.size()) - m_overlap);
         m_buffer.shrink(m_overlap);
     }
 
-    size_t oldLength = m_buffer.size();
-    size_t usableLength = std::min<size_t>(m_buffer.capacity() - oldLength, text.length());
+    unsigned oldLength = m_buffer.size();
+    unsigned usableLength = std::min(m_buffer.capacity() - oldLength, text.length());
     ASSERT(usableLength);
     m_buffer.grow(oldLength + usableLength);
@@ -2039 +2039 @@
     m_atBreak = false;
 
-    size_t wordBoundaryContextStart = text.length();
+    unsigned wordBoundaryContextStart = text.length();
     if (wordBoundaryContextStart) {
         U16_BACK_1(text, 0, wordBoundaryContextStart);
@@ -2045 +2045 @@
     }
 
-    size_t usableLength = std::min(m_buffer.capacity() - m_prefixLength, text.length() - wordBoundaryContextStart);
+    unsigned usableLength = std::min(m_buffer.capacity() - m_prefixLength, text.length() - wordBoundaryContextStart);
     WTF::append(m_buffer, text.substring(text.length() - usableLength, usableLength));
     m_prefixLength += usableLength;
@@ -2191 +2191 @@
 inline size_t SearchBuffer::search(size_t& start)
 {
-    size_t size = m_buffer.size();
+    unsigned size = m_buffer.size();
     if (m_atBreak) {
         if (!size)
@@ -2222 +2222 @@
     // possibly including a combining character that's not yet in the buffer.
     if (!m_atBreak && static_cast<size_t>(matchStart) >= size - m_overlap) {
-        size_t overlap = m_overlap;
+        unsigned overlap = m_overlap;
         if (m_options & AtWordStarts) {
             // Ensure that there is sufficient context before matchStart the next time around for
@@ -2359 +2359 @@
 // That's not necessarily the same length as the passed-in target string, because case folding
 // can make two strings match even though they're not the same length.
-size_t SearchBuffer::length() const
-{
-    size_t bufferSize = m_target.length();
-    size_t length = 0;
-    for (size_t i = 0; i < bufferSize; ++i)
+unsigned SearchBuffer::length() const
+{
+    unsigned bufferSize = m_target.length();
+    unsigned length = 0;
+    for (unsigned i = 0; i < bufferSize; ++i)
         length += m_isCharacterStartBuffer[i];
     return length;

trunk/Source/WebCore/platform/SharedBuffer.cpp

@@ -253 +253 @@
 void SharedBuffer::duplicateDataBufferIfNecessary() const
 {
-    size_t currentCapacity = m_buffer->data.capacity();
+    unsigned currentCapacity = m_buffer->data.capacity();
     if (m_buffer->hasOneRef() || m_size <= currentCapacity)
         return;
 
-    size_t newCapacity = std::max(static_cast<size_t>(m_size), currentCapacity * 2);
+    unsigned newCapacity = std::max(m_size, currentCapacity * 2);
     RefPtr<DataBuffer> newBuffer = adoptRef(new DataBuffer);
     newBuffer->data.reserveInitialCapacity(newCapacity);