[webkit-changes] [176275] trunk/Source

cdumez Tue, 18 Nov 2014 11:56:43 -0800

Title: [176275] trunk/Source

Revision: 176275
Author: [email protected]
Date: 2014-11-18 11:56:01 -0800 (Tue, 18 Nov 2014)

Log Message

Update the Vector API to deal with unsigned types instead of size_t
https://bugs.webkit.org/show_bug.cgi?id=138824


Reviewed by Andreas Kling.

Source/_javascript_Core:

Update code base to fix build errors related to the typing changes
in the Vector API (size_t -> unsigned).

* bytecode/PreciseJumpTargets.cpp:
* replay/EncodedValue.h:

Source/WebCore:

Update code base to fix build errors related to the typing changes
in the Vector API (size_t -> unsigned).

No new tests, no behavior change.

* WebCore.exp.in:
* bindings/js/JSDOMBinding.h:
(WebCore::jsArray):
* bindings/js/JSWebGLRenderingContextCustom.cpp:
* cssjit/SelectorCompiler.cpp:
* html/HTMLFormElement.cpp:
(WebCore::removeFromVector):
* html/parser/HTMLParserIdioms.h:
* html/parser/XSSAuditor.cpp:

Source/WebKit2:

Update code base to fix build errors related to the typing changes
in the Vector API (size_t -> unsigned).

* Platform/IPC/ArgumentCoders.h:
* Platform/IPC/DataReference.h:

Source/WTF:

Update part of the Vector API to deal with unsigned types instead of
size_t. The Vector class is already using unsigned type for its
capacity and size data members. However, the Vector API was never
updated accordingly.

The rest of the Vector API will be ported in follow-up patches to
make the change smaller and more easily reviewable.

* wtf/Forward.h:
* wtf/Vector.h:
(WTF::VectorTypeOperations::compare):
(WTF::VectorBufferBase::allocateBuffer):
(WTF::VectorBufferBase::tryAllocateBuffer):
(WTF::VectorBufferBase::shouldReallocateBuffer):
(WTF::VectorBufferBase::reallocateBuffer):
(WTF::VectorBufferBase::capacity):
(WTF::VectorBufferBase::VectorBufferBase):
(WTF::VectorBuffer::VectorBuffer):
(WTF::VectorBuffer::allocateBuffer):
(WTF::VectorBuffer::tryAllocateBuffer):
(WTF::VectorBuffer::shouldReallocateBuffer):
(WTF::VectorBuffer::reallocateBuffer):
(WTF::VectorBuffer::swap):
(WTF::VectorBuffer::swapInlineBuffer):
(WTF::VectorBuffer::swapInlineBuffers):
(WTF::Vector::Vector):
(WTF::Vector::at):
(WTF::Vector::operator[]):
(WTF::OverflowHandler>::find):
(WTF::OverflowHandler>::reverseFind):
(WTF::OverflowHandler>::fill):
(WTF::OverflowHandler>::expandCapacity):
(WTF::OverflowHandler>::tryExpandCapacity):
(WTF::OverflowHandler>::resize):
(WTF::OverflowHandler>::resizeToFit):
(WTF::OverflowHandler>::shrink):
(WTF::OverflowHandler>::grow):
(WTF::OverflowHandler>::reserveCapacity):
(WTF::OverflowHandler>::tryReserveCapacity):
(WTF::OverflowHandler>::reserveInitialCapacity):
(WTF::OverflowHandler>::shrinkCapacity):
(WTF::OverflowHandler>::append):
(WTF::OverflowHandler>::tryAppend):
(WTF::OverflowHandler>::insert):
(WTF::OverflowHandler>::insertVector):
(WTF::OverflowHandler>::remove):
(WTF::OverflowHandler>::reverse):
(WTF::OverflowHandler>::checkConsistency):
* wtf/text/AtomicString.h:
* wtf/text/StringImpl.h:
(WTF::StringImpl::adopt):
(WTF::equalIgnoringNullity):
* wtf/text/StringView.h:
(WTF::append):
* wtf/text/WTFString.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/bytecode/PreciseJumpTargets.cpp
trunk/Source/_javascript_Core/replay/EncodedValue.h
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Forward.h
trunk/Source/WTF/wtf/Vector.h
trunk/Source/WTF/wtf/text/AtomicString.h
trunk/Source/WTF/wtf/text/StringImpl.h
trunk/Source/WTF/wtf/text/StringView.h
trunk/Source/WTF/wtf/text/WTFString.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/bindings/js/JSDOMBinding.h
trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
trunk/Source/WebCore/cssjit/SelectorCompiler.cpp
trunk/Source/WebCore/html/HTMLFormElement.cpp
trunk/Source/WebCore/html/parser/HTMLParserIdioms.h
trunk/Source/WebCore/html/parser/XSSAuditor.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h
trunk/Source/WebKit2/Platform/IPC/DataReference.h

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (176274 => 176275)


--- trunk/Source/_javascript_Core/ChangeLog	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-11-18 19:56:01 UTC (rev 176275)
@@ -1,3 +1,16 @@
+2014-11-18  Chris Dumez  <[email protected]>
+
+        Update the Vector API to deal with unsigned types instead of size_t
+        https://bugs.webkit.org/show_bug.cgi?id=138824
+
+        Reviewed by Andreas Kling.
+
+        Update code base to fix build errors related to the typing changes
+        in the Vector API (size_t -> unsigned).
+
+        * bytecode/PreciseJumpTargets.cpp:
+        * replay/EncodedValue.h:
+
 2014-11-18  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r176207.

Modified: trunk/Source/_javascript_Core/bytecode/PreciseJumpTargets.cpp (176274 => 176275)


--- trunk/Source/_javascript_Core/bytecode/PreciseJumpTargets.cpp	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/_javascript_Core/bytecode/PreciseJumpTargets.cpp	2014-11-18 19:56:01 UTC (rev 176275)
@@ -30,7 +30,7 @@
 
 namespace JSC {
 
-template <size_t vectorSize>
+template <unsigned vectorSize>
 static void getJumpTargetsForBytecodeOffset(CodeBlock* codeBlock, Interpreter* interpreter, Instruction* instructionsBegin, unsigned bytecodeOffset, Vector<unsigned, vectorSize>& out)
 {
     OpcodeID opcodeID = interpreter->getOpcodeID(instructionsBegin[bytecodeOffset].u.opcode);

Modified: trunk/Source/_javascript_Core/replay/EncodedValue.h (176274 => 176275)


--- trunk/Source/_javascript_Core/replay/EncodedValue.h	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/_javascript_Core/replay/EncodedValue.h	2014-11-18 19:56:01 UTC (rev 176275)
@@ -104,7 +104,7 @@
     static bool decodeValue(EncodedValue&, std::unique_ptr<DecodedType>&);
 };
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 struct EncodingTraits<Vector<T, inlineCapacity, OverflowHandler>> {
     typedef Vector<typename EncodingTraits<T>::DecodedType, inlineCapacity, OverflowHandler> DecodedType;

Modified: trunk/Source/WTF/ChangeLog (176274 => 176275)


--- trunk/Source/WTF/ChangeLog	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WTF/ChangeLog	2014-11-18 19:56:01 UTC (rev 176275)
@@ -1,3 +1,66 @@
+2014-11-18  Chris Dumez  <[email protected]>
+
+        Update the Vector API to deal with unsigned types instead of size_t
+        https://bugs.webkit.org/show_bug.cgi?id=138824
+
+        Reviewed by Andreas Kling.
+
+        Update part of the Vector API to deal with unsigned types instead of
+        size_t. The Vector class is already using unsigned type for its
+        capacity and size data members. However, the Vector API was never
+        updated accordingly.
+
+        The rest of the Vector API will be ported in follow-up patches to
+        make the change smaller and more easily reviewable.
+
+        * wtf/Forward.h:
+        * wtf/Vector.h:
+        (WTF::VectorTypeOperations::compare):
+        (WTF::VectorBufferBase::allocateBuffer):
+        (WTF::VectorBufferBase::tryAllocateBuffer):
+        (WTF::VectorBufferBase::shouldReallocateBuffer):
+        (WTF::VectorBufferBase::reallocateBuffer):
+        (WTF::VectorBufferBase::capacity):
+        (WTF::VectorBufferBase::VectorBufferBase):
+        (WTF::VectorBuffer::VectorBuffer):
+        (WTF::VectorBuffer::allocateBuffer):
+        (WTF::VectorBuffer::tryAllocateBuffer):
+        (WTF::VectorBuffer::shouldReallocateBuffer):
+        (WTF::VectorBuffer::reallocateBuffer):
+        (WTF::VectorBuffer::swap):
+        (WTF::VectorBuffer::swapInlineBuffer):
+        (WTF::VectorBuffer::swapInlineBuffers):
+        (WTF::Vector::Vector):
+        (WTF::Vector::at):
+        (WTF::Vector::operator[]):
+        (WTF::OverflowHandler>::find):
+        (WTF::OverflowHandler>::reverseFind):
+        (WTF::OverflowHandler>::fill):
+        (WTF::OverflowHandler>::expandCapacity):
+        (WTF::OverflowHandler>::tryExpandCapacity):
+        (WTF::OverflowHandler>::resize):
+        (WTF::OverflowHandler>::resizeToFit):
+        (WTF::OverflowHandler>::shrink):
+        (WTF::OverflowHandler>::grow):
+        (WTF::OverflowHandler>::reserveCapacity):
+        (WTF::OverflowHandler>::tryReserveCapacity):
+        (WTF::OverflowHandler>::reserveInitialCapacity):
+        (WTF::OverflowHandler>::shrinkCapacity):
+        (WTF::OverflowHandler>::append):
+        (WTF::OverflowHandler>::tryAppend):
+        (WTF::OverflowHandler>::insert):
+        (WTF::OverflowHandler>::insertVector):
+        (WTF::OverflowHandler>::remove):
+        (WTF::OverflowHandler>::reverse):
+        (WTF::OverflowHandler>::checkConsistency):
+        * wtf/text/AtomicString.h:
+        * wtf/text/StringImpl.h:
+        (WTF::StringImpl::adopt):
+        (WTF::equalIgnoringNullity):
+        * wtf/text/StringView.h:
+        (WTF::append):
+        * wtf/text/WTFString.h:
+
 2014-11-18  [email protected]  <[email protected]>
 
         [WinCairo] Compile errors when GStreamer is enabled.

Modified: trunk/Source/WTF/wtf/Forward.h (176274 => 176275)


--- trunk/Source/WTF/wtf/Forward.h	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WTF/wtf/Forward.h	2014-11-18 19:56:01 UTC (rev 176275)
@@ -36,7 +36,7 @@
 template<typename T> class Ref;
 template<typename T> class StringBuffer;
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler> class Vector;
+template<typename T, unsigned inlineCapacity, typename OverflowHandler> class Vector;
 
 class AtomicString;
 class AtomicStringImpl;

Modified: trunk/Source/WTF/wtf/Vector.h (176274 => 176275)


--- trunk/Source/WTF/wtf/Vector.h	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WTF/wtf/Vector.h	2014-11-18 19:56:01 UTC (rev 176275)
@@ -194,11 +194,12 @@
 template<typename T>
 struct VectorComparer<false, T>
 {
-    static bool compare(const T* a, const T* b, size_t size)
+    static bool compare(const T* a, const T* b, unsigned size)
     {
-        for (size_t i = 0; i < size; ++i)
+        for (unsigned i = 0; i < size; ++i) {
             if (!(a[i] == b[i]))
                 return false;
+        }
         return true;
     }
 };
@@ -206,7 +207,7 @@
 template<typename T>
 struct VectorComparer<true, T>
 {
-    static bool compare(const T* a, const T* b, size_t size)
+    static bool compare(const T* a, const T* b, unsigned size)
     {
         return memcmp(a, b, sizeof(T) * size) == 0;
     }
@@ -245,7 +246,7 @@
         VectorFiller<VectorTraits<T>::canFillWithMemset, T>::uninitializedFill(dst, dstEnd, val);
     }
     
-    static bool compare(const T* a, const T* b, size_t size)
+    static bool compare(const T* a, const T* b, unsigned size)
     {
         return VectorComparer<VectorTraits<T>::canCompareWithMemcmp, T>::compare(a, b, size);
     }
@@ -255,23 +256,23 @@
 class VectorBufferBase {
     WTF_MAKE_NONCOPYABLE(VectorBufferBase);
 public:
-    void allocateBuffer(size_t newCapacity)
+    void allocateBuffer(unsigned newCapacity)
     {
         ASSERT(newCapacity);
         if (newCapacity > std::numeric_limits<unsigned>::max() / sizeof(T))
             CRASH();
-        size_t sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
+        unsigned sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
         m_capacity = sizeToAllocate / sizeof(T);
         m_buffer = static_cast<T*>(fastMalloc(sizeToAllocate));
     }
 
-    bool tryAllocateBuffer(size_t newCapacity)
+    bool tryAllocateBuffer(unsigned newCapacity)
     {
         ASSERT(newCapacity);
         if (newCapacity > std::numeric_limits<unsigned>::max() / sizeof(T))
             return false;
 
-        size_t sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
+        unsigned sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
         T* newBuffer;
         if (tryFastMalloc(sizeToAllocate).getValue(newBuffer)) {
             m_capacity = sizeToAllocate / sizeof(T);
@@ -281,17 +282,17 @@
         return false;
     }
 
-    bool shouldReallocateBuffer(size_t newCapacity) const
+    bool shouldReallocateBuffer(unsigned newCapacity) const
     {
         return VectorTraits<T>::canMoveWithMemcpy && m_capacity && newCapacity;
     }
 
-    void reallocateBuffer(size_t newCapacity)
+    void reallocateBuffer(unsigned newCapacity)
     {
         ASSERT(shouldReallocateBuffer(newCapacity));
-        if (newCapacity > std::numeric_limits<size_t>::max() / sizeof(T))
+        if (newCapacity > std::numeric_limits<unsigned>::max() / sizeof(T))
             CRASH();
-        size_t sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
+        unsigned sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
         m_capacity = sizeToAllocate / sizeof(T);
         m_buffer = static_cast<T*>(fastRealloc(m_buffer, sizeToAllocate));
     }
@@ -312,7 +313,7 @@
     T* buffer() { return m_buffer; }
     const T* buffer() const { return m_buffer; }
     static ptrdiff_t bufferMemoryOffset() { return OBJECT_OFFSETOF(VectorBufferBase, m_buffer); }
-    size_t capacity() const { return m_capacity; }
+    unsigned capacity() const { return m_capacity; }
 
     MallocPtr<T> releaseBuffer()
     {
@@ -330,7 +331,7 @@
     {
     }
 
-    VectorBufferBase(T* buffer, size_t capacity, size_t size)
+    VectorBufferBase(T* buffer, unsigned capacity, unsigned size)
         : m_buffer(buffer)
         , m_capacity(capacity)
         , m_size(size)
@@ -347,7 +348,7 @@
     unsigned m_size; // Only used by the Vector subclass, but placed here to avoid padding the struct.
 };
 
-template<typename T, size_t inlineCapacity>
+template<typename T, unsigned inlineCapacity>
 class VectorBuffer;
 
 template<typename T>
@@ -359,7 +360,7 @@
     {
     }
 
-    VectorBuffer(size_t capacity, size_t size = 0)
+    VectorBuffer(unsigned capacity, unsigned size = 0)
     {
         m_size = size;
         // Calling malloc(0) might take a lock and may actually do an
@@ -373,7 +374,7 @@
         deallocateBuffer(buffer());
     }
     
-    void swap(VectorBuffer<T, 0>& other, size_t, size_t)
+    void swap(VectorBuffer<T, 0>& other, unsigned, unsigned)
     {
         std::swap(m_buffer, other.m_buffer);
         std::swap(m_capacity, other.m_capacity);
@@ -401,7 +402,7 @@
     using Base::m_capacity;
 };
 
-template<typename T, size_t inlineCapacity>
+template<typename T, unsigned inlineCapacity>
 class VectorBuffer : private VectorBufferBase<T> {
     WTF_MAKE_NONCOPYABLE(VectorBuffer);
 private:
@@ -412,7 +413,7 @@
     {
     }
 
-    VectorBuffer(size_t capacity, size_t size = 0)
+    VectorBuffer(unsigned capacity, unsigned size = 0)
         : Base(inlineBuffer(), inlineCapacity, size)
     {
         if (capacity > inlineCapacity)
@@ -424,7 +425,7 @@
         deallocateBuffer(buffer());
     }
 
-    void allocateBuffer(size_t newCapacity)
+    void allocateBuffer(unsigned newCapacity)
     {
         // FIXME: This should ASSERT(!m_buffer) to catch misuse/leaks.
         if (newCapacity > inlineCapacity)
@@ -435,7 +436,7 @@
         }
     }
 
-    bool tryAllocateBuffer(size_t newCapacity)
+    bool tryAllocateBuffer(unsigned newCapacity)
     {
         if (newCapacity > inlineCapacity)
             return Base::tryAllocateBuffer(newCapacity);
@@ -451,19 +452,19 @@
         Base::deallocateBuffer(bufferToDeallocate);
     }
 
-    bool shouldReallocateBuffer(size_t newCapacity) const
+    bool shouldReallocateBuffer(unsigned newCapacity) const
     {
         // We cannot reallocate the inline buffer.
-        return Base::shouldReallocateBuffer(newCapacity) && std::min(static_cast<size_t>(m_capacity), newCapacity) > inlineCapacity;
+        return Base::shouldReallocateBuffer(newCapacity) && std::min(m_capacity, newCapacity) > inlineCapacity;
     }
 
-    void reallocateBuffer(size_t newCapacity)
+    void reallocateBuffer(unsigned newCapacity)
     {
         ASSERT(shouldReallocateBuffer(newCapacity));
         Base::reallocateBuffer(newCapacity);
     }
 
-    void swap(VectorBuffer& other, size_t mySize, size_t otherSize)
+    void swap(VectorBuffer& other, unsigned mySize, unsigned otherSize)
     {
         if (buffer() == inlineBuffer() && other.buffer() == other.inlineBuffer()) {
             swapInlineBuffer(other, mySize, otherSize);
@@ -510,7 +511,7 @@
     using Base::m_buffer;
     using Base::m_capacity;
     
-    void swapInlineBuffer(VectorBuffer& other, size_t mySize, size_t otherSize)
+    void swapInlineBuffer(VectorBuffer& other, unsigned mySize, unsigned otherSize)
     {
         // FIXME: We could make swap part of VectorTypeOperations
         // https://bugs.webkit.org/show_bug.cgi?id=128863
@@ -521,7 +522,7 @@
             swapInlineBuffers(inlineBuffer(), other.inlineBuffer(), mySize, otherSize);
     }
     
-    static void swapInlineBuffers(T* left, T* right, size_t leftSize, size_t rightSize)
+    static void swapInlineBuffers(T* left, T* right, unsigned leftSize, unsigned rightSize)
     {
         if (left == right)
             return;
@@ -529,7 +530,7 @@
         ASSERT(leftSize <= inlineCapacity);
         ASSERT(rightSize <= inlineCapacity);
         
-        size_t swapBound = std::min(leftSize, rightSize);
+        unsigned swapBound = std::min(leftSize, rightSize);
         for (unsigned i = 0; i < swapBound; ++i)
             std::swap(left[i], right[i]);
         VectorTypeOperations<T>::move(left + swapBound, left + leftSize, right + swapBound);
@@ -549,7 +550,7 @@
     }
 };
 
-template<typename T, size_t inlineCapacity = 0, typename OverflowHandler = CrashOnOverflow>
+template<typename T, unsigned inlineCapacity = 0, typename OverflowHandler = CrashOnOverflow>
 class Vector : private VectorBuffer<T, inlineCapacity> {
     WTF_MAKE_FAST_ALLOCATED;
 private:
@@ -569,14 +570,14 @@
     }
 
     // Unlike in std::vector, this constructor does not initialize POD types.
-    explicit Vector(size_t size)
+    explicit Vector(unsigned size)
         : Base(size, size)
     {
         if (begin())
             TypeOperations::initialize(begin(), end());
     }
 
-    Vector(size_t size, const T& val)
+    Vector(unsigned size, const T& val)
         : Base(size, size)
     {
         if (begin())
@@ -597,11 +598,11 @@
     }
 
     Vector(const Vector&);
-    template<size_t otherCapacity, typename otherOverflowBehaviour>
+    template<unsigned otherCapacity, typename otherOverflowBehaviour>
     Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&);
 
     Vector& operator=(const Vector&);
-    template<size_t otherCapacity, typename otherOverflowBehaviour>
+    template<unsigned otherCapacity, typename otherOverflowBehaviour>
     Vector& operator=(const Vector<T, otherCapacity, otherOverflowBehaviour>&);
 
     Vector(Vector&&);
@@ -612,33 +613,33 @@
     size_t capacity() const { return Base::capacity(); }
     bool isEmpty() const { return !size(); }
 
-    T& at(size_t i)
+    T& at(unsigned i)
     {
         if (UNLIKELY(i >= size()))
             OverflowHandler::overflowed();
         return Base::buffer()[i];
     }
-    const T& at(size_t i) const 
+    const T& at(unsigned i) const
     {
         if (UNLIKELY(i >= size()))
             OverflowHandler::overflowed();
         return Base::buffer()[i];
     }
-    T& at(Checked<size_t> i)
+    T& at(Checked<unsigned> i)
     {
         RELEASE_ASSERT(i < size());
         return Base::buffer()[i];
     }
-    const T& at(Checked<size_t> i) const
+    const T& at(Checked<unsigned> i) const
     {
         RELEASE_ASSERT(i < size());
         return Base::buffer()[i];
     }
 
-    T& operator[](size_t i) { return at(i); }
-    const T& operator[](size_t i) const { return at(i); }
-    T& operator[](Checked<size_t> i) { return at(i); }
-    const T& operator[](Checked<size_t> i) const { return at(i); }
+    T& operator[](unsigned i) { return at(i); }
+    const T& operator[](unsigned i) const { return at(i); }
+    T& operator[](Checked<unsigned> i) { return at(i); }
+    const T& operator[](Checked<unsigned> i) const { return at(i); }
 
     T* data() { return Base::buffer(); }
     const T* data() const { return Base::buffer(); }
@@ -670,30 +671,30 @@
     template<typename U> size_t find(const U&) const;
     template<typename U> size_t reverseFind(const U&) const;
 
-    void shrink(size_t size);
-    void grow(size_t size);
-    void resize(size_t size);
-    void resizeToFit(size_t size);
-    void reserveCapacity(size_t newCapacity);
-    bool tryReserveCapacity(size_t newCapacity);
-    void reserveInitialCapacity(size_t initialCapacity);
-    void shrinkCapacity(size_t newCapacity);
+    void shrink(unsigned size);
+    void grow(unsigned size);
+    void resize(unsigned size);
+    void resizeToFit(unsigned size);
+    void reserveCapacity(unsigned newCapacity);
+    bool tryReserveCapacity(unsigned newCapacity);
+    void reserveInitialCapacity(unsigned initialCapacity);
+    void shrinkCapacity(unsigned newCapacity);
     void shrinkToFit() { shrinkCapacity(size()); }
 
     void clear() { shrinkCapacity(0); }
 
-    template<typename U> void append(const U*, size_t);
+    template<typename U> void append(const U*, unsigned);
     template<typename U> void append(U&&);
     template<typename U> void uncheckedAppend(U&& val);
-    template<typename U, size_t otherCapacity> void appendVector(const Vector<U, otherCapacity>&);
-    template<typename U> bool tryAppend(const U*, size_t);
+    template<typename U, unsigned otherCapacity> void appendVector(const Vector<U, otherCapacity>&);
+    template<typename U> bool tryAppend(const U*, unsigned);
 
-    template<typename U> void insert(size_t position, const U*, size_t);
-    template<typename U> void insert(size_t position, U&&);
-    template<typename U, size_t c> void insertVector(size_t position, const Vector<U, c>&);
+    template<typename U> void insert(unsigned position, const U*, unsigned);
+    template<typename U> void insert(unsigned position, U&&);
+    template<typename U, unsigned c> void insertVector(unsigned position, const Vector<U, c>&);
 
-    void remove(size_t position);
-    void remove(size_t position, size_t length);
+    void remove(unsigned position);
+    void remove(unsigned position, unsigned length);
 
     void removeLast() 
     {
@@ -702,7 +703,7 @@
         shrink(size() - 1); 
     }
 
-    void fill(const T&, size_t);
+    void fill(const T&, unsigned);
     void fill(const T& val) { fill(val, size()); }
 
     template<typename Iterator> void appendRange(Iterator start, Iterator end);
@@ -720,11 +721,11 @@
     void checkConsistency();
 
 private:
-    void expandCapacity(size_t newMinCapacity);
-    T* expandCapacity(size_t newMinCapacity, T*);
-    bool tryExpandCapacity(size_t newMinCapacity);
-    const T* tryExpandCapacity(size_t newMinCapacity, const T*);
-    template<typename U> U* expandCapacity(size_t newMinCapacity, U*); 
+    void expandCapacity(unsigned newMinCapacity);
+    T* expandCapacity(unsigned newMinCapacity, T*);
+    bool tryExpandCapacity(unsigned newMinCapacity);
+    const T* tryExpandCapacity(unsigned newMinCapacity, const T*);
+    template<typename U> U* expandCapacity(unsigned newMinCapacity, U*);
     template<typename U> void appendSlowCase(U&&);
 
     using Base::m_size;
@@ -740,7 +741,7 @@
     using Base::releaseBuffer;
 };
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 Vector<T, inlineCapacity, OverflowHandler>::Vector(const Vector& other)
     : Base(other.capacity(), other.size())
 {
@@ -748,8 +749,8 @@
         TypeOperations::uninitializedCopy(other.begin(), other.end(), begin());
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-template<size_t otherCapacity, typename otherOverflowBehaviour>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<unsigned otherCapacity, typename otherOverflowBehaviour>
 Vector<T, inlineCapacity, OverflowHandler>::Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>& other)
     : Base(other.capacity(), other.size())
 {
@@ -757,7 +758,7 @@
         TypeOperations::uninitializedCopy(other.begin(), other.end(), begin());
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 Vector<T, inlineCapacity, OverflowHandler>& Vector<T, inlineCapacity, OverflowHandler>::operator=(const Vector<T, inlineCapacity, OverflowHandler>& other)
 {
     if (&other == this)
@@ -780,8 +781,8 @@
 
 inline bool typelessPointersAreEqual(const void* a, const void* b) { return a == b; }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-template<size_t otherCapacity, typename otherOverflowBehaviour>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<unsigned otherCapacity, typename otherOverflowBehaviour>
 Vector<T, inlineCapacity, OverflowHandler>& Vector<T, inlineCapacity, OverflowHandler>::operator=(const Vector<T, otherCapacity, otherOverflowBehaviour>& other)
 {
     // If the inline capacities match, we should call the more specific
@@ -804,51 +805,51 @@
     return *this;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 inline Vector<T, inlineCapacity, OverflowHandler>::Vector(Vector<T, inlineCapacity, OverflowHandler>&& other)
 {
     swap(other);
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 inline Vector<T, inlineCapacity, OverflowHandler>& Vector<T, inlineCapacity, OverflowHandler>::operator=(Vector<T, inlineCapacity, OverflowHandler>&& other)
 {
     swap(other);
     return *this;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 template<typename U>
 bool Vector<T, inlineCapacity, OverflowHandler>::contains(const U& value) const
 {
     return find(value) != notFound;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 template<typename U>
 size_t Vector<T, inlineCapacity, OverflowHandler>::find(const U& value) const
 {
-    for (size_t i = 0; i < size(); ++i) {
+    for (unsigned i = 0; i < size(); ++i) {
         if (at(i) == value)
             return i;
     }
     return notFound;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 template<typename U>
 size_t Vector<T, inlineCapacity, OverflowHandler>::reverseFind(const U& value) const
 {
-    for (size_t i = 1; i <= size(); ++i) {
-        const size_t index = size() - i;
+    for (unsigned i = 1; i <= size(); ++i) {
+        const unsigned index = size() - i;
         if (at(index) == value)
             return index;
     }
     return notFound;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::fill(const T& val, size_t newSize)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::fill(const T& val, unsigned newSize)
 {
     if (size() > newSize)
         shrink(newSize);
@@ -863,7 +864,7 @@
     m_size = newSize;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 template<typename Iterator>
 void Vector<T, inlineCapacity, OverflowHandler>::appendRange(Iterator start, Iterator end)
 {
@@ -871,53 +872,53 @@
         append(*it);
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(size_t newMinCapacity)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(unsigned newMinCapacity)
 {
-    reserveCapacity(std::max(newMinCapacity, std::max(static_cast<size_t>(16), capacity() + capacity() / 4 + 1)));
+    reserveCapacity(std::max(newMinCapacity, std::max(16u, static_cast<unsigned>(capacity() + capacity() / 4 + 1))));
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-T* Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(size_t newMinCapacity, T* ptr)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+T* Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(unsigned newMinCapacity, T* ptr)
 {
     if (ptr < begin() || ptr >= end()) {
         expandCapacity(newMinCapacity);
         return ptr;
     }
-    size_t index = ptr - begin();
+    unsigned index = ptr - begin();
     expandCapacity(newMinCapacity);
     return begin() + index;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-bool Vector<T, inlineCapacity, OverflowHandler>::tryExpandCapacity(size_t newMinCapacity)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+bool Vector<T, inlineCapacity, OverflowHandler>::tryExpandCapacity(unsigned newMinCapacity)
 {
-    return tryReserveCapacity(std::max(newMinCapacity, std::max(static_cast<size_t>(16), capacity() + capacity() / 4 + 1)));
+    return tryReserveCapacity(std::max(newMinCapacity, std::max(16u, static_cast<unsigned>(capacity() + capacity() / 4 + 1))));
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-const T* Vector<T, inlineCapacity, OverflowHandler>::tryExpandCapacity(size_t newMinCapacity, const T* ptr)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+const T* Vector<T, inlineCapacity, OverflowHandler>::tryExpandCapacity(unsigned newMinCapacity, const T* ptr)
 {
     if (ptr < begin() || ptr >= end()) {
         if (!tryExpandCapacity(newMinCapacity))
             return 0;
         return ptr;
     }
-    size_t index = ptr - begin();
+    unsigned index = ptr - begin();
     if (!tryExpandCapacity(newMinCapacity))
         return 0;
     return begin() + index;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
-inline U* Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(size_t newMinCapacity, U* ptr)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
+inline U* Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(unsigned newMinCapacity, U* ptr)
 {
     expandCapacity(newMinCapacity);
     return ptr;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-inline void Vector<T, inlineCapacity, OverflowHandler>::resize(size_t size)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+inline void Vector<T, inlineCapacity, OverflowHandler>::resize(unsigned size)
 {
     if (size <= m_size)
         TypeOperations::destruct(begin() + size, end());
@@ -931,23 +932,23 @@
     m_size = size;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::resizeToFit(size_t size)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::resizeToFit(unsigned size)
 {
     reserveCapacity(size);
     resize(size);
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::shrink(size_t size)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::shrink(unsigned size)
 {
     ASSERT(size <= m_size);
     TypeOperations::destruct(begin() + size, end());
     m_size = size;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::grow(size_t size)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::grow(unsigned size)
 {
     ASSERT(size >= m_size);
     if (size > capacity())
@@ -957,8 +958,8 @@
     m_size = size;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::reserveCapacity(size_t newCapacity)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::reserveCapacity(unsigned newCapacity)
 {
     if (newCapacity <= capacity())
         return;
@@ -970,8 +971,8 @@
     Base::deallocateBuffer(oldBuffer);
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-bool Vector<T, inlineCapacity, OverflowHandler>::tryReserveCapacity(size_t newCapacity)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+bool Vector<T, inlineCapacity, OverflowHandler>::tryReserveCapacity(unsigned newCapacity)
 {
     if (newCapacity <= capacity())
         return true;
@@ -985,8 +986,8 @@
     return true;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-inline void Vector<T, inlineCapacity, OverflowHandler>::reserveInitialCapacity(size_t initialCapacity)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+inline void Vector<T, inlineCapacity, OverflowHandler>::reserveInitialCapacity(unsigned initialCapacity)
 {
     ASSERT(!m_size);
     ASSERT(capacity() == inlineCapacity);
@@ -994,8 +995,8 @@
         Base::allocateBuffer(initialCapacity);
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::shrinkCapacity(size_t newCapacity)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::shrinkCapacity(unsigned newCapacity)
 {
     if (newCapacity >= capacity())
         return;
@@ -1023,10 +1024,10 @@
 // Templatizing these is better than just letting the conversion happen implicitly,
 // because for instance it allows a PassRefPtr to be appended to a RefPtr vector
 // without refcount thrash.
-template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
-void Vector<T, inlineCapacity, OverflowHandler>::append(const U* data, size_t dataSize)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
+void Vector<T, inlineCapacity, OverflowHandler>::append(const U* data, unsigned dataSize)
 {
-    size_t newSize = m_size + dataSize;
+    unsigned newSize = m_size + dataSize;
     if (newSize > capacity()) {
         data = "" data);
         ASSERT(begin());
@@ -1038,10 +1039,10 @@
     m_size = newSize;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
-bool Vector<T, inlineCapacity, OverflowHandler>::tryAppend(const U* data, size_t dataSize)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
+bool Vector<T, inlineCapacity, OverflowHandler>::tryAppend(const U* data, unsigned dataSize)
 {
-    size_t newSize = m_size + dataSize;
+    unsigned newSize = m_size + dataSize;
     if (newSize > capacity()) {
         data = "" data);
         if (!data)
@@ -1056,7 +1057,7 @@
     return true;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
 ALWAYS_INLINE void Vector<T, inlineCapacity, OverflowHandler>::append(U&& value)
 {
     if (size() != capacity()) {
@@ -1068,7 +1069,7 @@
     appendSlowCase(std::forward<U>(value));
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
 void Vector<T, inlineCapacity, OverflowHandler>::appendSlowCase(U&& value)
 {
     ASSERT(size() == capacity());
@@ -1084,7 +1085,7 @@
 // This version of append saves a branch in the case where you know that the
 // vector's capacity is large enough for the append to succeed.
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
 inline void Vector<T, inlineCapacity, OverflowHandler>::uncheckedAppend(U&& value)
 {
     ASSERT(size() < capacity());
@@ -1094,17 +1095,17 @@
     ++m_size;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U, size_t otherCapacity>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U, unsigned otherCapacity>
 inline void Vector<T, inlineCapacity, OverflowHandler>::appendVector(const Vector<U, otherCapacity>& val)
 {
     append(val.begin(), val.size());
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
-void Vector<T, inlineCapacity, OverflowHandler>::insert(size_t position, const U* data, size_t dataSize)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
+void Vector<T, inlineCapacity, OverflowHandler>::insert(unsigned position, const U* data, unsigned dataSize)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(position <= size());
-    size_t newSize = m_size + dataSize;
+    unsigned newSize = m_size + dataSize;
     if (newSize > capacity()) {
         data = "" data);
         ASSERT(begin());
@@ -1117,8 +1118,8 @@
     m_size = newSize;
 }
  
-template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
-inline void Vector<T, inlineCapacity, OverflowHandler>::insert(size_t position, U&& value)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
+inline void Vector<T, inlineCapacity, OverflowHandler>::insert(unsigned position, U&& value)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(position <= size());
 
@@ -1134,14 +1135,14 @@
     ++m_size;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U, size_t c>
-inline void Vector<T, inlineCapacity, OverflowHandler>::insertVector(size_t position, const Vector<U, c>& val)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U, unsigned c>
+inline void Vector<T, inlineCapacity, OverflowHandler>::insertVector(unsigned position, const Vector<U, c>& val)
 {
     insert(position, val.begin(), val.size());
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-inline void Vector<T, inlineCapacity, OverflowHandler>::remove(size_t position)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+inline void Vector<T, inlineCapacity, OverflowHandler>::remove(unsigned position)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(position < size());
     T* spot = begin() + position;
@@ -1150,8 +1151,8 @@
     --m_size;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-inline void Vector<T, inlineCapacity, OverflowHandler>::remove(size_t position, size_t length)
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+inline void Vector<T, inlineCapacity, OverflowHandler>::remove(unsigned position, unsigned length)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(position <= size());
     ASSERT_WITH_SECURITY_IMPLICATION(position + length <= size());
@@ -1162,14 +1163,14 @@
     m_size -= length;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 inline void Vector<T, inlineCapacity, OverflowHandler>::reverse()
 {
-    for (size_t i = 0; i < m_size / 2; ++i)
+    for (unsigned i = 0; i < m_size / 2; ++i)
         std::swap(at(i), at(m_size - 1 - i));
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 inline MallocPtr<T> Vector<T, inlineCapacity, OverflowHandler>::releaseBuffer()
 {
     auto buffer = Base::releaseBuffer();
@@ -1185,22 +1186,22 @@
     return buffer;
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 inline void Vector<T, inlineCapacity, OverflowHandler>::checkConsistency()
 {
 #if !ASSERT_DISABLED
-    for (size_t i = 0; i < size(); ++i)
+    for (unsigned i = 0; i < size(); ++i)
         ValueCheck<T>::checkConsistency(at(i));
 #endif
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 inline void swap(Vector<T, inlineCapacity, OverflowHandler>& a, Vector<T, inlineCapacity, OverflowHandler>& b)
 {
     a.swap(b);
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 bool operator==(const Vector<T, inlineCapacity, OverflowHandler>& a, const Vector<T, inlineCapacity, OverflowHandler>& b)
 {
     if (a.size() != b.size())
@@ -1209,7 +1210,7 @@
     return VectorTypeOperations<T>::compare(a.data(), b.data(), a.size());
 }
 
-template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<typename T, unsigned inlineCapacity, typename OverflowHandler>
 inline bool operator!=(const Vector<T, inlineCapacity, OverflowHandler>& a, const Vector<T, inlineCapacity, OverflowHandler>& b)
 {
     return !(a == b);

Modified: trunk/Source/WTF/wtf/text/AtomicString.h (176274 => 176275)


--- trunk/Source/WTF/wtf/text/AtomicString.h	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WTF/wtf/text/AtomicString.h	2014-11-18 19:56:01 UTC (rev 176275)
@@ -50,7 +50,7 @@
     AtomicString(const UChar* s, unsigned length, unsigned existingHash) : m_string(add(s, length, existingHash)) { }
     AtomicString(const UChar* s) : m_string(add(s)) { }
 
-    template<size_t inlineCapacity>
+    template<unsigned inlineCapacity>
     explicit AtomicString(const Vector<UChar, inlineCapacity>& characters)
         : m_string(add(characters.data(), characters.size()))
     {

Modified: trunk/Source/WTF/wtf/text/StringImpl.h (176274 => 176275)


--- trunk/Source/WTF/wtf/text/StringImpl.h	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WTF/wtf/text/StringImpl.h	2014-11-18 19:56:01 UTC (rev 176275)
@@ -295,7 +295,7 @@
     WTF_EXPORT_STRING_API static PassRef<StringImpl> create(const UChar*, unsigned length);
     WTF_EXPORT_STRING_API static PassRef<StringImpl> create(const LChar*, unsigned length);
     WTF_EXPORT_STRING_API static PassRef<StringImpl> create8BitIfPossible(const UChar*, unsigned length);
-    template<size_t inlineCapacity>
+    template<unsigned inlineCapacity>
     static PassRef<StringImpl> create8BitIfPossible(const Vector<UChar, inlineCapacity>& vector)
     {
         return create8BitIfPossible(vector.data(), vector.size());
@@ -394,10 +394,10 @@
     static unsigned flagIsAtomic() { return s_hashFlagIsAtomic; }
     static unsigned dataOffset() { return OBJECT_OFFSETOF(StringImpl, m_data8); }
 
-    template<typename CharType, size_t inlineCapacity, typename OverflowHandler>
+    template<typename CharType, unsigned inlineCapacity, typename OverflowHandler>
     static PassRef<StringImpl> adopt(Vector<CharType, inlineCapacity, OverflowHandler>& vector)
     {
-        if (size_t size = vector.size()) {
+        if (unsigned size = vector.size()) {
             ASSERT(vector.data());
             if (size > std::numeric_limits<unsigned>::max())
                 CRASH();
@@ -1252,7 +1252,7 @@
     return WTF::find(characters16(), m_length, character, start);
 }
 
-template<size_t inlineCapacity> inline bool equalIgnoringNullity(const Vector<UChar, inlineCapacity>& a, StringImpl* b)
+template<unsigned inlineCapacity> inline bool equalIgnoringNullity(const Vector<UChar, inlineCapacity>& a, StringImpl* b)
 {
     return equalIgnoringNullity(a.data(), a.size(), b);
 }

Modified: trunk/Source/WTF/wtf/text/StringView.h (176274 => 176275)


--- trunk/Source/WTF/wtf/text/StringView.h	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WTF/wtf/text/StringView.h	2014-11-18 19:56:01 UTC (rev 176275)
@@ -137,7 +137,7 @@
 #endif
 };
 
-template<typename CharacterType, size_t inlineCapacity> void append(Vector<CharacterType, inlineCapacity>&, StringView);
+template<typename CharacterType, unsigned inlineCapacity> void append(Vector<CharacterType, inlineCapacity>&, StringView);
 
 }
 
@@ -442,7 +442,7 @@
     StringView m_string;
 };
 
-template<typename CharacterType, size_t inlineCapacity> void append(Vector<CharacterType, inlineCapacity>& buffer, StringView string)
+template<typename CharacterType, unsigned inlineCapacity> void append(Vector<CharacterType, inlineCapacity>& buffer, StringView string)
 {
     unsigned oldSize = buffer.size();
     buffer.grow(oldSize + string.length());

Modified: trunk/Source/WTF/wtf/text/WTFString.h (176274 => 176275)


--- trunk/Source/WTF/wtf/text/WTFString.h	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WTF/wtf/text/WTFString.h	2014-11-18 19:56:01 UTC (rev 176275)
@@ -97,7 +97,7 @@
     // which will sometimes return a null string when vector.data() is null
     // which can only occur for vectors without inline capacity.
     // See: https://bugs.webkit.org/show_bug.cgi?id=109792
-    template<size_t inlineCapacity, typename OverflowHandler>
+    template<unsigned inlineCapacity, typename OverflowHandler>
     explicit String(const Vector<UChar, inlineCapacity, OverflowHandler>&);
 
     // Construct a string with UTF-16 data, from a null-terminated source.
@@ -141,7 +141,7 @@
 
     static String adopt(StringBuffer<LChar>& buffer) { return StringImpl::adopt(buffer); }
     static String adopt(StringBuffer<UChar>& buffer) { return StringImpl::adopt(buffer); }
-    template<typename CharacterType, size_t inlineCapacity, typename OverflowHandler>
+    template<typename CharacterType, unsigned inlineCapacity, typename OverflowHandler>
     static String adopt(Vector<CharacterType, inlineCapacity, OverflowHandler>& vector) { return StringImpl::adopt(vector); }
 
     bool isNull() const { return !m_impl; }
@@ -407,7 +407,7 @@
 #endif
 
     WTF_EXPORT_STRING_API static String make8BitFrom16BitSource(const UChar*, size_t);
-    template<size_t inlineCapacity>
+    template<unsigned inlineCapacity>
     static String make8BitFrom16BitSource(const Vector<UChar, inlineCapacity>& buffer)
     {
         return make8BitFrom16BitSource(buffer.data(), buffer.size());
@@ -472,9 +472,9 @@
 inline bool operator==(const String& a, const char* b) { return equal(a.impl(), reinterpret_cast<const LChar*>(b)); }
 inline bool operator==(const LChar* a, const String& b) { return equal(a, b.impl()); }
 inline bool operator==(const char* a, const String& b) { return equal(reinterpret_cast<const LChar*>(a), b.impl()); }
-template<size_t inlineCapacity>
+template<unsigned inlineCapacity>
 inline bool operator==(const Vector<char, inlineCapacity>& a, const String& b) { return equal(b.impl(), a.data(), a.size()); }
-template<size_t inlineCapacity>
+template<unsigned inlineCapacity>
 inline bool operator==(const String& a, const Vector<char, inlineCapacity>& b) { return b == a; }
 
 
@@ -483,9 +483,9 @@
 inline bool operator!=(const String& a, const char* b) { return !equal(a.impl(), reinterpret_cast<const LChar*>(b)); }
 inline bool operator!=(const LChar* a, const String& b) { return !equal(a, b.impl()); }
 inline bool operator!=(const char* a, const String& b) { return !equal(reinterpret_cast<const LChar*>(a), b.impl()); }
-template<size_t inlineCapacity>
+template<unsigned inlineCapacity>
 inline bool operator!=(const Vector<char, inlineCapacity>& a, const String& b) { return !(a == b); }
-template<size_t inlineCapacity>
+template<unsigned inlineCapacity>
 inline bool operator!=(const String& a, const Vector<char, inlineCapacity>& b) { return b != a; }
 
 inline bool equalIgnoringCase(const String& a, const String& b) { return equalIgnoringCase(a.impl(), b.impl()); }
@@ -501,7 +501,7 @@
 
 inline bool equalIgnoringNullity(const String& a, const String& b) { return equalIgnoringNullity(a.impl(), b.impl()); }
 
-template<size_t inlineCapacity>
+template<unsigned inlineCapacity>
 inline bool equalIgnoringNullity(const Vector<UChar, inlineCapacity>& a, const String& b) { return equalIgnoringNullity(a, b.impl()); }
 
 inline bool operator!(const String& str) { return str.isNull(); }
@@ -510,7 +510,7 @@
 
 // Definitions of string operations
 
-template<size_t inlineCapacity, typename OverflowHandler>
+template<unsigned inlineCapacity, typename OverflowHandler>
 String::String(const Vector<UChar, inlineCapacity, OverflowHandler>& vector)
     : m_impl(vector.size() ? StringImpl::create(vector.data(), vector.size()) : *StringImpl::empty())
 {

Modified: trunk/Source/WebCore/ChangeLog (176274 => 176275)


--- trunk/Source/WebCore/ChangeLog	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WebCore/ChangeLog	2014-11-18 19:56:01 UTC (rev 176275)
@@ -1,3 +1,25 @@
+2014-11-18  Chris Dumez  <[email protected]>
+
+        Update the Vector API to deal with unsigned types instead of size_t
+        https://bugs.webkit.org/show_bug.cgi?id=138824
+
+        Reviewed by Andreas Kling.
+
+        Update code base to fix build errors related to the typing changes
+        in the Vector API (size_t -> unsigned).
+
+        No new tests, no behavior change.
+
+        * WebCore.exp.in:
+        * bindings/js/JSDOMBinding.h:
+        (WebCore::jsArray):
+        * bindings/js/JSWebGLRenderingContextCustom.cpp:
+        * cssjit/SelectorCompiler.cpp:
+        * html/HTMLFormElement.cpp:
+        (WebCore::removeFromVector):
+        * html/parser/HTMLParserIdioms.h:
+        * html/parser/XSSAuditor.cpp:
+
 2014-11-18  Myles C. Maxfield  <[email protected]>
 
         Unreviewed iOS build fix

Modified: trunk/Source/WebCore/WebCore.exp.in (176274 => 176275)


--- trunk/Source/WebCore/WebCore.exp.in	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-11-18 19:56:01 UTC (rev 176275)
@@ -134,7 +134,7 @@
 __ZN7WebCore11CachedFrame26setCachedFramePlatformDataENSt3__110unique_ptrINS_23CachedFramePlatformDataENS1_14default_deleteIS3_EEEE
 __ZN7WebCore11CachedImage16imageForRendererEPKNS_12RenderObjectE
 __ZN7WebCore11FileChooser10chooseFileERKN3WTF6StringE
-__ZN7WebCore11FileChooser11chooseFilesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore11FileChooser11chooseFilesERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore11FileChooserD1Ev
 __ZN7WebCore11FrameLoader11loadArchiveEN3WTF10PassRefPtrINS_7ArchiveEEE
 __ZN7WebCore11FrameLoader11shouldCloseEv
@@ -162,8 +162,8 @@
 __ZN7WebCore11HistoryItem14setScrollPointERKNS_8IntPointE
 __ZN7WebCore11HistoryItem14setStateObjectEN3WTF10PassRefPtrINS_21SerializedScriptValueEEE
 __ZN7WebCore11HistoryItem15setIsTargetItemEb
-__ZN7WebCore11HistoryItem15setRedirectURLsENSt3__110unique_ptrIN3WTF6VectorINS3_6StringELm0ENS3_15CrashOnOverflowEEENS1_14default_deleteIS7_EEEE
-__ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore11HistoryItem15setRedirectURLsENSt3__110unique_ptrIN3WTF6VectorINS3_6StringELj0ENS3_15CrashOnOverflowEEENS1_14default_deleteIS7_EEEE
+__ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore11HistoryItem17setAlternateTitleERKN3WTF6StringE
 __ZN7WebCore11HistoryItem18setFormContentTypeERKN3WTF6StringE
 __ZN7WebCore11HistoryItem18setPageScaleFactorEf
@@ -199,7 +199,7 @@
 __ZN7WebCore11PageOverlay8setFrameENS_7IntRectE
 __ZN7WebCore11SQLResultOkE
 __ZN7WebCore11URLWithDataEP6NSDataP5NSURL
-__ZN7WebCore11getURLBytesEPK7__CFURLRN3WTF6VectorIcLm512ENS3_15CrashOnOverflowEEE
+__ZN7WebCore11getURLBytesEPK7__CFURLRN3WTF6VectorIcLj512ENS3_15CrashOnOverflowEEE
 __ZN7WebCore11getURLBytesEPK7__CFURLRN3WTF7CStringE
 __ZN7WebCore11iBeamCursorEv
 __ZN7WebCore11memoryCacheEv
@@ -249,7 +249,7 @@
 __ZN7WebCore12SQLResultRowE
 __ZN7WebCore12SharedBuffer10wrapCFDataEPK8__CFData
 __ZN7WebCore12SharedBuffer10wrapNSDataEP6NSData
-__ZN7WebCore12SharedBuffer11adoptVectorERN3WTF6VectorIcLm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore12SharedBuffer11adoptVectorERN3WTF6VectorIcLj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore12SharedBuffer12createCFDataEv
 __ZN7WebCore12SharedBuffer12createNSDataEv
 __ZN7WebCore12SharedBuffer14existingCFDataEv
@@ -288,7 +288,7 @@
 __ZN7WebCore13CharacterData7setDataERKN3WTF6StringERi
 __ZN7WebCore13ContainerNode11appendChildEN3WTF10PassRefPtrINS_4NodeEEERi
 __ZN7WebCore13ContainerNode11removeChildEPNS_4NodeERi
-__ZN7WebCore13GraphicsLayer11setChildrenERKN3WTF6VectorIPS0_Lm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore13GraphicsLayer11setChildrenERKN3WTF6VectorIPS0_Lj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore13GraphicsLayer12replaceChildEPS0_S1_
 __ZN7WebCore13GraphicsLayer12setZPositionEf
 __ZN7WebCore13GraphicsLayer13addChildAboveEPS0_S1_
@@ -347,7 +347,7 @@
 __ZN7WebCore14CachedResource16unregisterHandleEPNS_24CachedResourceHandleBaseE
 __ZN7WebCore14CachedResource21tryReplaceEncodedDataERNS_12SharedBufferE
 __ZN7WebCore14CachedResource9addClientEPNS_20CachedResourceClientE
-__ZN7WebCore14ClientRectListC1ERKN3WTF6VectorINS_9FloatQuadELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore14ClientRectListC1ERKN3WTF6VectorINS_9FloatQuadELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore14ClientRectListC1Ev
 __ZN7WebCore14ClientRectListD1Ev
 __ZN7WebCore14CredentialBaseC2ERKN3WTF6StringES4_NS_21CredentialPersistenceE
@@ -373,7 +373,7 @@
 __ZN7WebCore14DocumentLoaderD2Ev
 __ZN7WebCore14DocumentWriter11setEncodingERKN3WTF6StringEb
 __ZN7WebCore14FileIconLoader14notifyFinishedEN3WTF10PassRefPtrINS_4IconEEE
-__ZN7WebCore14FormController22getReferencedFilePathsERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore14FormController22getReferencedFilePathsERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore14FrameSelection10setFocusedEb
 __ZN7WebCore14FrameSelection12setSelectionERKNS_16VisibleSelectionEjNS0_19CursorAlignOnScrollENS_15TextGranularityE
 __ZN7WebCore14FrameSelection15revealSelectionERKNS_15ScrollAlignmentENS_18RevealExtentOptionE
@@ -386,13 +386,13 @@
 __ZN7WebCore14FrameSelectionC1EPNS_5FrameE
 __ZN7WebCore14LoaderStrategy18createBlobRegistryEv
 __ZN7WebCore14LoaderStrategy21resourceLoadSchedulerEv
-__ZN7WebCore14LoaderStrategy25loadResourceSynchronouslyEPNS_17NetworkingContextEmRKNS_15ResourceRequestENS_17StoredCredentialsENS_22ClientCredentialPolicyERNS_13ResourceErrorERNS_16ResourceResponseERN3WTF6VectorIcLm0ENSC_15CrashOnOverflowEEE
+__ZN7WebCore14LoaderStrategy25loadResourceSynchronouslyEPNS_17NetworkingContextEmRKNS_15ResourceRequestENS_17StoredCredentialsENS_22ClientCredentialPolicyERNS_13ResourceErrorERNS_16ResourceResponseERN3WTF6VectorIcLj0ENSC_15CrashOnOverflowEEE
 __ZN7WebCore14PluginDocument12pluginWidgetEv
 __ZN7WebCore14ResourceHandle12firstRequestEv
 __ZN7WebCore14ResourceHandle16setDefersLoadingEb
 __ZN7WebCore14ResourceHandle20forceContentSniffingEv
 __ZN7WebCore14ResourceHandle23continueWillSendRequestERKNS_15ResourceRequestE
-__ZN7WebCore14ResourceHandle25loadResourceSynchronouslyEPNS_17NetworkingContextERKNS_15ResourceRequestENS_17StoredCredentialsERNS_13ResourceErrorERNS_16ResourceResponseERN3WTF6VectorIcLm0ENSB_15CrashOnOverflowEEE
+__ZN7WebCore14ResourceHandle25loadResourceSynchronouslyEPNS_17NetworkingContextERKNS_15ResourceRequestENS_17StoredCredentialsERNS_13ResourceErrorERNS_16ResourceResponseERN3WTF6VectorIcLj0ENSB_15CrashOnOverflowEEE
 __ZN7WebCore14ResourceHandle26continueDidReceiveResponseEv
 __ZN7WebCore14ResourceHandle26synchronousLoadRunLoopModeEv
 __ZN7WebCore14ResourceHandle45continueCanAuthenticateAgainstProtectionSpaceEb
@@ -457,7 +457,7 @@
 __ZN7WebCore14StorageTracker17initializeTrackerERKN3WTF6StringEPNS_20StorageTrackerClientE
 __ZN7WebCore14StorageTracker18diskUsageForOriginEPNS_14SecurityOriginE
 __ZN7WebCore14StorageTracker32syncFileSystemAndTrackerDatabaseEv
-__ZN7WebCore14StorageTracker7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore14StorageTracker7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore14StorageTracker7trackerEv
 __ZN7WebCore14SubframeLoader12allowPluginsENS_28ReasonForCallingAllowPluginsE
 __ZN7WebCore14TileController14setTilesOpaqueEb
@@ -489,8 +489,8 @@
 __ZN7WebCore15BackForwardList11forwardItemEv
 __ZN7WebCore15BackForwardList11setCapacityEi
 __ZN7WebCore15BackForwardList12containsItemEPNS_11HistoryItemE
-__ZN7WebCore15BackForwardList17backListWithLimitEiRN3WTF6VectorINS1_6RefPtrINS_11HistoryItemEEELm0ENS1_15CrashOnOverflowEEE
-__ZN7WebCore15BackForwardList20forwardListWithLimitEiRN3WTF6VectorINS1_6RefPtrINS_11HistoryItemEEELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore15BackForwardList17backListWithLimitEiRN3WTF6VectorINS1_6RefPtrINS_11HistoryItemEEELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore15BackForwardList20forwardListWithLimitEiRN3WTF6VectorINS1_6RefPtrINS_11HistoryItemEEELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore15BackForwardList6closedEv
 __ZN7WebCore15BackForwardList6goBackEv
 __ZN7WebCore15BackForwardList7enabledEv
@@ -509,10 +509,10 @@
 __ZN7WebCore15DatabaseManager14usageForOriginEPNS_14SecurityOriginE
 __ZN7WebCore15DatabaseManager16hasOpenDatabasesEPNS_22ScriptExecutionContextE
 __ZN7WebCore15DatabaseManager18deleteAllDatabasesEv
-__ZN7WebCore15DatabaseManager22databaseNamesForOriginEPNS_14SecurityOriginERN3WTF6VectorINS3_6StringELm0ENS3_15CrashOnOverflowEEE
+__ZN7WebCore15DatabaseManager22databaseNamesForOriginEPNS_14SecurityOriginERN3WTF6VectorINS3_6StringELj0ENS3_15CrashOnOverflowEEE
 __ZN7WebCore15DatabaseManager23detailsForNameAndOriginERKN3WTF6StringEPNS_14SecurityOriginE
 __ZN7WebCore15DatabaseManager7managerEv
-__ZN7WebCore15DatabaseManager7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore15DatabaseManager7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore15DatabaseManager8setQuotaEPNS_14SecurityOriginEy
 __ZN7WebCore15DatabaseManager9setClientEPNS_21DatabaseManagerClientE
 __ZN7WebCore15FocusController10setFocusedEb
@@ -555,7 +555,7 @@
 __ZN7WebCore15GraphicsLayerCA10initializeEv
 __ZN7WebCore15GraphicsLayerCA10setFiltersERKNS_16FilterOperationsE
 __ZN7WebCore15GraphicsLayerCA10setOpacityEf
-__ZN7WebCore15GraphicsLayerCA11setChildrenERKN3WTF6VectorIPNS_13GraphicsLayerELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore15GraphicsLayerCA11setChildrenERKN3WTF6VectorIPNS_13GraphicsLayerELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore15GraphicsLayerCA11setPositionERKNS_10FloatPointE
 __ZN7WebCore15GraphicsLayerCA12addAnimationERKNS_17KeyframeValueListERKNS_9FloatSizeEPKNS_9AnimationERKN3WTF6StringEd
 __ZN7WebCore15GraphicsLayerCA12replaceChildEPNS_13GraphicsLayerES2_
@@ -620,7 +620,7 @@
 __ZN7WebCore15PasteboardImageC1Ev
 __ZN7WebCore15PasteboardImageD1Ev
 __ZN7WebCore15PlatformCALayer15platformCALayerEPv
-__ZN7WebCore15PlatformCALayer17drawLayerContentsEP9CGContextPS0_RN3WTF6VectorINS_9FloatRectELm5ENS4_15CrashOnOverflowEEE
+__ZN7WebCore15PlatformCALayer17drawLayerContentsEP9CGContextPS0_RN3WTF6VectorINS_9FloatRectELj5ENS4_15CrashOnOverflowEEE
 __ZN7WebCore15PlatformCALayerC2ENS0_9LayerTypeEPNS_21PlatformCALayerClientE
 __ZN7WebCore15PlatformCALayerD2Ev
 __ZN7WebCore15ProtectionSpaceC1EP20NSURLProtectionSpace
@@ -636,8 +636,8 @@
 __ZN7WebCore15SQLiteStatement14executeCommandEv
 __ZN7WebCore15SQLiteStatement14getColumnInt64Ei
 __ZN7WebCore15SQLiteStatement21getColumnBlobAsStringEi
-__ZN7WebCore15SQLiteStatement21getColumnBlobAsVectorEiRN3WTF6VectorIcLm0ENS1_15CrashOnOverflowEEE
-__ZN7WebCore15SQLiteStatement21getColumnBlobAsVectorEiRN3WTF6VectorIhLm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore15SQLiteStatement21getColumnBlobAsVectorEiRN3WTF6VectorIcLj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore15SQLiteStatement21getColumnBlobAsVectorEiRN3WTF6VectorIhLj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore15SQLiteStatement22isColumnDeclaredAsBlobEi
 __ZN7WebCore15SQLiteStatement4stepEv
 __ZN7WebCore15SQLiteStatement5resetEv
@@ -702,7 +702,7 @@
 __ZN7WebCore16IconDatabaseBase4openERKN3WTF6StringES4_
 __ZN7WebCore16LegacyWebArchive19createFromSelectionEPNS_5FrameE
 __ZN7WebCore16LegacyWebArchive21rawDataRepresentationEv
-__ZN7WebCore16LegacyWebArchive6createEN3WTF10PassRefPtrINS_15ArchiveResourceEEENS1_6VectorINS1_6RefPtrIS3_EELm0ENS1_15CrashOnOverflowEEENS5_INS6_IS0_EELm0ES8_EE
+__ZN7WebCore16LegacyWebArchive6createEN3WTF10PassRefPtrINS_15ArchiveResourceEEENS1_6VectorINS1_6RefPtrIS3_EELj0ENS1_15CrashOnOverflowEEENS5_INS6_IS0_EELj0ES8_EE
 __ZN7WebCore16LegacyWebArchive6createEPNS_12SharedBufferE
 __ZN7WebCore16LegacyWebArchive6createEPNS_4NodeENSt3__18functionIFbRNS_5FrameEEEE
 __ZN7WebCore16LegacyWebArchive6createEPNS_5FrameE
@@ -799,14 +799,14 @@
 __ZN7WebCore18PlatformPasteboard13stringForTypeERKN3WTF6StringE
 __ZN7WebCore18PlatformPasteboard16setBufferForTypeEN3WTF10PassRefPtrINS_12SharedBufferEEERKNS1_6StringE
 __ZN7WebCore18PlatformPasteboard16setStringForTypeERKN3WTF6StringES4_
-__ZN7WebCore18PlatformPasteboard19getPathnamesForTypeERN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEERKS3_
-__ZN7WebCore18PlatformPasteboard19setPathnamesForTypeERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEERKS3_
+__ZN7WebCore18PlatformPasteboard19getPathnamesForTypeERN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEERKS3_
+__ZN7WebCore18PlatformPasteboard19setPathnamesForTypeERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEERKS3_
 __ZN7WebCore18PlatformPasteboard3urlEv
 __ZN7WebCore18PlatformPasteboard4copyERKN3WTF6StringE
 __ZN7WebCore18PlatformPasteboard5colorEv
-__ZN7WebCore18PlatformPasteboard8addTypesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
-__ZN7WebCore18PlatformPasteboard8getTypesERN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
-__ZN7WebCore18PlatformPasteboard8setTypesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore18PlatformPasteboard8addTypesERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore18PlatformPasteboard8getTypesERN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore18PlatformPasteboard8setTypesERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore18PlatformPasteboardC1ERKN3WTF6StringE
 __ZN7WebCore18ScriptGlobalObject3setEPN3JSC9ExecStateEPKcPNS_21InspectorFrontendHostE
 __ZN7WebCore18StyleSheetContents11parseStringERKN3WTF6StringE
@@ -944,11 +944,11 @@
 __ZN7WebCore21ResourceLoadSchedulerC2Ev
 __ZN7WebCore21ResourceLoadSchedulerD2Ev
 __ZN7WebCore21SerializedScriptValue11deserializeEPK15OpaqueJSContextPPK13OpaqueJSValue
-__ZN7WebCore21SerializedScriptValue11deserializeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectEPN3WTF6VectorINS6_6RefPtrINS_11MessagePortEEELm1ENS6_15CrashOnOverflowEEENS_22SerializationErrorModeE
+__ZN7WebCore21SerializedScriptValue11deserializeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectEPN3WTF6VectorINS6_6RefPtrINS_11MessagePortEEELj1ENS6_15CrashOnOverflowEEENS_22SerializationErrorModeE
 __ZN7WebCore21SerializedScriptValue6createEPK15OpaqueJSContextPK13OpaqueJSValuePS6_
-__ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueEPN3WTF6VectorINS5_6RefPtrINS_11MessagePortEEELm1ENS5_15CrashOnOverflowEEEPNS6_INS7_INS1_11ArrayBufferEEELm1ESA_EENS_22SerializationErrorModeE
+__ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueEPN3WTF6VectorINS5_6RefPtrINS_11MessagePortEEELj1ENS5_15CrashOnOverflowEEEPNS6_INS7_INS1_11ArrayBufferEEELj1ESA_EENS_22SerializationErrorModeE
 __ZN7WebCore21SerializedScriptValue6createERKN3WTF6StringE
-__ZN7WebCore21SerializedScriptValueC1ERN3WTF6VectorIhLm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore21SerializedScriptValueC1ERN3WTF6VectorIhLj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore21SerializedScriptValueD1Ev
 __ZN7WebCore21URLByRemovingUserInfoEP5NSURL
 __ZN7WebCore21UserContentController13addUserScriptERNS_15DOMWrapperWorldENSt3__110unique_ptrINS_10UserScriptENS3_14default_deleteIS5_EEEE
@@ -993,7 +993,7 @@
 __ZN7WebCore22RuntimeEnabledFeatures14sharedFeaturesEv
 __ZN7WebCore22ScriptExecutionContext26canSuspendActiveDOMObjectsEv
 __ZN7WebCore22ScriptExecutionContext2vmEv
-__ZN7WebCore22StorageEventDispatcher34dispatchLocalStorageEventsToFramesERNS_9PageGroupERKN3WTF6VectorINS3_6RefPtrINS_5FrameEEELm0ENS3_15CrashOnOverflowEEERKNS3_6StringESE_SE_SE_PNS_14SecurityOriginE
+__ZN7WebCore22StorageEventDispatcher34dispatchLocalStorageEventsToFramesERNS_9PageGroupERKN3WTF6VectorINS3_6RefPtrINS_5FrameEEELj0ENS3_15CrashOnOverflowEEERKNS3_6StringESE_SE_SE_PNS_14SecurityOriginE
 __ZN7WebCore22URLByCanonicalizingURLEP5NSURL
 __ZN7WebCore22URLWithUserTypedStringEP8NSStringP5NSURL
 __ZN7WebCore22WheelEventDeltaTracker17endTrackingDeltasEv
@@ -1088,7 +1088,7 @@
 __ZN7WebCore29isCharacterSmartReplaceExemptEib
 __ZN7WebCore30hostNameNeedsDecodingWithRangeEP8NSString8_NSRange
 __ZN7WebCore30hostNameNeedsEncodingWithRangeEP8NSString8_NSRange
-__ZN7WebCore30overrideUserPreferredLanguagesERKN3WTF6VectorINS0_6StringELm0ENS0_15CrashOnOverflowEEE
+__ZN7WebCore30overrideUserPreferredLanguagesERKN3WTF6VectorINS0_6StringELj0ENS0_15CrashOnOverflowEEE
 __ZN7WebCore31CrossOriginPreflightResultCache5emptyEv
 __ZN7WebCore31CrossOriginPreflightResultCache6sharedEv
 __ZN7WebCore31equalIgnoringFragmentIdentifierERKNS_3URLES2_
@@ -1119,7 +1119,7 @@
 __ZN7WebCore4FontC1ERKNS_16FontPlatformDataEbNS_17FontSmoothingModeE
 __ZN7WebCore4FontC1Ev
 __ZN7WebCore4FontaSERKS0_
-__ZN7WebCore4Icon18createIconForFilesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore4Icon18createIconForFilesERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore4IconD1Ev
 __ZN7WebCore4Node10renderRectEPb
 __ZN7WebCore4Node11appendChildEN3WTF10PassRefPtrIS0_EERi
@@ -1162,7 +1162,7 @@
 __ZN7WebCore4Page22removeLayoutMilestonesEj
 __ZN7WebCore4Page23clearUndoRedoOperationsEv
 __ZN7WebCore4Page23invalidateStylesForLinkEy
-__ZN7WebCore4Page24findStringMatchingRangesERKN3WTF6StringEhiRNS1_6VectorINS1_6RefPtrINS_5RangeEEELm0ENS1_15CrashOnOverflowEEERi
+__ZN7WebCore4Page24findStringMatchingRangesERKN3WTF6StringEhiRNS1_6VectorINS1_6RefPtrINS_5RangeEEELj0ENS1_15CrashOnOverflowEEERi
 __ZN7WebCore4Page24resumeScriptedAnimationsEv
 __ZN7WebCore4Page24scrollingStateTreeAsTextEv
 __ZN7WebCore4Page25suspendScriptedAnimationsEv
@@ -1234,7 +1234,7 @@
 __ZN7WebCore6Editor10insertTextERKN3WTF6StringEPNS_5EventE
 __ZN7WebCore6Editor13performDeleteEv
 __ZN7WebCore6Editor13rangeForPointERKNS_8IntPointE
-__ZN7WebCore6Editor14setCompositionERKN3WTF6StringERKNS1_6VectorINS_20CompositionUnderlineELm0ENS1_15CrashOnOverflowEEEjj
+__ZN7WebCore6Editor14setCompositionERKN3WTF6StringERKNS1_6VectorINS_20CompositionUnderlineELj0ENS1_15CrashOnOverflowEEEjj
 __ZN7WebCore6Editor14simplifyMarkupEPNS_4NodeES2_
 __ZN7WebCore6Editor15pasteAsFragmentEN3WTF10PassRefPtrINS_16DocumentFragmentEEEbbNS_22MailBlockquoteHandlingE
 __ZN7WebCore6Editor16pasteAsPlainTextEv
@@ -1242,8 +1242,8 @@
 __ZN7WebCore6Editor17insertOrderedListEv
 __ZN7WebCore6Editor18confirmCompositionERKN3WTF6StringE
 __ZN7WebCore6Editor18confirmCompositionEv
-__ZN7WebCore6Editor18insertDictatedTextERKN3WTF6StringERKNS1_6VectorINS_20DictationAlternativeELm0ENS1_15CrashOnOverflowEEEPNS_5EventE
-__ZN7WebCore6Editor19countMatchesForTextERKN3WTF6StringEPNS_5RangeEhjbPNS1_6VectorINS1_6RefPtrIS5_EELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore6Editor18insertDictatedTextERKN3WTF6StringERKNS1_6VectorINS_20DictationAlternativeELj0ENS1_15CrashOnOverflowEEEPNS_5EventE
+__ZN7WebCore6Editor19countMatchesForTextERKN3WTF6StringEPNS_5RangeEhjbPNS1_6VectorINS1_6RefPtrIS5_EELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore6Editor19deleteWithDirectionENS_18SelectionDirectionENS_15TextGranularityEbb
 __ZN7WebCore6Editor19insertUnorderedListEv
 __ZN7WebCore6Editor21applyStyleToSelectionEPNS_15StylePropertiesENS_10EditActionE
@@ -1415,7 +1415,7 @@
 __ZN7WebCore8blankURLEv
 __ZN7WebCore8makeRGBAEiiii
 __ZN7WebCore8openFileERKN3WTF6StringENS_12FileOpenModeE
-__ZN7WebCore8toStringERKN3WTF6VectorINS_11ProxyServerELm0ENS0_15CrashOnOverflowEEE
+__ZN7WebCore8toStringERKN3WTF6VectorINS_11ProxyServerELj0ENS0_15CrashOnOverflowEEE
 __ZN7WebCore8toUInt16EPN3JSC9ExecStateENS0_7JSValueENS_30IntegerConversionConfigurationE
 __ZN7WebCore8toUInt64EPN3JSC9ExecStateENS0_7JSValueENS_30IntegerConversionConfigurationE
 __ZN7WebCore9AnimationC1Ev
@@ -1550,10 +1550,10 @@
 __ZN7WebCore9PageGroup16syncLocalStorageEv
 __ZN7WebCore9PageGroup17closeLocalStorageEv
 __ZN7WebCore9PageGroup18addVisitedLinkHashEy
-__ZN7WebCore9PageGroup20addUserScriptToWorldERNS_15DOMWrapperWorldERKN3WTF6StringERKNS_3URLERKNS3_6VectorIS4_Lm0ENS3_15CrashOnOverflowEEESE_NS_23UserScriptInjectionTimeENS_25UserContentInjectedFramesE
+__ZN7WebCore9PageGroup20addUserScriptToWorldERNS_15DOMWrapperWorldERKN3WTF6StringERKNS_3URLERKNS3_6VectorIS4_Lj0ENS3_15CrashOnOverflowEEESE_NS_23UserScriptInjectionTimeENS_25UserContentInjectedFramesE
 __ZN7WebCore9PageGroup20removeAllUserContentEv
 __ZN7WebCore9PageGroup21removeAllVisitedLinksEv
-__ZN7WebCore9PageGroup24addUserStyleSheetToWorldERNS_15DOMWrapperWorldERKN3WTF6StringERKNS_3URLERKNS3_6VectorIS4_Lm0ENS3_15CrashOnOverflowEEESE_NS_25UserContentInjectedFramesENS_14UserStyleLevelENS_22UserStyleInjectionTimeE
+__ZN7WebCore9PageGroup24addUserStyleSheetToWorldERNS_15DOMWrapperWorldERKN3WTF6StringERKNS_3URLERKNS3_6VectorIS4_Lj0ENS3_15CrashOnOverflowEEESE_NS_25UserContentInjectedFramesENS_14UserStyleLevelENS_22UserStyleInjectionTimeE
 __ZN7WebCore9PageGroup25removeUserScriptFromWorldERNS_15DOMWrapperWorldERKNS_3URLE
 __ZN7WebCore9PageGroup26removeUserScriptsFromWorldERNS_15DOMWrapperWorldE
 __ZN7WebCore9PageGroup26setShouldTrackVisitedLinksEb
@@ -1580,7 +1580,7 @@
 __ZN7WebCore9makeRangeERKNS_15VisiblePositionES2_
 __ZN7WebCore9pageCacheEv
 __ZN7WebCore9plainTextEPKNS_5RangeEtb
-__ZN7WebCore9unionRectERKN3WTF6VectorINS_9FloatRectELm0ENS0_15CrashOnOverflowEEE
+__ZN7WebCore9unionRectERKN3WTF6VectorINS_9FloatRectELj0ENS0_15CrashOnOverflowEEE
 __ZNK3JSC8Bindings10RootObject12globalObjectEv
 __ZNK3WTF6String14createCFStringEv
 __ZNK7WebCore10Credential12nsCredentialEv
@@ -1733,7 +1733,7 @@
 __ZNK7WebCore14FrameSelection15copyTypingStyleEv
 __ZNK7WebCore14FrameSelection15selectionBoundsEb
 __ZNK7WebCore14FrameSelection18isFocusedAndActiveEv
-__ZNK7WebCore14FrameSelection31getClippedVisibleTextRectanglesERN3WTF6VectorINS_9FloatRectELm0ENS1_15CrashOnOverflowEEE
+__ZNK7WebCore14FrameSelection31getClippedVisibleTextRectanglesERN3WTF6VectorINS_9FloatRectELj0ENS1_15CrashOnOverflowEEE
 __ZNK7WebCore14FrameSelection36rootEditableElementOrDocumentElementEv
 __ZNK7WebCore14InsertionPoint8isActiveEv
 __ZNK7WebCore14RenderListItem10markerTextEv
@@ -1945,7 +1945,7 @@
 __ZNK7WebCore4Node14isDescendantOfEPKS0_
 __ZNK7WebCore4Node16computeNodeIndexEv
 __ZNK7WebCore4Node28deprecatedShadowAncestorNodeEv
-__ZNK7WebCore4Node9textRectsERN3WTF6VectorINS_7IntRectELm0ENS1_15CrashOnOverflowEEE
+__ZNK7WebCore4Node9textRectsERN3WTF6VectorINS_7IntRectELj0ENS1_15CrashOnOverflowEEE
 __ZNK7WebCore4Page10pluginDataEv
 __ZNK7WebCore4Page14renderTreeSizeEv
 __ZNK7WebCore4Page15visibilityStateEv
@@ -1981,8 +1981,8 @@
 __ZNK7WebCore5Range9collapsedERi
 __ZNK7WebCore5Range9endOffsetERi
 __ZNK7WebCore5Range9firstNodeEv
-__ZNK7WebCore5Range9textQuadsERN3WTF6VectorINS_9FloatQuadELm0ENS1_15CrashOnOverflowEEEbPNS0_20RangeInFixedPositionE
-__ZNK7WebCore5Range9textRectsERN3WTF6VectorINS_7IntRectELm0ENS1_15CrashOnOverflowEEEbPNS0_20RangeInFixedPositionE
+__ZNK7WebCore5Range9textQuadsERN3WTF6VectorINS_9FloatQuadELj0ENS1_15CrashOnOverflowEEEbPNS0_20RangeInFixedPositionE
+__ZNK7WebCore5Range9textRectsERN3WTF6VectorINS_7IntRectELj0ENS1_15CrashOnOverflowEEEbPNS0_20RangeInFixedPositionE
 __ZNK7WebCore6Chrome10windowRectEv
 __ZNK7WebCore6Chrome12createWindowEPNS_5FrameERKNS_16FrameLoadRequestERKNS_14WindowFeaturesERKNS_16NavigationActionE
 __ZNK7WebCore6Chrome13setWindowRectERKNS_9FloatRectE
@@ -2298,7 +2298,7 @@
 __ZN7WebCore12EventHandler8keyEventEP7NSEvent
 __ZN7WebCore12EventHandler9mouseDownEP7NSEvent
 __ZN7WebCore13DataDetection29detectItemAroundHitTestResultERKNS_13HitTestResultERNS_9FloatRectERN3WTF6RefPtrINS_5RangeEEE
-__ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELm0ENS6_15CrashOnOverflowEEE
+__ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELj0ENS6_15CrashOnOverflowEEE
 __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
 __ZN7WebCore14cookiesEnabledERKNS_21NetworkStorageSessionERKNS_3URLES5_
 __ZN7WebCore15ResourceRequest41updateFromDelegatePreservingOldPropertiesERKS0_
@@ -2495,7 +2495,7 @@
 __ZN7WebCore27AlternativeTextUIController18removeAlternativesEy
 __ZN7WebCore27AlternativeTextUIController22alternativesForContextEy
 __ZN7WebCore27AlternativeTextUIController5clearEv
-__ZN7WebCore32collectDictationTextAlternativesEP18NSAttributedStringRN3WTF6VectorINS_24TextAlternativeWithRangeELm0ENS2_15CrashOnOverflowEEE
+__ZN7WebCore32collectDictationTextAlternativesEP18NSAttributedStringRN3WTF6VectorINS_24TextAlternativeWithRangeELj0ENS2_15CrashOnOverflowEEE
 _wkCGContextDrawsWithCorrectShadowOffsets
 _wkExecutableWasLinkedOnOrBeforeLion
 _wkNSElasticDeltaForReboundDelta
@@ -2584,7 +2584,7 @@
 __ZN7WebCore11BidiContext6createEh14UCharDirectionbNS_19BidiEmbeddingSourceEPS0_
 __ZN7WebCore11CachedImage5imageEv
 __ZN7WebCore11EditCommand18setEndingSelectionERKNS_16VisibleSelectionE
-__ZN7WebCore11FileChooser16chooseMediaFilesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEERKS3_PNS_4IconE
+__ZN7WebCore11FileChooser16chooseMediaFilesERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEERKS3_PNS_4IconE
 __ZN7WebCore11Geolocation29resetAllGeolocationPermissionEv
 __ZN7WebCore11MathMLNames4initEv
 __ZN7WebCore11MemoryCache18pruneDeadResourcesEv
@@ -2606,7 +2606,7 @@
 __ZN7WebCore13endOfDocumentEPKNS_4NodeE
 __ZN7WebCore13endOfDocumentERKNS_15VisiblePositionE
 __ZN7WebCore13endOfSentenceERKNS_15VisiblePositionE
-__ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELm0ENS6_15CrashOnOverflowEEE
+__ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELj0ENS6_15CrashOnOverflowEEE
 __ZN7WebCore13isStartOfLineERKNS_15VisiblePositionE
 __ZN7WebCore14DocumentLoader19setResponseMIMETypeERKN3WTF6StringE
 __ZN7WebCore14DocumentWriter3endEv
@@ -2756,18 +2756,18 @@
 __ZN7WebCore5Frame45setRangedSelectionBaseToCurrentSelectionStartEv
 __ZN7WebCore5Frame52setRangedSelectionInitialExtentToCurrentSelectionEndEv
 __ZN7WebCore5Frame54setRangedSelectionInitialExtentToCurrentSelectionStartEv
-__ZN7WebCore5Range21collectSelectionRectsERN3WTF6VectorINS_13SelectionRectELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore5Range21collectSelectionRectsERN3WTF6VectorINS_13SelectionRectELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore5Range6createERNS_8DocumentERKNS_15VisiblePositionES5_
 __ZN7WebCore5Range6createERNS_8DocumentERKNS_8PositionES5_
 __ZN7WebCore5Range6setEndERKNS_8PositionERi
 __ZN7WebCore5Range8setStartERKNS_8PositionERi
 __ZN7WebCore6Chrome11focusNSViewEP7WAKView
 __ZN7WebCore6Editor17confirmMarkedTextEv
-__ZN7WebCore6Editor22insertDictationPhrasesEN3WTF10PassOwnPtrINS1_6VectorINS3_INS1_6StringELm0ENS1_15CrashOnOverflowEEELm0ES5_EEEENS1_9RetainPtrIP11objc_objectEE
+__ZN7WebCore6Editor22insertDictationPhrasesEN3WTF10PassOwnPtrINS1_6VectorINS3_INS1_6StringELj0ENS1_15CrashOnOverflowEEELj0ES5_EEEENS1_9RetainPtrIP11objc_objectEE
 __ZN7WebCore6Editor23setTextAsChildOfElementERKN3WTF6StringEPNS_7ElementE
 __ZN7WebCore6Editor24removeUnchangeableStylesEv
 __ZN7WebCore6Editor33markMisspellingsAfterTypingToWordERKNS_15VisiblePositionERKNS_16VisibleSelectionEb
-__ZN7WebCore6Editor35setDictationPhrasesAsChildOfElementEN3WTF10PassOwnPtrINS1_6VectorINS3_INS1_6StringELm0ENS1_15CrashOnOverflowEEELm0ES5_EEEENS1_9RetainPtrIP11objc_objectEEPNS_7ElementE
+__ZN7WebCore6Editor35setDictationPhrasesAsChildOfElementEN3WTF10PassOwnPtrINS1_6VectorINS3_INS1_6StringELj0ENS1_15CrashOnOverflowEEELj0ES5_EEEENS1_9RetainPtrIP11objc_objectEEPNS_7ElementE
 __ZN7WebCore6Editor46setTextAlignmentForChangedBaseWritingDirectionE16WritingDirection
 __ZN7WebCore6Editor59ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTypingEv
 __ZN7WebCore6Widget17setPlatformWidgetEP7WAKView
@@ -2871,9 +2871,9 @@
 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
 __ZN7WebCore15ProtectionSpace28encodingRequiresPlatformDataEP20NSURLProtectionSpace
 __ZN7WebCore16DiskCacheMonitorC2ERKNS_15ResourceRequestENS_9SessionIDEPK20_CFCachedURLResponse
-__ZN7WebCore23wrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
-__ZN7WebCore25unwrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
-__ZN7WebCore28getDefaultWebCryptoMasterKeyERN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEE
+__ZN7WebCore23wrapSerializedCryptoKeyERKN3WTF6VectorIhLj0ENS0_15CrashOnOverflowEEES5_RS3_
+__ZN7WebCore25unwrapSerializedCryptoKeyERKN3WTF6VectorIhLj0ENS0_15CrashOnOverflowEEES5_RS3_
+__ZN7WebCore28getDefaultWebCryptoMasterKeyERN3WTF6VectorIhLj0ENS0_15CrashOnOverflowEEE
 __ZTVN7WebCore16DiskCacheMonitorE
 #endif
 
@@ -3038,8 +3038,8 @@
 #endif
 
 #if ENABLE(CSS_SCROLL_SNAP)
-__ZN7WebCore27ScrollingStateScrollingNode22setVerticalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
-__ZN7WebCore27ScrollingStateScrollingNode24setHorizontalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore27ScrollingStateScrollingNode22setVerticalSnapOffsetsERKN3WTF6VectorIfLj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore27ScrollingStateScrollingNode24setHorizontalSnapOffsetsERKN3WTF6VectorIfLj0ENS1_15CrashOnOverflowEEE
 #endif
 
 #if ENABLE(DASHBOARD_SUPPORT)
@@ -3136,7 +3136,7 @@
 __ZN7WebCore10IDBKeyDataC1EPKNS_6IDBKeyE
 __ZN7WebCore10IDBKeyPath6decodeERNS_12KeyedDecoderERS0_
 __ZN7WebCore10IDBKeyPathC1ERKN3WTF6StringE
-__ZN7WebCore10IDBKeyPathC1ERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore10IDBKeyPathC1ERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore18IDBDatabaseBackend14deleteDatabaseEN3WTF10PassRefPtrINS_12IDBCallbacksEEE
 __ZN7WebCore18IDBDatabaseBackend14openConnectionEN3WTF10PassRefPtrINS_12IDBCallbacksEEENS2_INS_20IDBDatabaseCallbacksEEExy
 __ZN7WebCore18IDBDatabaseBackend6createERKN3WTF6StringES4_PNS_26IDBFactoryBackendInterfaceERNS_19IDBServerConnectionE
@@ -3149,8 +3149,8 @@
 __ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_9IndexedDB10CursorTypeEE4copyERKS2_
 __ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_9IndexedDB15CursorDirectionEE4copyERKS2_
 __ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_9IndexedDB15TransactionModeEE4copyERKS2_
-__ZN7WebCore25deserializeIDBValueBufferEPN3JSC9ExecStateERKN3WTF6VectorIhLm0ENS3_15CrashOnOverflowEEEb
-__ZN7WebCore25generateIndexKeysForValueEPN3JSC9ExecStateERKNS_16IDBIndexMetadataERKN10Deprecated11ScriptValueERN3WTF6VectorINS_10IDBKeyDataELm0ENSA_15CrashOnOverflowEEE
+__ZN7WebCore25deserializeIDBValueBufferEPN3JSC9ExecStateERKN3WTF6VectorIhLj0ENS3_15CrashOnOverflowEEEb
+__ZN7WebCore25generateIndexKeysForValueEPN3JSC9ExecStateERKNS_16IDBIndexMetadataERKN10Deprecated11ScriptValueERN3WTF6VectorINS_10IDBKeyDataELj0ENSA_15CrashOnOverflowEEE
 __ZN7WebCore6IDBKeyD1Ev
 __ZNK7WebCore10IDBKeyData17maybeCreateIDBKeyEv
 __ZNK7WebCore10IDBKeyData6encodeERNS_12KeyedEncoderE
@@ -3257,13 +3257,13 @@
 #if ENABLE(IOS_TOUCH_EVENTS)
 .objc_class_name_WebEventRegion
 __ZN7WebCore12EventHandler10touchEventEP8WebEvent
-__ZN7WebCore8Document13getTouchRectsERN3WTF6VectorINS_7IntRectELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore8Document13getTouchRectsERN3WTF6VectorINS_7IntRectELj0ENS1_15CrashOnOverflowEEE
 #endif
 
 #if ENABLE(MEDIA_SOURCE)
 __ZN7WebCore12SourceBuffer25bufferedSamplesForTrackIDERKN3WTF12AtomicStringE
 __ZN7WebCore14JSSourceBuffer9toWrappedEN3JSC7JSValueE
-__ZN7WebCore26MockMediaPlayerMediaSource19registerMediaEngineEPFvPFN3WTF10PassOwnPtrINS_27MediaPlayerPrivateInterfaceEEEPNS_11MediaPlayerEEPFvRNS1_7HashSetINS1_6StringENS1_10StringHashENS1_10HashTraitsISA_EEEEEPFNS5_12SupportsTypeERKNS_28MediaEngineSupportParametersEEPFvRNS1_6VectorISA_Lm0ENS1_15CrashOnOverflowEEEEPFvvEPFvRKSA_EPFbSX_SX_EE
+__ZN7WebCore26MockMediaPlayerMediaSource19registerMediaEngineEPFvPFN3WTF10PassOwnPtrINS_27MediaPlayerPrivateInterfaceEEEPNS_11MediaPlayerEEPFvRNS1_7HashSetINS1_6StringENS1_10StringHashENS1_10HashTraitsISA_EEEEEPFNS5_12SupportsTypeERKNS_28MediaEngineSupportParametersEEPFvRNS1_6VectorISA_Lj0ENS1_15CrashOnOverflowEEEEPFvvEPFvRKSA_EPFbSX_SX_EE
 #endif
 
 #if ENABLE(MEDIA_STREAM)
@@ -3436,12 +3436,12 @@
 __ZN7WebCore16HTMLMediaElement15clearMediaCacheEv
 __ZN7WebCore16HTMLMediaElement15togglePlayStateEv
 __ZN7WebCore16HTMLMediaElement16returnToRealtimeEv
-__ZN7WebCore16HTMLMediaElement20getSitesInMediaCacheERN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore16HTMLMediaElement20getSitesInMediaCacheERN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore16HTMLMediaElement22clearMediaCacheForSiteERKN3WTF6StringE
 __ZN7WebCore16HTMLMediaElement4playEv
 __ZN7WebCore16HTMLMediaElement5pauseEv
 __ZN7WebCore16HTMLMediaElement8setMutedEb
-__ZN7WebCore25MediaPlayerFactorySupport23callRegisterMediaEngineEPFvPFvPFN3WTF10PassOwnPtrINS_27MediaPlayerPrivateInterfaceEEEPNS_11MediaPlayerEEPFvRNS1_7HashSetINS1_6StringENS1_10StringHashENS1_10HashTraitsISA_EEEEEPFNS5_12SupportsTypeERKNS_28MediaEngineSupportParametersEEPFvRNS1_6VectorISA_Lm0ENS1_15CrashOnOverflowEEEEPFvvEPFvRKSA_EPFbSX_SX_EEE
+__ZN7WebCore25MediaPlayerFactorySupport23callRegisterMediaEngineEPFvPFvPFN3WTF10PassOwnPtrINS_27MediaPlayerPrivateInterfaceEEEPNS_11MediaPlayerEEPFvRNS1_7HashSetINS1_6StringENS1_10StringHashENS1_10HashTraitsISA_EEEEEPFNS5_12SupportsTypeERKNS_28MediaEngineSupportParametersEEPFvRNS1_6VectorISA_Lj0ENS1_15CrashOnOverflowEEEEPFvvEPFvRKSA_EPFbSX_SX_EEE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_10TimeRangesE
 __ZNK7WebCore10TimeRanges7nearestEd
 __ZNK7WebCore16HTMLMediaElement11currentTimeEv
@@ -3496,8 +3496,8 @@
 __ZN7WebCore32WebVideoFullscreenInterfaceAVKit21setCanPlayFastReverseEb
 __ZN7WebCore32WebVideoFullscreenInterfaceAVKit26setWebVideoFullscreenModelEPNS_23WebVideoFullscreenModelE
 __ZN7WebCore32WebVideoFullscreenInterfaceAVKit28requestHideAndExitFullscreenEv
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit29setAudioMediaSelectionOptionsERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEEy
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit31setLegibleMediaSelectionOptionsERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEEy
+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit29setAudioMediaSelectionOptionsERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEEy
+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit31setLegibleMediaSelectionOptionsERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEEy
 __ZN7WebCore32WebVideoFullscreenInterfaceAVKit35setWebVideoFullscreenChangeObserverEPNS_32WebVideoFullscreenChangeObserverE
 __ZN7WebCore32WebVideoFullscreenInterfaceAVKit7setRateEbf
 __ZN7WebCore32WebVideoFullscreenInterfaceAVKitC2Ev

Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (176274 => 176275)


--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h	2014-11-18 19:56:01 UTC (rev 176275)
@@ -426,7 +426,7 @@
     }
 };
 
-template<typename T, size_t inlineCapacity> JSC::JSValue jsArray(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const Vector<T, inlineCapacity>& vector)
+template<typename T, unsigned inlineCapacity> JSC::JSValue jsArray(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const Vector<T, inlineCapacity>& vector)
 {
     JSC::MarkedArgumentBuffer list;
     for (auto& element : vector)

Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp (176274 => 176275)


--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp	2014-11-18 19:56:01 UTC (rev 176275)
@@ -424,7 +424,7 @@
     return getObjectParameter(this, exec, kVertexAttrib);
 }
 
-template<typename T, size_t inlineCapacity>
+template<typename T, unsigned inlineCapacity>
 bool toVector(JSC::ExecState* exec, JSC::JSValue value, Vector<T, inlineCapacity>& vector)
 {
     if (!value.isObject())

Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (176274 => 176275)


--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp	2014-11-18 19:56:01 UTC (rev 176275)
@@ -1036,7 +1036,7 @@
 }
 
 bool hasAnyCombinators(const Vector<SelectorFragmentList>& selectorList);
-template <size_t inlineCapacity>
+template <unsigned inlineCapacity>
 bool hasAnyCombinators(const Vector<SelectorFragment, inlineCapacity>& selectorFragmentList);
 
 bool hasAnyCombinators(const Vector<SelectorFragmentList>& selectorList)
@@ -1048,7 +1048,7 @@
     return false;
 }
 
-template <size_t inlineCapacity>
+template <unsigned inlineCapacity>
 bool hasAnyCombinators(const Vector<SelectorFragment, inlineCapacity>& selectorFragmentList)
 {
     if (selectorFragmentList.isEmpty())

Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (176274 => 176275)


--- trunk/Source/WebCore/html/HTMLFormElement.cpp	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp	2014-11-18 19:56:01 UTC (rev 176275)
@@ -510,7 +510,7 @@
         HTMLElement::parseAttribute(name, value);
 }
 
-template<class T, size_t n> static void removeFromVector(Vector<T*, n> & vec, T* item)
+template<class T, unsigned inlineCapacity> static void removeFromVector(Vector<T*, inlineCapacity> & vec, T* item)
 {
     size_t size = vec.size();
     for (size_t i = 0; i != size; ++i)

Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.h (176274 => 176275)


--- trunk/Source/WebCore/html/parser/HTMLParserIdioms.h	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WebCore/html/parser/HTMLParserIdioms.h	2014-11-18 19:56:01 UTC (rev 176275)
@@ -40,7 +40,7 @@
 
 // Strip leading and trailing whitespace as defined by the HTML specification. 
 WEBCORE_EXPORT String stripLeadingAndTrailingHTMLSpaces(const String&);
-template<size_t inlineCapacity>
+template<unsigned inlineCapacity>
 String stripLeadingAndTrailingHTMLSpaces(const Vector<UChar, inlineCapacity>& vector)
 {
     return stripLeadingAndTrailingHTMLSpaces(StringImpl::create8BitIfPossible(vector));

Modified: trunk/Source/WebCore/html/parser/XSSAuditor.cpp (176274 => 176275)


--- trunk/Source/WebCore/html/parser/XSSAuditor.cpp	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WebCore/html/parser/XSSAuditor.cpp	2014-11-18 19:56:01 UTC (rev 176275)
@@ -113,7 +113,7 @@
 }
 
 // If other files need this, we should move this to HTMLParserIdioms.h
-template<size_t inlineCapacity>
+template<unsigned inlineCapacity>
 bool threadSafeMatch(const Vector<UChar, inlineCapacity>& vector, const QualifiedName& qname)
 {
     return equalIgnoringNullity(vector, qname.localName().impl());

Modified: trunk/Source/WebKit2/ChangeLog (176274 => 176275)


--- trunk/Source/WebKit2/ChangeLog	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WebKit2/ChangeLog	2014-11-18 19:56:01 UTC (rev 176275)
@@ -1,3 +1,16 @@
+2014-11-18  Chris Dumez  <[email protected]>
+
+        Update the Vector API to deal with unsigned types instead of size_t
+        https://bugs.webkit.org/show_bug.cgi?id=138824
+
+        Reviewed by Andreas Kling.
+
+        Update code base to fix build errors related to the typing changes
+        in the Vector API (size_t -> unsigned).
+
+        * Platform/IPC/ArgumentCoders.h:
+        * Platform/IPC/DataReference.h:
+
 2014-11-18  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r176264.

Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h (176274 => 176275)


--- trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h	2014-11-18 19:56:01 UTC (rev 176275)
@@ -143,9 +143,9 @@
     }
 };
 
-template<bool fixedSizeElements, typename T, size_t inlineCapacity> struct VectorArgumentCoder;
+template<bool fixedSizeElements, typename T, unsigned inlineCapacity> struct VectorArgumentCoder;
 
-template<typename T, size_t inlineCapacity> struct VectorArgumentCoder<false, T, inlineCapacity> {
+template<typename T, unsigned inlineCapacity> struct VectorArgumentCoder<false, T, inlineCapacity> {
     static void encode(ArgumentEncoder& encoder, const Vector<T, inlineCapacity>& vector)
     {
         encoder << static_cast<uint64_t>(vector.size());
@@ -174,7 +174,7 @@
     }
 };
 
-template<typename T, size_t inlineCapacity> struct VectorArgumentCoder<true, T, inlineCapacity> {
+template<typename T, unsigned inlineCapacity> struct VectorArgumentCoder<true, T, inlineCapacity> {
     static void encode(ArgumentEncoder& encoder, const Vector<T, inlineCapacity>& vector)
     {
         encoder << static_cast<uint64_t>(vector.size());
@@ -205,7 +205,7 @@
     }
 };
 
-template<typename T, size_t inlineCapacity> struct ArgumentCoder<Vector<T, inlineCapacity>> : VectorArgumentCoder<std::is_arithmetic<T>::value, T, inlineCapacity> { };
+template<typename T, unsigned inlineCapacity> struct ArgumentCoder<Vector<T, inlineCapacity>> : VectorArgumentCoder<std::is_arithmetic<T>::value, T, inlineCapacity> { };
 
 template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg> struct ArgumentCoder<HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>> {
     typedef HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg> HashMapType;

Modified: trunk/Source/WebKit2/Platform/IPC/DataReference.h (176274 => 176275)


--- trunk/Source/WebKit2/Platform/IPC/DataReference.h	2014-11-18 19:32:51 UTC (rev 176274)
+++ trunk/Source/WebKit2/Platform/IPC/DataReference.h	2014-11-18 19:56:01 UTC (rev 176275)
@@ -48,7 +48,7 @@
     {
     }
 
-    template<size_t inlineCapacity>
+    template<unsigned inlineCapacity>
     DataReference(const Vector<uint8_t, inlineCapacity>& vector)
         : m_data(vector.data())
         , m_size(vector.size())

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [176275] trunk/Source

Log Message

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (176274 => 176275)

Modified: trunk/Source/_javascript_Core/bytecode/PreciseJumpTargets.cpp (176274 => 176275)

Modified: trunk/Source/_javascript_Core/replay/EncodedValue.h (176274 => 176275)

Modified: trunk/Source/WTF/ChangeLog (176274 => 176275)

Modified: trunk/Source/WTF/wtf/Forward.h (176274 => 176275)

Modified: trunk/Source/WTF/wtf/Vector.h (176274 => 176275)

Modified: trunk/Source/WTF/wtf/text/AtomicString.h (176274 => 176275)

Modified: trunk/Source/WTF/wtf/text/StringImpl.h (176274 => 176275)

Modified: trunk/Source/WTF/wtf/text/StringView.h (176274 => 176275)

Modified: trunk/Source/WTF/wtf/text/WTFString.h (176274 => 176275)

Modified: trunk/Source/WebCore/ChangeLog (176274 => 176275)

Modified: trunk/Source/WebCore/WebCore.exp.in (176274 => 176275)

Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (176274 => 176275)

Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp (176274 => 176275)

Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (176274 => 176275)

Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (176274 => 176275)

Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.h (176274 => 176275)

Modified: trunk/Source/WebCore/html/parser/XSSAuditor.cpp (176274 => 176275)

Modified: trunk/Source/WebKit2/ChangeLog (176274 => 176275)

Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h (176274 => 176275)

Modified: trunk/Source/WebKit2/Platform/IPC/DataReference.h (176274 => 176275)

Reply via email to