Log Message
Revert r176293 & r176275
Unreviewed, revert r176293 & r176275 changing the Vector API to use unsigned type instead of size_t. There is some disagreement regarding the long-term direction of the API and we shouldn’t leave the API partly transitioned to unsigned type while making a decision. Source/_javascript_Core: * bytecode/PreciseJumpTargets.cpp: * replay/EncodedValue.h: Source/WebCore: * WebCore.exp.in: * bindings/js/JSDOMBinding.h: (WebCore::jsArray): * bindings/js/JSWebGLRenderingContextCustom.cpp: * cssjit/SelectorCompiler.cpp: * editing/TextIterator.cpp: (WebCore::SearchBuffer::append): (WebCore::SearchBuffer::prependContext): (WebCore::SearchBuffer::search): (WebCore::SearchBuffer::length): * html/HTMLFormElement.cpp: (WebCore::removeFromVector): * html/parser/HTMLParserIdioms.h: * html/parser/XSSAuditor.cpp: * platform/SharedBuffer.cpp: (WebCore::SharedBuffer::duplicateDataBufferIfNecessary): Source/WebKit2: * Platform/IPC/ArgumentCoders.h: * Platform/IPC/DataReference.h: Source/WTF: * 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::capacity): (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/editing/TextIterator.cpp
- trunk/Source/WebCore/html/HTMLFormElement.cpp
- trunk/Source/WebCore/html/parser/HTMLParserIdioms.h
- trunk/Source/WebCore/html/parser/XSSAuditor.cpp
- trunk/Source/WebCore/platform/SharedBuffer.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 (176963 => 176964)
--- trunk/Source/_javascript_Core/ChangeLog 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-12-08 20:40:27 UTC (rev 176964)
@@ -1,3 +1,15 @@
+2014-12-08 Chris Dumez <cdu...@apple.com>
+
+ Revert r176293 & r176275
+
+ Unreviewed, revert r176293 & r176275 changing the Vector API to use unsigned type
+ instead of size_t. There is some disagreement regarding the long-term direction
+ of the API and we shouldn’t leave the API partly transitioned to unsigned type
+ while making a decision.
+
+ * bytecode/PreciseJumpTargets.cpp:
+ * replay/EncodedValue.h:
+
2014-12-07 Csaba Osztrogonác <o...@webkit.org>
Remove the unused WTF_USE_GCC_COMPUTED_GOTO_WORKAROUND after r129453.
Modified: trunk/Source/_javascript_Core/bytecode/PreciseJumpTargets.cpp (176963 => 176964)
--- trunk/Source/_javascript_Core/bytecode/PreciseJumpTargets.cpp 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/_javascript_Core/bytecode/PreciseJumpTargets.cpp 2014-12-08 20:40:27 UTC (rev 176964)
@@ -30,7 +30,7 @@
namespace JSC {
-template <unsigned vectorSize>
+template <size_t 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 (176963 => 176964)
--- trunk/Source/_javascript_Core/replay/EncodedValue.h 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/_javascript_Core/replay/EncodedValue.h 2014-12-08 20:40:27 UTC (rev 176964)
@@ -104,7 +104,7 @@
static bool decodeValue(EncodedValue&, std::unique_ptr<DecodedType>&);
};
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
struct EncodingTraits<Vector<T, inlineCapacity, OverflowHandler>> {
typedef Vector<typename EncodingTraits<T>::DecodedType, inlineCapacity, OverflowHandler> DecodedType;
Modified: trunk/Source/WTF/ChangeLog (176963 => 176964)
--- trunk/Source/WTF/ChangeLog 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WTF/ChangeLog 2014-12-08 20:40:27 UTC (rev 176964)
@@ -1,3 +1,61 @@
+2014-12-08 Chris Dumez <cdu...@apple.com>
+
+ Revert r176293 & r176275
+
+ Unreviewed, revert r176293 & r176275 changing the Vector API to use unsigned type
+ instead of size_t. There is some disagreement regarding the long-term direction
+ of the API and we shouldn’t leave the API partly transitioned to unsigned type
+ while making a decision.
+
+ * 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::capacity):
+ (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-12-07 Andreas Kling <akl...@apple.com>
Use more PassRef in AtomicString.
Modified: trunk/Source/WTF/wtf/Forward.h (176963 => 176964)
--- trunk/Source/WTF/wtf/Forward.h 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WTF/wtf/Forward.h 2014-12-08 20:40:27 UTC (rev 176964)
@@ -36,7 +36,7 @@
template<typename T> class Ref;
template<typename T> class StringBuffer;
-template<typename T, unsigned inlineCapacity, typename OverflowHandler> class Vector;
+template<typename T, size_t inlineCapacity, typename OverflowHandler> class Vector;
class AtomicString;
class AtomicStringImpl;
Modified: trunk/Source/WTF/wtf/Vector.h (176963 => 176964)
--- trunk/Source/WTF/wtf/Vector.h 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WTF/wtf/Vector.h 2014-12-08 20:40:27 UTC (rev 176964)
@@ -194,12 +194,11 @@
template<typename T>
struct VectorComparer<false, T>
{
- static bool compare(const T* a, const T* b, unsigned size)
+ static bool compare(const T* a, const T* b, size_t size)
{
- for (unsigned i = 0; i < size; ++i) {
+ for (size_t i = 0; i < size; ++i)
if (!(a[i] == b[i]))
return false;
- }
return true;
}
};
@@ -207,7 +206,7 @@
template<typename T>
struct VectorComparer<true, T>
{
- static bool compare(const T* a, const T* b, unsigned size)
+ static bool compare(const T* a, const T* b, size_t size)
{
return memcmp(a, b, sizeof(T) * size) == 0;
}
@@ -246,7 +245,7 @@
VectorFiller<VectorTraits<T>::canFillWithMemset, T>::uninitializedFill(dst, dstEnd, val);
}
- static bool compare(const T* a, const T* b, unsigned size)
+ static bool compare(const T* a, const T* b, size_t size)
{
return VectorComparer<VectorTraits<T>::canCompareWithMemcmp, T>::compare(a, b, size);
}
@@ -256,23 +255,23 @@
class VectorBufferBase {
WTF_MAKE_NONCOPYABLE(VectorBufferBase);
public:
- void allocateBuffer(unsigned newCapacity)
+ void allocateBuffer(size_t newCapacity)
{
ASSERT(newCapacity);
if (newCapacity > std::numeric_limits<unsigned>::max() / sizeof(T))
CRASH();
- unsigned sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
+ size_t sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
m_capacity = sizeToAllocate / sizeof(T);
m_buffer = static_cast<T*>(fastMalloc(sizeToAllocate));
}
- bool tryAllocateBuffer(unsigned newCapacity)
+ bool tryAllocateBuffer(size_t newCapacity)
{
ASSERT(newCapacity);
if (newCapacity > std::numeric_limits<unsigned>::max() / sizeof(T))
return false;
- unsigned sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
+ size_t sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
T* newBuffer;
if (tryFastMalloc(sizeToAllocate).getValue(newBuffer)) {
m_capacity = sizeToAllocate / sizeof(T);
@@ -282,17 +281,17 @@
return false;
}
- bool shouldReallocateBuffer(unsigned newCapacity) const
+ bool shouldReallocateBuffer(size_t newCapacity) const
{
return VectorTraits<T>::canMoveWithMemcpy && m_capacity && newCapacity;
}
- void reallocateBuffer(unsigned newCapacity)
+ void reallocateBuffer(size_t newCapacity)
{
ASSERT(shouldReallocateBuffer(newCapacity));
- if (newCapacity > std::numeric_limits<unsigned>::max() / sizeof(T))
+ if (newCapacity > std::numeric_limits<size_t>::max() / sizeof(T))
CRASH();
- unsigned sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
+ size_t sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
m_capacity = sizeToAllocate / sizeof(T);
m_buffer = static_cast<T*>(fastRealloc(m_buffer, sizeToAllocate));
}
@@ -313,7 +312,7 @@
T* buffer() { return m_buffer; }
const T* buffer() const { return m_buffer; }
static ptrdiff_t bufferMemoryOffset() { return OBJECT_OFFSETOF(VectorBufferBase, m_buffer); }
- unsigned capacity() const { return m_capacity; }
+ size_t capacity() const { return m_capacity; }
MallocPtr<T> releaseBuffer()
{
@@ -331,7 +330,7 @@
{
}
- VectorBufferBase(T* buffer, unsigned capacity, unsigned size)
+ VectorBufferBase(T* buffer, size_t capacity, size_t size)
: m_buffer(buffer)
, m_capacity(capacity)
, m_size(size)
@@ -348,7 +347,7 @@
unsigned m_size; // Only used by the Vector subclass, but placed here to avoid padding the struct.
};
-template<typename T, unsigned inlineCapacity>
+template<typename T, size_t inlineCapacity>
class VectorBuffer;
template<typename T>
@@ -360,7 +359,7 @@
{
}
- VectorBuffer(unsigned capacity, unsigned size = 0)
+ VectorBuffer(size_t capacity, size_t size = 0)
{
m_size = size;
// Calling malloc(0) might take a lock and may actually do an
@@ -374,7 +373,7 @@
deallocateBuffer(buffer());
}
- void swap(VectorBuffer<T, 0>& other, unsigned, unsigned)
+ void swap(VectorBuffer<T, 0>& other, size_t, size_t)
{
std::swap(m_buffer, other.m_buffer);
std::swap(m_capacity, other.m_capacity);
@@ -402,7 +401,7 @@
using Base::m_capacity;
};
-template<typename T, unsigned inlineCapacity>
+template<typename T, size_t inlineCapacity>
class VectorBuffer : private VectorBufferBase<T> {
WTF_MAKE_NONCOPYABLE(VectorBuffer);
private:
@@ -413,7 +412,7 @@
{
}
- VectorBuffer(unsigned capacity, unsigned size = 0)
+ VectorBuffer(size_t capacity, size_t size = 0)
: Base(inlineBuffer(), inlineCapacity, size)
{
if (capacity > inlineCapacity)
@@ -425,7 +424,7 @@
deallocateBuffer(buffer());
}
- void allocateBuffer(unsigned newCapacity)
+ void allocateBuffer(size_t newCapacity)
{
// FIXME: This should ASSERT(!m_buffer) to catch misuse/leaks.
if (newCapacity > inlineCapacity)
@@ -436,7 +435,7 @@
}
}
- bool tryAllocateBuffer(unsigned newCapacity)
+ bool tryAllocateBuffer(size_t newCapacity)
{
if (newCapacity > inlineCapacity)
return Base::tryAllocateBuffer(newCapacity);
@@ -452,19 +451,19 @@
Base::deallocateBuffer(bufferToDeallocate);
}
- bool shouldReallocateBuffer(unsigned newCapacity) const
+ bool shouldReallocateBuffer(size_t newCapacity) const
{
// We cannot reallocate the inline buffer.
- return Base::shouldReallocateBuffer(newCapacity) && std::min(m_capacity, newCapacity) > inlineCapacity;
+ return Base::shouldReallocateBuffer(newCapacity) && std::min(static_cast<size_t>(m_capacity), newCapacity) > inlineCapacity;
}
- void reallocateBuffer(unsigned newCapacity)
+ void reallocateBuffer(size_t newCapacity)
{
ASSERT(shouldReallocateBuffer(newCapacity));
Base::reallocateBuffer(newCapacity);
}
- void swap(VectorBuffer& other, unsigned mySize, unsigned otherSize)
+ void swap(VectorBuffer& other, size_t mySize, size_t otherSize)
{
if (buffer() == inlineBuffer() && other.buffer() == other.inlineBuffer()) {
swapInlineBuffer(other, mySize, otherSize);
@@ -511,7 +510,7 @@
using Base::m_buffer;
using Base::m_capacity;
- void swapInlineBuffer(VectorBuffer& other, unsigned mySize, unsigned otherSize)
+ void swapInlineBuffer(VectorBuffer& other, size_t mySize, size_t otherSize)
{
// FIXME: We could make swap part of VectorTypeOperations
// https://bugs.webkit.org/show_bug.cgi?id=128863
@@ -522,7 +521,7 @@
swapInlineBuffers(inlineBuffer(), other.inlineBuffer(), mySize, otherSize);
}
- static void swapInlineBuffers(T* left, T* right, unsigned leftSize, unsigned rightSize)
+ static void swapInlineBuffers(T* left, T* right, size_t leftSize, size_t rightSize)
{
if (left == right)
return;
@@ -530,7 +529,7 @@
ASSERT(leftSize <= inlineCapacity);
ASSERT(rightSize <= inlineCapacity);
- unsigned swapBound = std::min(leftSize, rightSize);
+ size_t 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);
@@ -550,7 +549,7 @@
}
};
-template<typename T, unsigned inlineCapacity = 0, typename OverflowHandler = CrashOnOverflow>
+template<typename T, size_t inlineCapacity = 0, typename OverflowHandler = CrashOnOverflow>
class Vector : private VectorBuffer<T, inlineCapacity> {
WTF_MAKE_FAST_ALLOCATED;
private:
@@ -570,14 +569,14 @@
}
// Unlike in std::vector, this constructor does not initialize POD types.
- explicit Vector(unsigned size)
+ explicit Vector(size_t size)
: Base(size, size)
{
if (begin())
TypeOperations::initialize(begin(), end());
}
- Vector(unsigned size, const T& val)
+ Vector(size_t size, const T& val)
: Base(size, size)
{
if (begin())
@@ -598,11 +597,11 @@
}
Vector(const Vector&);
- template<unsigned otherCapacity, typename otherOverflowBehaviour>
+ template<size_t otherCapacity, typename otherOverflowBehaviour>
Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&);
Vector& operator=(const Vector&);
- template<unsigned otherCapacity, typename otherOverflowBehaviour>
+ template<size_t otherCapacity, typename otherOverflowBehaviour>
Vector& operator=(const Vector<T, otherCapacity, otherOverflowBehaviour>&);
Vector(Vector&&);
@@ -610,36 +609,36 @@
size_t size() const { return m_size; }
static ptrdiff_t sizeMemoryOffset() { return OBJECT_OFFSETOF(Vector, m_size); }
- unsigned capacity() const { return Base::capacity(); }
+ size_t capacity() const { return Base::capacity(); }
bool isEmpty() const { return !size(); }
- T& at(unsigned i)
+ T& at(size_t i)
{
if (UNLIKELY(i >= size()))
OverflowHandler::overflowed();
return Base::buffer()[i];
}
- const T& at(unsigned i) const
+ const T& at(size_t i) const
{
if (UNLIKELY(i >= size()))
OverflowHandler::overflowed();
return Base::buffer()[i];
}
- T& at(Checked<unsigned> i)
+ T& at(Checked<size_t> i)
{
RELEASE_ASSERT(i < size());
return Base::buffer()[i];
}
- const T& at(Checked<unsigned> i) const
+ const T& at(Checked<size_t> i) const
{
RELEASE_ASSERT(i < size());
return Base::buffer()[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& 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* data() { return Base::buffer(); }
const T* data() const { return Base::buffer(); }
@@ -671,30 +670,30 @@
template<typename U> size_t find(const U&) const;
template<typename U> size_t reverseFind(const U&) const;
- 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 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 shrinkToFit() { shrinkCapacity(size()); }
void clear() { shrinkCapacity(0); }
- template<typename U> void append(const U*, unsigned);
+ template<typename U> void append(const U*, size_t);
template<typename U> void append(U&&);
template<typename U> void uncheckedAppend(U&& val);
- template<typename U, unsigned otherCapacity> void appendVector(const Vector<U, otherCapacity>&);
- template<typename U> bool tryAppend(const U*, unsigned);
+ template<typename U, size_t otherCapacity> void appendVector(const Vector<U, otherCapacity>&);
+ template<typename U> bool tryAppend(const U*, size_t);
- 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>&);
+ 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>&);
- void remove(unsigned position);
- void remove(unsigned position, unsigned length);
+ void remove(size_t position);
+ void remove(size_t position, size_t length);
void removeLast()
{
@@ -703,7 +702,7 @@
shrink(size() - 1);
}
- void fill(const T&, unsigned);
+ void fill(const T&, size_t);
void fill(const T& val) { fill(val, size()); }
template<typename Iterator> void appendRange(Iterator start, Iterator end);
@@ -721,11 +720,11 @@
void checkConsistency();
private:
- 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*);
+ 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*);
template<typename U> void appendSlowCase(U&&);
using Base::m_size;
@@ -741,7 +740,7 @@
using Base::releaseBuffer;
};
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
Vector<T, inlineCapacity, OverflowHandler>::Vector(const Vector& other)
: Base(other.capacity(), other.size())
{
@@ -749,8 +748,8 @@
TypeOperations::uninitializedCopy(other.begin(), other.end(), begin());
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-template<unsigned otherCapacity, typename otherOverflowBehaviour>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<size_t otherCapacity, typename otherOverflowBehaviour>
Vector<T, inlineCapacity, OverflowHandler>::Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>& other)
: Base(other.capacity(), other.size())
{
@@ -758,7 +757,7 @@
TypeOperations::uninitializedCopy(other.begin(), other.end(), begin());
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
Vector<T, inlineCapacity, OverflowHandler>& Vector<T, inlineCapacity, OverflowHandler>::operator=(const Vector<T, inlineCapacity, OverflowHandler>& other)
{
if (&other == this)
@@ -781,8 +780,8 @@
inline bool typelessPointersAreEqual(const void* a, const void* b) { return a == b; }
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-template<unsigned otherCapacity, typename otherOverflowBehaviour>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+template<size_t 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
@@ -805,51 +804,51 @@
return *this;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
inline Vector<T, inlineCapacity, OverflowHandler>::Vector(Vector<T, inlineCapacity, OverflowHandler>&& other)
{
swap(other);
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t 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, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
template<typename U>
bool Vector<T, inlineCapacity, OverflowHandler>::contains(const U& value) const
{
return find(value) != notFound;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
template<typename U>
size_t Vector<T, inlineCapacity, OverflowHandler>::find(const U& value) const
{
- for (unsigned i = 0; i < size(); ++i) {
+ for (size_t i = 0; i < size(); ++i) {
if (at(i) == value)
return i;
}
return notFound;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
template<typename U>
size_t Vector<T, inlineCapacity, OverflowHandler>::reverseFind(const U& value) const
{
- for (unsigned i = 1; i <= size(); ++i) {
- const unsigned index = size() - i;
+ for (size_t i = 1; i <= size(); ++i) {
+ const size_t index = size() - i;
if (at(index) == value)
return index;
}
return notFound;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::fill(const T& val, unsigned newSize)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::fill(const T& val, size_t newSize)
{
if (size() > newSize)
shrink(newSize);
@@ -864,7 +863,7 @@
m_size = newSize;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
template<typename Iterator>
void Vector<T, inlineCapacity, OverflowHandler>::appendRange(Iterator start, Iterator end)
{
@@ -872,53 +871,53 @@
append(*it);
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(unsigned newMinCapacity)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(size_t newMinCapacity)
{
- reserveCapacity(std::max(newMinCapacity, std::max(16u, capacity() + capacity() / 4 + 1)));
+ reserveCapacity(std::max(newMinCapacity, std::max(static_cast<size_t>(16), capacity() + capacity() / 4 + 1)));
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-T* Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(unsigned newMinCapacity, T* ptr)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+T* Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(size_t newMinCapacity, T* ptr)
{
if (ptr < begin() || ptr >= end()) {
expandCapacity(newMinCapacity);
return ptr;
}
- unsigned index = ptr - begin();
+ size_t index = ptr - begin();
expandCapacity(newMinCapacity);
return begin() + index;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-bool Vector<T, inlineCapacity, OverflowHandler>::tryExpandCapacity(unsigned newMinCapacity)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+bool Vector<T, inlineCapacity, OverflowHandler>::tryExpandCapacity(size_t newMinCapacity)
{
- return tryReserveCapacity(std::max(newMinCapacity, std::max(16u, capacity() + capacity() / 4 + 1)));
+ return tryReserveCapacity(std::max(newMinCapacity, std::max(static_cast<size_t>(16), capacity() + capacity() / 4 + 1)));
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-const T* Vector<T, inlineCapacity, OverflowHandler>::tryExpandCapacity(unsigned newMinCapacity, const T* ptr)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+const T* Vector<T, inlineCapacity, OverflowHandler>::tryExpandCapacity(size_t newMinCapacity, const T* ptr)
{
if (ptr < begin() || ptr >= end()) {
if (!tryExpandCapacity(newMinCapacity))
return 0;
return ptr;
}
- unsigned index = ptr - begin();
+ size_t index = ptr - begin();
if (!tryExpandCapacity(newMinCapacity))
return 0;
return begin() + index;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
-inline U* Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(unsigned newMinCapacity, U* ptr)
+template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
+inline U* Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(size_t newMinCapacity, U* ptr)
{
expandCapacity(newMinCapacity);
return ptr;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-inline void Vector<T, inlineCapacity, OverflowHandler>::resize(unsigned size)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+inline void Vector<T, inlineCapacity, OverflowHandler>::resize(size_t size)
{
if (size <= m_size)
TypeOperations::destruct(begin() + size, end());
@@ -932,23 +931,23 @@
m_size = size;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::resizeToFit(unsigned size)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::resizeToFit(size_t size)
{
reserveCapacity(size);
resize(size);
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::shrink(unsigned size)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::shrink(size_t size)
{
ASSERT(size <= m_size);
TypeOperations::destruct(begin() + size, end());
m_size = size;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::grow(unsigned size)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::grow(size_t size)
{
ASSERT(size >= m_size);
if (size > capacity())
@@ -958,8 +957,8 @@
m_size = size;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::reserveCapacity(unsigned newCapacity)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::reserveCapacity(size_t newCapacity)
{
if (newCapacity <= capacity())
return;
@@ -971,8 +970,8 @@
Base::deallocateBuffer(oldBuffer);
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-bool Vector<T, inlineCapacity, OverflowHandler>::tryReserveCapacity(unsigned newCapacity)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+bool Vector<T, inlineCapacity, OverflowHandler>::tryReserveCapacity(size_t newCapacity)
{
if (newCapacity <= capacity())
return true;
@@ -986,8 +985,8 @@
return true;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-inline void Vector<T, inlineCapacity, OverflowHandler>::reserveInitialCapacity(unsigned initialCapacity)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+inline void Vector<T, inlineCapacity, OverflowHandler>::reserveInitialCapacity(size_t initialCapacity)
{
ASSERT(!m_size);
ASSERT(capacity() == inlineCapacity);
@@ -995,8 +994,8 @@
Base::allocateBuffer(initialCapacity);
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::shrinkCapacity(unsigned newCapacity)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+void Vector<T, inlineCapacity, OverflowHandler>::shrinkCapacity(size_t newCapacity)
{
if (newCapacity >= capacity())
return;
@@ -1024,10 +1023,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, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
-void Vector<T, inlineCapacity, OverflowHandler>::append(const U* data, unsigned dataSize)
+template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
+void Vector<T, inlineCapacity, OverflowHandler>::append(const U* data, size_t dataSize)
{
- unsigned newSize = m_size + dataSize;
+ size_t newSize = m_size + dataSize;
if (newSize > capacity()) {
data = "" data);
ASSERT(begin());
@@ -1039,10 +1038,10 @@
m_size = newSize;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
-bool Vector<T, inlineCapacity, OverflowHandler>::tryAppend(const U* data, unsigned dataSize)
+template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
+bool Vector<T, inlineCapacity, OverflowHandler>::tryAppend(const U* data, size_t dataSize)
{
- unsigned newSize = m_size + dataSize;
+ size_t newSize = m_size + dataSize;
if (newSize > capacity()) {
data = "" data);
if (!data)
@@ -1057,7 +1056,7 @@
return true;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
+template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
ALWAYS_INLINE void Vector<T, inlineCapacity, OverflowHandler>::append(U&& value)
{
if (size() != capacity()) {
@@ -1069,7 +1068,7 @@
appendSlowCase(std::forward<U>(value));
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
+template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
void Vector<T, inlineCapacity, OverflowHandler>::appendSlowCase(U&& value)
{
ASSERT(size() == capacity());
@@ -1085,7 +1084,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, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
+template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
inline void Vector<T, inlineCapacity, OverflowHandler>::uncheckedAppend(U&& value)
{
ASSERT(size() < capacity());
@@ -1095,17 +1094,17 @@
++m_size;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U, unsigned otherCapacity>
+template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U, size_t otherCapacity>
inline void Vector<T, inlineCapacity, OverflowHandler>::appendVector(const Vector<U, otherCapacity>& val)
{
append(val.begin(), val.size());
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
-void Vector<T, inlineCapacity, OverflowHandler>::insert(unsigned position, const U* data, unsigned dataSize)
+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)
{
ASSERT_WITH_SECURITY_IMPLICATION(position <= size());
- unsigned newSize = m_size + dataSize;
+ size_t newSize = m_size + dataSize;
if (newSize > capacity()) {
data = "" data);
ASSERT(begin());
@@ -1118,8 +1117,8 @@
m_size = newSize;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler> template<typename U>
-inline void Vector<T, inlineCapacity, OverflowHandler>::insert(unsigned position, U&& value)
+template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
+inline void Vector<T, inlineCapacity, OverflowHandler>::insert(size_t position, U&& value)
{
ASSERT_WITH_SECURITY_IMPLICATION(position <= size());
@@ -1135,14 +1134,14 @@
++m_size;
}
-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)
+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)
{
insert(position, val.begin(), val.size());
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-inline void Vector<T, inlineCapacity, OverflowHandler>::remove(unsigned position)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+inline void Vector<T, inlineCapacity, OverflowHandler>::remove(size_t position)
{
ASSERT_WITH_SECURITY_IMPLICATION(position < size());
T* spot = begin() + position;
@@ -1151,8 +1150,8 @@
--m_size;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
-inline void Vector<T, inlineCapacity, OverflowHandler>::remove(unsigned position, unsigned length)
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
+inline void Vector<T, inlineCapacity, OverflowHandler>::remove(size_t position, size_t length)
{
ASSERT_WITH_SECURITY_IMPLICATION(position <= size());
ASSERT_WITH_SECURITY_IMPLICATION(position + length <= size());
@@ -1163,14 +1162,14 @@
m_size -= length;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
inline void Vector<T, inlineCapacity, OverflowHandler>::reverse()
{
- for (unsigned i = 0; i < m_size / 2; ++i)
+ for (size_t i = 0; i < m_size / 2; ++i)
std::swap(at(i), at(m_size - 1 - i));
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
inline MallocPtr<T> Vector<T, inlineCapacity, OverflowHandler>::releaseBuffer()
{
auto buffer = Base::releaseBuffer();
@@ -1186,22 +1185,22 @@
return buffer;
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
inline void Vector<T, inlineCapacity, OverflowHandler>::checkConsistency()
{
#if !ASSERT_DISABLED
- for (unsigned i = 0; i < size(); ++i)
+ for (size_t i = 0; i < size(); ++i)
ValueCheck<T>::checkConsistency(at(i));
#endif
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
inline void swap(Vector<T, inlineCapacity, OverflowHandler>& a, Vector<T, inlineCapacity, OverflowHandler>& b)
{
a.swap(b);
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t inlineCapacity, typename OverflowHandler>
bool operator==(const Vector<T, inlineCapacity, OverflowHandler>& a, const Vector<T, inlineCapacity, OverflowHandler>& b)
{
if (a.size() != b.size())
@@ -1210,7 +1209,7 @@
return VectorTypeOperations<T>::compare(a.data(), b.data(), a.size());
}
-template<typename T, unsigned inlineCapacity, typename OverflowHandler>
+template<typename T, size_t 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 (176963 => 176964)
--- trunk/Source/WTF/wtf/text/AtomicString.h 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WTF/wtf/text/AtomicString.h 2014-12-08 20:40:27 UTC (rev 176964)
@@ -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<unsigned inlineCapacity>
+ template<size_t inlineCapacity>
explicit AtomicString(const Vector<UChar, inlineCapacity>& characters)
: m_string(add(characters.data(), characters.size()))
{
Modified: trunk/Source/WTF/wtf/text/StringImpl.h (176963 => 176964)
--- trunk/Source/WTF/wtf/text/StringImpl.h 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WTF/wtf/text/StringImpl.h 2014-12-08 20:40:27 UTC (rev 176964)
@@ -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<unsigned inlineCapacity>
+ template<size_t 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, unsigned inlineCapacity, typename OverflowHandler>
+ template<typename CharType, size_t inlineCapacity, typename OverflowHandler>
static PassRef<StringImpl> adopt(Vector<CharType, inlineCapacity, OverflowHandler>& vector)
{
- if (unsigned size = vector.size()) {
+ if (size_t 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<unsigned inlineCapacity> inline bool equalIgnoringNullity(const Vector<UChar, inlineCapacity>& a, StringImpl* b)
+template<size_t 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 (176963 => 176964)
--- trunk/Source/WTF/wtf/text/StringView.h 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WTF/wtf/text/StringView.h 2014-12-08 20:40:27 UTC (rev 176964)
@@ -137,7 +137,7 @@
#endif
};
-template<typename CharacterType, unsigned inlineCapacity> void append(Vector<CharacterType, inlineCapacity>&, StringView);
+template<typename CharacterType, size_t inlineCapacity> void append(Vector<CharacterType, inlineCapacity>&, StringView);
}
@@ -442,7 +442,7 @@
StringView m_string;
};
-template<typename CharacterType, unsigned inlineCapacity> void append(Vector<CharacterType, inlineCapacity>& buffer, StringView string)
+template<typename CharacterType, size_t 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 (176963 => 176964)
--- trunk/Source/WTF/wtf/text/WTFString.h 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WTF/wtf/text/WTFString.h 2014-12-08 20:40:27 UTC (rev 176964)
@@ -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<unsigned inlineCapacity, typename OverflowHandler>
+ template<size_t 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, unsigned inlineCapacity, typename OverflowHandler>
+ template<typename CharacterType, size_t 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<unsigned inlineCapacity>
+ template<size_t 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<unsigned inlineCapacity>
+template<size_t inlineCapacity>
inline bool operator==(const Vector<char, inlineCapacity>& a, const String& b) { return equal(b.impl(), a.data(), a.size()); }
-template<unsigned inlineCapacity>
+template<size_t 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<unsigned inlineCapacity>
+template<size_t inlineCapacity>
inline bool operator!=(const Vector<char, inlineCapacity>& a, const String& b) { return !(a == b); }
-template<unsigned inlineCapacity>
+template<size_t 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<unsigned inlineCapacity>
+template<size_t 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<unsigned inlineCapacity, typename OverflowHandler>
+template<size_t 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 (176963 => 176964)
--- trunk/Source/WebCore/ChangeLog 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebCore/ChangeLog 2014-12-08 20:40:27 UTC (rev 176964)
@@ -1,3 +1,29 @@
+2014-12-08 Chris Dumez <cdu...@apple.com>
+
+ Revert r176293 & r176275
+
+ Unreviewed, revert r176293 & r176275 changing the Vector API to use unsigned type
+ instead of size_t. There is some disagreement regarding the long-term direction
+ of the API and we shouldn’t leave the API partly transitioned to unsigned type
+ while making a decision.
+
+ * WebCore.exp.in:
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::jsArray):
+ * bindings/js/JSWebGLRenderingContextCustom.cpp:
+ * cssjit/SelectorCompiler.cpp:
+ * editing/TextIterator.cpp:
+ (WebCore::SearchBuffer::append):
+ (WebCore::SearchBuffer::prependContext):
+ (WebCore::SearchBuffer::search):
+ (WebCore::SearchBuffer::length):
+ * html/HTMLFormElement.cpp:
+ (WebCore::removeFromVector):
+ * html/parser/HTMLParserIdioms.h:
+ * html/parser/XSSAuditor.cpp:
+ * platform/SharedBuffer.cpp:
+ (WebCore::SharedBuffer::duplicateDataBufferIfNecessary):
+
2014-12-08 Anders Carlsson <ander...@apple.com>
Make deleting all cookies after a given date a little more sane
Modified: trunk/Source/WebCore/WebCore.exp.in (176963 => 176964)
--- trunk/Source/WebCore/WebCore.exp.in 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-12-08 20:40:27 UTC (rev 176964)
@@ -134,7 +134,7 @@
__ZN7WebCore11CachedFrame26setCachedFramePlatformDataENSt3__110unique_ptrINS_23CachedFramePlatformDataENS1_14default_deleteIS3_EEEE
__ZN7WebCore11CachedImage16imageForRendererEPKNS_12RenderObjectE
__ZN7WebCore11FileChooser10chooseFileERKN3WTF6StringE
-__ZN7WebCore11FileChooser11chooseFilesERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore11FileChooser11chooseFilesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore11FileChooserD1Ev
__ZN7WebCore11FrameLoader11loadArchiveEN3WTF10PassRefPtrINS_7ArchiveEEE
__ZN7WebCore11FrameLoader11shouldCloseEv
@@ -162,8 +162,8 @@
__ZN7WebCore11HistoryItem14setScrollPointERKNS_8IntPointE
__ZN7WebCore11HistoryItem14setStateObjectEN3WTF10PassRefPtrINS_21SerializedScriptValueEEE
__ZN7WebCore11HistoryItem15setIsTargetItemEb
-__ZN7WebCore11HistoryItem15setRedirectURLsENSt3__110unique_ptrIN3WTF6VectorINS3_6StringELj0ENS3_15CrashOnOverflowEEENS1_14default_deleteIS7_EEEE
-__ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore11HistoryItem15setRedirectURLsENSt3__110unique_ptrIN3WTF6VectorINS3_6StringELm0ENS3_15CrashOnOverflowEEENS1_14default_deleteIS7_EEEE
+__ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore11HistoryItem17setAlternateTitleERKN3WTF6StringE
__ZN7WebCore11HistoryItem18setFormContentTypeERKN3WTF6StringE
__ZN7WebCore11HistoryItem18setPageScaleFactorEf
@@ -199,7 +199,7 @@
__ZN7WebCore11PageOverlay8setFrameENS_7IntRectE
__ZN7WebCore11SQLResultOkE
__ZN7WebCore11URLWithDataEP6NSDataP5NSURL
-__ZN7WebCore11getURLBytesEPK7__CFURLRN3WTF6VectorIcLj512ENS3_15CrashOnOverflowEEE
+__ZN7WebCore11getURLBytesEPK7__CFURLRN3WTF6VectorIcLm512ENS3_15CrashOnOverflowEEE
__ZN7WebCore11getURLBytesEPK7__CFURLRN3WTF7CStringE
__ZN7WebCore11iBeamCursorEv
__ZN7WebCore11memoryCacheEv
@@ -248,7 +248,7 @@
__ZN7WebCore12SQLResultRowE
__ZN7WebCore12SharedBuffer10wrapCFDataEPK8__CFData
__ZN7WebCore12SharedBuffer10wrapNSDataEP6NSData
-__ZN7WebCore12SharedBuffer11adoptVectorERN3WTF6VectorIcLj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore12SharedBuffer11adoptVectorERN3WTF6VectorIcLm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore12SharedBuffer12createCFDataEv
__ZN7WebCore12SharedBuffer12createNSDataEv
__ZN7WebCore12SharedBuffer14existingCFDataEv
@@ -287,7 +287,7 @@
__ZN7WebCore13CharacterData7setDataERKN3WTF6StringERi
__ZN7WebCore13ContainerNode11appendChildEN3WTF10PassRefPtrINS_4NodeEEERi
__ZN7WebCore13ContainerNode11removeChildEPNS_4NodeERi
-__ZN7WebCore13GraphicsLayer11setChildrenERKN3WTF6VectorIPS0_Lj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore13GraphicsLayer11setChildrenERKN3WTF6VectorIPS0_Lm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore13GraphicsLayer12replaceChildEPS0_S1_
__ZN7WebCore13GraphicsLayer12setZPositionEf
__ZN7WebCore13GraphicsLayer13addChildAboveEPS0_S1_
@@ -348,7 +348,7 @@
__ZN7WebCore14CachedResource16unregisterHandleEPNS_24CachedResourceHandleBaseE
__ZN7WebCore14CachedResource21tryReplaceEncodedDataERNS_12SharedBufferE
__ZN7WebCore14CachedResource9addClientEPNS_20CachedResourceClientE
-__ZN7WebCore14ClientRectListC1ERKN3WTF6VectorINS_9FloatQuadELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore14ClientRectListC1ERKN3WTF6VectorINS_9FloatQuadELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore14ClientRectListC1Ev
__ZN7WebCore14ClientRectListD1Ev
__ZN7WebCore14CredentialBaseC2ERKN3WTF6StringES4_NS_21CredentialPersistenceE
@@ -374,7 +374,7 @@
__ZN7WebCore14DocumentLoaderD2Ev
__ZN7WebCore14DocumentWriter11setEncodingERKN3WTF6StringEb
__ZN7WebCore14FileIconLoader14notifyFinishedEN3WTF10PassRefPtrINS_4IconEEE
-__ZN7WebCore14FormController22getReferencedFilePathsERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore14FormController22getReferencedFilePathsERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore14FrameSelection10setFocusedEb
__ZN7WebCore14FrameSelection12setSelectionERKNS_16VisibleSelectionEjNS0_19CursorAlignOnScrollENS_15TextGranularityE
__ZN7WebCore14FrameSelection15revealSelectionERKNS_15ScrollAlignmentENS_18RevealExtentOptionE
@@ -387,13 +387,13 @@
__ZN7WebCore14FrameSelectionC1EPNS_5FrameE
__ZN7WebCore14LoaderStrategy18createBlobRegistryEv
__ZN7WebCore14LoaderStrategy21resourceLoadSchedulerEv
-__ZN7WebCore14LoaderStrategy25loadResourceSynchronouslyEPNS_17NetworkingContextEmRKNS_15ResourceRequestENS_17StoredCredentialsENS_22ClientCredentialPolicyERNS_13ResourceErrorERNS_16ResourceResponseERN3WTF6VectorIcLj0ENSC_15CrashOnOverflowEEE
+__ZN7WebCore14LoaderStrategy25loadResourceSynchronouslyEPNS_17NetworkingContextEmRKNS_15ResourceRequestENS_17StoredCredentialsENS_22ClientCredentialPolicyERNS_13ResourceErrorERNS_16ResourceResponseERN3WTF6VectorIcLm0ENSC_15CrashOnOverflowEEE
__ZN7WebCore14PluginDocument12pluginWidgetEv
__ZN7WebCore14ResourceHandle12firstRequestEv
__ZN7WebCore14ResourceHandle16setDefersLoadingEb
__ZN7WebCore14ResourceHandle20forceContentSniffingEv
__ZN7WebCore14ResourceHandle23continueWillSendRequestERKNS_15ResourceRequestE
-__ZN7WebCore14ResourceHandle25loadResourceSynchronouslyEPNS_17NetworkingContextERKNS_15ResourceRequestENS_17StoredCredentialsERNS_13ResourceErrorERNS_16ResourceResponseERN3WTF6VectorIcLj0ENSB_15CrashOnOverflowEEE
+__ZN7WebCore14ResourceHandle25loadResourceSynchronouslyEPNS_17NetworkingContextERKNS_15ResourceRequestENS_17StoredCredentialsERNS_13ResourceErrorERNS_16ResourceResponseERN3WTF6VectorIcLm0ENSB_15CrashOnOverflowEEE
__ZN7WebCore14ResourceHandle26continueDidReceiveResponseEv
__ZN7WebCore14ResourceHandle26synchronousLoadRunLoopModeEv
__ZN7WebCore14ResourceHandle45continueCanAuthenticateAgainstProtectionSpaceEb
@@ -458,7 +458,7 @@
__ZN7WebCore14StorageTracker17initializeTrackerERKN3WTF6StringEPNS_20StorageTrackerClientE
__ZN7WebCore14StorageTracker18diskUsageForOriginEPNS_14SecurityOriginE
__ZN7WebCore14StorageTracker32syncFileSystemAndTrackerDatabaseEv
-__ZN7WebCore14StorageTracker7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore14StorageTracker7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore14StorageTracker7trackerEv
__ZN7WebCore14SubframeLoader12allowPluginsENS_28ReasonForCallingAllowPluginsE
__ZN7WebCore14TileController14setTilesOpaqueEb
@@ -490,8 +490,8 @@
__ZN7WebCore15BackForwardList11forwardItemEv
__ZN7WebCore15BackForwardList11setCapacityEi
__ZN7WebCore15BackForwardList12containsItemEPNS_11HistoryItemE
-__ZN7WebCore15BackForwardList17backListWithLimitEiRN3WTF6VectorINS1_6RefPtrINS_11HistoryItemEEELj0ENS1_15CrashOnOverflowEEE
-__ZN7WebCore15BackForwardList20forwardListWithLimitEiRN3WTF6VectorINS1_6RefPtrINS_11HistoryItemEEELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore15BackForwardList17backListWithLimitEiRN3WTF6VectorINS1_6RefPtrINS_11HistoryItemEEELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore15BackForwardList20forwardListWithLimitEiRN3WTF6VectorINS1_6RefPtrINS_11HistoryItemEEELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore15BackForwardList6closedEv
__ZN7WebCore15BackForwardList6goBackEv
__ZN7WebCore15BackForwardList7enabledEv
@@ -510,10 +510,10 @@
__ZN7WebCore15DatabaseManager14usageForOriginEPNS_14SecurityOriginE
__ZN7WebCore15DatabaseManager16hasOpenDatabasesEPNS_22ScriptExecutionContextE
__ZN7WebCore15DatabaseManager18deleteAllDatabasesEv
-__ZN7WebCore15DatabaseManager22databaseNamesForOriginEPNS_14SecurityOriginERN3WTF6VectorINS3_6StringELj0ENS3_15CrashOnOverflowEEE
+__ZN7WebCore15DatabaseManager22databaseNamesForOriginEPNS_14SecurityOriginERN3WTF6VectorINS3_6StringELm0ENS3_15CrashOnOverflowEEE
__ZN7WebCore15DatabaseManager23detailsForNameAndOriginERKN3WTF6StringEPNS_14SecurityOriginE
__ZN7WebCore15DatabaseManager7managerEv
-__ZN7WebCore15DatabaseManager7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore15DatabaseManager7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore15DatabaseManager8setQuotaEPNS_14SecurityOriginEy
__ZN7WebCore15DatabaseManager9setClientEPNS_21DatabaseManagerClientE
__ZN7WebCore15FocusController10setFocusedEb
@@ -556,7 +556,7 @@
__ZN7WebCore15GraphicsLayerCA10initializeEv
__ZN7WebCore15GraphicsLayerCA10setFiltersERKNS_16FilterOperationsE
__ZN7WebCore15GraphicsLayerCA10setOpacityEf
-__ZN7WebCore15GraphicsLayerCA11setChildrenERKN3WTF6VectorIPNS_13GraphicsLayerELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore15GraphicsLayerCA11setChildrenERKN3WTF6VectorIPNS_13GraphicsLayerELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore15GraphicsLayerCA11setPositionERKNS_10FloatPointE
__ZN7WebCore15GraphicsLayerCA12addAnimationERKNS_17KeyframeValueListERKNS_9FloatSizeEPKNS_9AnimationERKN3WTF6StringEd
__ZN7WebCore15GraphicsLayerCA12replaceChildEPNS_13GraphicsLayerES2_
@@ -621,7 +621,7 @@
__ZN7WebCore15PasteboardImageC1Ev
__ZN7WebCore15PasteboardImageD1Ev
__ZN7WebCore15PlatformCALayer15platformCALayerEPv
-__ZN7WebCore15PlatformCALayer17drawLayerContentsEP9CGContextPS0_RN3WTF6VectorINS_9FloatRectELj5ENS4_15CrashOnOverflowEEE
+__ZN7WebCore15PlatformCALayer17drawLayerContentsEP9CGContextPS0_RN3WTF6VectorINS_9FloatRectELm5ENS4_15CrashOnOverflowEEE
__ZN7WebCore15PlatformCALayerC2ENS0_9LayerTypeEPNS_21PlatformCALayerClientE
__ZN7WebCore15PlatformCALayerD2Ev
__ZN7WebCore15ProtectionSpaceC1EP20NSURLProtectionSpace
@@ -637,8 +637,8 @@
__ZN7WebCore15SQLiteStatement14executeCommandEv
__ZN7WebCore15SQLiteStatement14getColumnInt64Ei
__ZN7WebCore15SQLiteStatement21getColumnBlobAsStringEi
-__ZN7WebCore15SQLiteStatement21getColumnBlobAsVectorEiRN3WTF6VectorIcLj0ENS1_15CrashOnOverflowEEE
-__ZN7WebCore15SQLiteStatement21getColumnBlobAsVectorEiRN3WTF6VectorIhLj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore15SQLiteStatement21getColumnBlobAsVectorEiRN3WTF6VectorIcLm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore15SQLiteStatement21getColumnBlobAsVectorEiRN3WTF6VectorIhLm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore15SQLiteStatement22isColumnDeclaredAsBlobEi
__ZN7WebCore15SQLiteStatement4stepEv
__ZN7WebCore15SQLiteStatement5resetEv
@@ -704,7 +704,7 @@
__ZN7WebCore16IconDatabaseBase4openERKN3WTF6StringES4_
__ZN7WebCore16LegacyWebArchive19createFromSelectionEPNS_5FrameE
__ZN7WebCore16LegacyWebArchive21rawDataRepresentationEv
-__ZN7WebCore16LegacyWebArchive6createEN3WTF10PassRefPtrINS_15ArchiveResourceEEENS1_6VectorINS1_6RefPtrIS3_EELj0ENS1_15CrashOnOverflowEEENS5_INS6_IS0_EELj0ES8_EE
+__ZN7WebCore16LegacyWebArchive6createEN3WTF10PassRefPtrINS_15ArchiveResourceEEENS1_6VectorINS1_6RefPtrIS3_EELm0ENS1_15CrashOnOverflowEEENS5_INS6_IS0_EELm0ES8_EE
__ZN7WebCore16LegacyWebArchive6createEPNS_12SharedBufferE
__ZN7WebCore16LegacyWebArchive6createEPNS_4NodeENSt3__18functionIFbRNS_5FrameEEEE
__ZN7WebCore16LegacyWebArchive6createEPNS_5FrameE
@@ -804,14 +804,14 @@
__ZN7WebCore18PlatformPasteboard13stringForTypeERKN3WTF6StringE
__ZN7WebCore18PlatformPasteboard16setBufferForTypeEN3WTF10PassRefPtrINS_12SharedBufferEEERKNS1_6StringE
__ZN7WebCore18PlatformPasteboard16setStringForTypeERKN3WTF6StringES4_
-__ZN7WebCore18PlatformPasteboard19getPathnamesForTypeERN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEERKS3_
-__ZN7WebCore18PlatformPasteboard19setPathnamesForTypeERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEERKS3_
+__ZN7WebCore18PlatformPasteboard19getPathnamesForTypeERN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEERKS3_
+__ZN7WebCore18PlatformPasteboard19setPathnamesForTypeERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEERKS3_
__ZN7WebCore18PlatformPasteboard3urlEv
__ZN7WebCore18PlatformPasteboard4copyERKN3WTF6StringE
__ZN7WebCore18PlatformPasteboard5colorEv
-__ZN7WebCore18PlatformPasteboard8addTypesERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
-__ZN7WebCore18PlatformPasteboard8getTypesERN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
-__ZN7WebCore18PlatformPasteboard8setTypesERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore18PlatformPasteboard8addTypesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore18PlatformPasteboard8getTypesERN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore18PlatformPasteboard8setTypesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore18PlatformPasteboardC1ERKN3WTF6StringE
__ZN7WebCore18ScriptGlobalObject3setEPN3JSC9ExecStateEPKcPNS_21InspectorFrontendHostE
__ZN7WebCore18StyleSheetContents11parseStringERKN3WTF6StringE
@@ -949,11 +949,11 @@
__ZN7WebCore21ResourceLoadSchedulerC2Ev
__ZN7WebCore21ResourceLoadSchedulerD2Ev
__ZN7WebCore21SerializedScriptValue11deserializeEPK15OpaqueJSContextPPK13OpaqueJSValue
-__ZN7WebCore21SerializedScriptValue11deserializeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectEPN3WTF6VectorINS6_6RefPtrINS_11MessagePortEEELj1ENS6_15CrashOnOverflowEEENS_22SerializationErrorModeE
+__ZN7WebCore21SerializedScriptValue11deserializeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectEPN3WTF6VectorINS6_6RefPtrINS_11MessagePortEEELm1ENS6_15CrashOnOverflowEEENS_22SerializationErrorModeE
__ZN7WebCore21SerializedScriptValue6createEPK15OpaqueJSContextPK13OpaqueJSValuePS6_
-__ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueEPN3WTF6VectorINS5_6RefPtrINS_11MessagePortEEELj1ENS5_15CrashOnOverflowEEEPNS6_INS7_INS1_11ArrayBufferEEELj1ESA_EENS_22SerializationErrorModeE
+__ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueEPN3WTF6VectorINS5_6RefPtrINS_11MessagePortEEELm1ENS5_15CrashOnOverflowEEEPNS6_INS7_INS1_11ArrayBufferEEELm1ESA_EENS_22SerializationErrorModeE
__ZN7WebCore21SerializedScriptValue6createERKN3WTF6StringE
-__ZN7WebCore21SerializedScriptValueC1ERN3WTF6VectorIhLj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore21SerializedScriptValueC1ERN3WTF6VectorIhLm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore21SerializedScriptValueD1Ev
__ZN7WebCore21URLByRemovingUserInfoEP5NSURL
__ZN7WebCore21UserContentController13addUserScriptERNS_15DOMWrapperWorldENSt3__110unique_ptrINS_10UserScriptENS3_14default_deleteIS5_EEEE
@@ -998,7 +998,7 @@
__ZN7WebCore22RuntimeEnabledFeatures14sharedFeaturesEv
__ZN7WebCore22ScriptExecutionContext26canSuspendActiveDOMObjectsEv
__ZN7WebCore22ScriptExecutionContext2vmEv
-__ZN7WebCore22StorageEventDispatcher34dispatchLocalStorageEventsToFramesERNS_9PageGroupERKN3WTF6VectorINS3_6RefPtrINS_5FrameEEELj0ENS3_15CrashOnOverflowEEERKNS3_6StringESE_SE_SE_PNS_14SecurityOriginE
+__ZN7WebCore22StorageEventDispatcher34dispatchLocalStorageEventsToFramesERNS_9PageGroupERKN3WTF6VectorINS3_6RefPtrINS_5FrameEEELm0ENS3_15CrashOnOverflowEEERKNS3_6StringESE_SE_SE_PNS_14SecurityOriginE
__ZN7WebCore22URLByCanonicalizingURLEP5NSURL
__ZN7WebCore22URLWithUserTypedStringEP8NSStringP5NSURL
__ZN7WebCore22WheelEventDeltaTracker17endTrackingDeltasEv
@@ -1097,7 +1097,7 @@
__ZN7WebCore30enclosingTextUnitOfGranularityERKNS_15VisiblePositionENS_15TextGranularityENS_18SelectionDirectionE
__ZN7WebCore30hostNameNeedsDecodingWithRangeEP8NSString8_NSRange
__ZN7WebCore30hostNameNeedsEncodingWithRangeEP8NSString8_NSRange
-__ZN7WebCore30overrideUserPreferredLanguagesERKN3WTF6VectorINS0_6StringELj0ENS0_15CrashOnOverflowEEE
+__ZN7WebCore30overrideUserPreferredLanguagesERKN3WTF6VectorINS0_6StringELm0ENS0_15CrashOnOverflowEEE
__ZN7WebCore31CrossOriginPreflightResultCache5emptyEv
__ZN7WebCore31CrossOriginPreflightResultCache6sharedEv
__ZN7WebCore31equalIgnoringFragmentIdentifierERKNS_3URLES2_
@@ -1127,7 +1127,7 @@
__ZN7WebCore4FontC1ERKNS_16FontPlatformDataEbNS_17FontSmoothingModeE
__ZN7WebCore4FontC1Ev
__ZN7WebCore4FontaSERKS0_
-__ZN7WebCore4Icon18createIconForFilesERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore4Icon18createIconForFilesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore4IconD1Ev
__ZN7WebCore4Node10renderRectEPb
__ZN7WebCore4Node11appendChildEN3WTF10PassRefPtrIS0_EERi
@@ -1169,7 +1169,7 @@
__ZN7WebCore4Page22removeLayoutMilestonesEj
__ZN7WebCore4Page23clearUndoRedoOperationsEv
__ZN7WebCore4Page23invalidateStylesForLinkEy
-__ZN7WebCore4Page24findStringMatchingRangesERKN3WTF6StringEhiRNS1_6VectorINS1_6RefPtrINS_5RangeEEELj0ENS1_15CrashOnOverflowEEERi
+__ZN7WebCore4Page24findStringMatchingRangesERKN3WTF6StringEhiRNS1_6VectorINS1_6RefPtrINS_5RangeEEELm0ENS1_15CrashOnOverflowEEERi
__ZN7WebCore4Page24resumeScriptedAnimationsEv
__ZN7WebCore4Page24scrollingStateTreeAsTextEv
__ZN7WebCore4Page24setUserContentControllerEPNS_21UserContentControllerE
@@ -1242,7 +1242,7 @@
__ZN7WebCore6Editor10insertTextERKN3WTF6StringEPNS_5EventE
__ZN7WebCore6Editor13performDeleteEv
__ZN7WebCore6Editor13rangeForPointERKNS_8IntPointE
-__ZN7WebCore6Editor14setCompositionERKN3WTF6StringERKNS1_6VectorINS_20CompositionUnderlineELj0ENS1_15CrashOnOverflowEEEjj
+__ZN7WebCore6Editor14setCompositionERKN3WTF6StringERKNS1_6VectorINS_20CompositionUnderlineELm0ENS1_15CrashOnOverflowEEEjj
__ZN7WebCore6Editor14simplifyMarkupEPNS_4NodeES2_
__ZN7WebCore6Editor15pasteAsFragmentEN3WTF10PassRefPtrINS_16DocumentFragmentEEEbbNS_22MailBlockquoteHandlingE
__ZN7WebCore6Editor16pasteAsPlainTextEv
@@ -1250,8 +1250,8 @@
__ZN7WebCore6Editor17insertOrderedListEv
__ZN7WebCore6Editor18confirmCompositionERKN3WTF6StringE
__ZN7WebCore6Editor18confirmCompositionEv
-__ZN7WebCore6Editor18insertDictatedTextERKN3WTF6StringERKNS1_6VectorINS_20DictationAlternativeELj0ENS1_15CrashOnOverflowEEEPNS_5EventE
-__ZN7WebCore6Editor19countMatchesForTextERKN3WTF6StringEPNS_5RangeEhjbPNS1_6VectorINS1_6RefPtrIS5_EELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore6Editor18insertDictatedTextERKN3WTF6StringERKNS1_6VectorINS_20DictationAlternativeELm0ENS1_15CrashOnOverflowEEEPNS_5EventE
+__ZN7WebCore6Editor19countMatchesForTextERKN3WTF6StringEPNS_5RangeEhjbPNS1_6VectorINS1_6RefPtrIS5_EELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore6Editor19deleteWithDirectionENS_18SelectionDirectionENS_15TextGranularityEbb
__ZN7WebCore6Editor19insertUnorderedListEv
__ZN7WebCore6Editor21applyStyleToSelectionEPNS_15StylePropertiesENS_10EditActionE
@@ -1423,7 +1423,7 @@
__ZN7WebCore8blankURLEv
__ZN7WebCore8makeRGBAEiiii
__ZN7WebCore8openFileERKN3WTF6StringENS_12FileOpenModeE
-__ZN7WebCore8toStringERKN3WTF6VectorINS_11ProxyServerELj0ENS0_15CrashOnOverflowEEE
+__ZN7WebCore8toStringERKN3WTF6VectorINS_11ProxyServerELm0ENS0_15CrashOnOverflowEEE
__ZN7WebCore8toUInt16EPN3JSC9ExecStateENS0_7JSValueENS_30IntegerConversionConfigurationE
__ZN7WebCore8toUInt64EPN3JSC9ExecStateENS0_7JSValueENS_30IntegerConversionConfigurationE
__ZN7WebCore9AnimationC1Ev
@@ -1576,7 +1576,7 @@
__ZN7WebCore9makeRangeERKNS_15VisiblePositionES2_
__ZN7WebCore9pageCacheEv
__ZN7WebCore9plainTextEPKNS_5RangeEtb
-__ZN7WebCore9unionRectERKN3WTF6VectorINS_9FloatRectELj0ENS0_15CrashOnOverflowEEE
+__ZN7WebCore9unionRectERKN3WTF6VectorINS_9FloatRectELm0ENS0_15CrashOnOverflowEEE
__ZNK3JSC8Bindings10RootObject12globalObjectEv
__ZNK3WTF6String14createCFStringEv
__ZNK7WebCore10Credential12nsCredentialEv
@@ -1730,7 +1730,7 @@
__ZNK7WebCore14FrameSelection15copyTypingStyleEv
__ZNK7WebCore14FrameSelection15selectionBoundsEb
__ZNK7WebCore14FrameSelection18isFocusedAndActiveEv
-__ZNK7WebCore14FrameSelection31getClippedVisibleTextRectanglesERN3WTF6VectorINS_9FloatRectELj0ENS1_15CrashOnOverflowEEE
+__ZNK7WebCore14FrameSelection31getClippedVisibleTextRectanglesERN3WTF6VectorINS_9FloatRectELm0ENS1_15CrashOnOverflowEEE
__ZNK7WebCore14FrameSelection36rootEditableElementOrDocumentElementEv
__ZNK7WebCore14InsertionPoint8isActiveEv
__ZNK7WebCore14RenderListItem10markerTextEv
@@ -1942,7 +1942,7 @@
__ZNK7WebCore4Node14isDescendantOfEPKS0_
__ZNK7WebCore4Node16computeNodeIndexEv
__ZNK7WebCore4Node28deprecatedShadowAncestorNodeEv
-__ZNK7WebCore4Node9textRectsERN3WTF6VectorINS_7IntRectELj0ENS1_15CrashOnOverflowEEE
+__ZNK7WebCore4Node9textRectsERN3WTF6VectorINS_7IntRectELm0ENS1_15CrashOnOverflowEEE
__ZNK7WebCore4Page10pluginDataEv
__ZNK7WebCore4Page14renderTreeSizeEv
__ZNK7WebCore4Page15visibilityStateEv
@@ -1978,8 +1978,8 @@
__ZNK7WebCore5Range9collapsedERi
__ZNK7WebCore5Range9endOffsetERi
__ZNK7WebCore5Range9firstNodeEv
-__ZNK7WebCore5Range9textQuadsERN3WTF6VectorINS_9FloatQuadELj0ENS1_15CrashOnOverflowEEEbPNS0_20RangeInFixedPositionE
-__ZNK7WebCore5Range9textRectsERN3WTF6VectorINS_7IntRectELj0ENS1_15CrashOnOverflowEEEbPNS0_20RangeInFixedPositionE
+__ZNK7WebCore5Range9textQuadsERN3WTF6VectorINS_9FloatQuadELm0ENS1_15CrashOnOverflowEEEbPNS0_20RangeInFixedPositionE
+__ZNK7WebCore5Range9textRectsERN3WTF6VectorINS_7IntRectELm0ENS1_15CrashOnOverflowEEEbPNS0_20RangeInFixedPositionE
__ZNK7WebCore6Chrome10windowRectEv
__ZNK7WebCore6Chrome12createWindowEPNS_5FrameERKNS_16FrameLoadRequestERKNS_14WindowFeaturesERKNS_16NavigationActionE
__ZNK7WebCore6Chrome13setWindowRectERKNS_9FloatRectE
@@ -2299,7 +2299,7 @@
__ZN7WebCore13TextIndicator26createWithSelectionInFrameERNS_5FrameENS_35TextIndicatorPresentationTransitionE
__ZN7WebCore13TextIndicator6createERKNS_17TextIndicatorDataE
__ZN7WebCore13TextIndicatorD1Ev
-__ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELj0ENS6_15CrashOnOverflowEEE
+__ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELm0ENS6_15CrashOnOverflowEEE
__ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
__ZN7WebCore14cookiesEnabledERKNS_21NetworkStorageSessionERKNS_3URLES5_
__ZN7WebCore15ResourceRequest41updateFromDelegatePreservingOldPropertiesERKS0_
@@ -2499,7 +2499,7 @@
__ZN7WebCore27AlternativeTextUIController18removeAlternativesEy
__ZN7WebCore27AlternativeTextUIController22alternativesForContextEy
__ZN7WebCore27AlternativeTextUIController5clearEv
-__ZN7WebCore32collectDictationTextAlternativesEP18NSAttributedStringRN3WTF6VectorINS_24TextAlternativeWithRangeELj0ENS2_15CrashOnOverflowEEE
+__ZN7WebCore32collectDictationTextAlternativesEP18NSAttributedStringRN3WTF6VectorINS_24TextAlternativeWithRangeELm0ENS2_15CrashOnOverflowEEE
_wkCGContextDrawsWithCorrectShadowOffsets
_wkExecutableWasLinkedOnOrBeforeLion
_wkNSElasticDeltaForReboundDelta
@@ -2588,7 +2588,7 @@
__ZN7WebCore11BidiContext6createEh14UCharDirectionbNS_19BidiEmbeddingSourceEPS0_
__ZN7WebCore11CachedImage5imageEv
__ZN7WebCore11EditCommand18setEndingSelectionERKNS_16VisibleSelectionE
-__ZN7WebCore11FileChooser16chooseMediaFilesERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEERKS3_PNS_4IconE
+__ZN7WebCore11FileChooser16chooseMediaFilesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEERKS3_PNS_4IconE
__ZN7WebCore11Geolocation29resetAllGeolocationPermissionEv
__ZN7WebCore11MathMLNames4initEv
__ZN7WebCore11MemoryCache18pruneDeadResourcesEv
@@ -2611,7 +2611,7 @@
__ZN7WebCore13endOfDocumentEPKNS_4NodeE
__ZN7WebCore13endOfDocumentERKNS_15VisiblePositionE
__ZN7WebCore13endOfSentenceERKNS_15VisiblePositionE
-__ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELj0ENS6_15CrashOnOverflowEEE
+__ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELm0ENS6_15CrashOnOverflowEEE
__ZN7WebCore13isStartOfLineERKNS_15VisiblePositionE
__ZN7WebCore14DocumentLoader19setResponseMIMETypeERKN3WTF6StringE
__ZN7WebCore14DocumentWriter3endEv
@@ -2760,18 +2760,18 @@
__ZN7WebCore5Frame45setRangedSelectionBaseToCurrentSelectionStartEv
__ZN7WebCore5Frame52setRangedSelectionInitialExtentToCurrentSelectionEndEv
__ZN7WebCore5Frame54setRangedSelectionInitialExtentToCurrentSelectionStartEv
-__ZN7WebCore5Range21collectSelectionRectsERN3WTF6VectorINS_13SelectionRectELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore5Range21collectSelectionRectsERN3WTF6VectorINS_13SelectionRectELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore5Range6createERNS_8DocumentERKNS_15VisiblePositionES5_
__ZN7WebCore5Range6createERNS_8DocumentERKNS_8PositionES5_
__ZN7WebCore5Range6setEndERKNS_8PositionERi
__ZN7WebCore5Range8setStartERKNS_8PositionERi
__ZN7WebCore6Chrome11focusNSViewEP7WAKView
__ZN7WebCore6Editor17confirmMarkedTextEv
-__ZN7WebCore6Editor22insertDictationPhrasesEN3WTF10PassOwnPtrINS1_6VectorINS3_INS1_6StringELj0ENS1_15CrashOnOverflowEEELj0ES5_EEEENS1_9RetainPtrIP11objc_objectEE
+__ZN7WebCore6Editor22insertDictationPhrasesEN3WTF10PassOwnPtrINS1_6VectorINS3_INS1_6StringELm0ENS1_15CrashOnOverflowEEELm0ES5_EEEENS1_9RetainPtrIP11objc_objectEE
__ZN7WebCore6Editor23setTextAsChildOfElementERKN3WTF6StringEPNS_7ElementE
__ZN7WebCore6Editor24removeUnchangeableStylesEv
__ZN7WebCore6Editor33markMisspellingsAfterTypingToWordERKNS_15VisiblePositionERKNS_16VisibleSelectionEb
-__ZN7WebCore6Editor35setDictationPhrasesAsChildOfElementEN3WTF10PassOwnPtrINS1_6VectorINS3_INS1_6StringELj0ENS1_15CrashOnOverflowEEELj0ES5_EEEENS1_9RetainPtrIP11objc_objectEEPNS_7ElementE
+__ZN7WebCore6Editor35setDictationPhrasesAsChildOfElementEN3WTF10PassOwnPtrINS1_6VectorINS3_INS1_6StringELm0ENS1_15CrashOnOverflowEEELm0ES5_EEEENS1_9RetainPtrIP11objc_objectEEPNS_7ElementE
__ZN7WebCore6Editor46setTextAlignmentForChangedBaseWritingDirectionE16WritingDirection
__ZN7WebCore6Editor59ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTypingEv
__ZN7WebCore6Widget17setPlatformWidgetEP7WAKView
@@ -2874,9 +2874,9 @@
#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
__ZN7WebCore15ProtectionSpace28encodingRequiresPlatformDataEP20NSURLProtectionSpace
__ZN7WebCore16DiskCacheMonitorC2ERKNS_15ResourceRequestENS_9SessionIDEPK20_CFCachedURLResponse
-__ZN7WebCore23wrapSerializedCryptoKeyERKN3WTF6VectorIhLj0ENS0_15CrashOnOverflowEEES5_RS3_
-__ZN7WebCore25unwrapSerializedCryptoKeyERKN3WTF6VectorIhLj0ENS0_15CrashOnOverflowEEES5_RS3_
-__ZN7WebCore28getDefaultWebCryptoMasterKeyERN3WTF6VectorIhLj0ENS0_15CrashOnOverflowEEE
+__ZN7WebCore23wrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
+__ZN7WebCore25unwrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
+__ZN7WebCore28getDefaultWebCryptoMasterKeyERN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEE
__ZTVN7WebCore16DiskCacheMonitorE
#endif
@@ -3041,8 +3041,8 @@
#endif
#if ENABLE(CSS_SCROLL_SNAP)
-__ZN7WebCore27ScrollingStateScrollingNode22setVerticalSnapOffsetsERKN3WTF6VectorIfLj0ENS1_15CrashOnOverflowEEE
-__ZN7WebCore27ScrollingStateScrollingNode24setHorizontalSnapOffsetsERKN3WTF6VectorIfLj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore27ScrollingStateScrollingNode22setVerticalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore27ScrollingStateScrollingNode24setHorizontalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
#endif
#if ENABLE(DASHBOARD_SUPPORT)
@@ -3139,7 +3139,7 @@
__ZN7WebCore10IDBKeyDataC1EPKNS_6IDBKeyE
__ZN7WebCore10IDBKeyPath6decodeERNS_12KeyedDecoderERS0_
__ZN7WebCore10IDBKeyPathC1ERKN3WTF6StringE
-__ZN7WebCore10IDBKeyPathC1ERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore10IDBKeyPathC1ERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore18IDBDatabaseBackend14deleteDatabaseEN3WTF10PassRefPtrINS_12IDBCallbacksEEE
__ZN7WebCore18IDBDatabaseBackend14openConnectionEN3WTF10PassRefPtrINS_12IDBCallbacksEEENS2_INS_20IDBDatabaseCallbacksEEExy
__ZN7WebCore18IDBDatabaseBackend6createERKN3WTF6StringES4_PNS_26IDBFactoryBackendInterfaceERNS_19IDBServerConnectionE
@@ -3152,8 +3152,8 @@
__ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_9IndexedDB10CursorTypeEE4copyERKS2_
__ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_9IndexedDB15CursorDirectionEE4copyERKS2_
__ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_9IndexedDB15TransactionModeEE4copyERKS2_
-__ZN7WebCore25deserializeIDBValueBufferEPN3JSC9ExecStateERKN3WTF6VectorIhLj0ENS3_15CrashOnOverflowEEEb
-__ZN7WebCore25generateIndexKeysForValueEPN3JSC9ExecStateERKNS_16IDBIndexMetadataERKN10Deprecated11ScriptValueERN3WTF6VectorINS_10IDBKeyDataELj0ENSA_15CrashOnOverflowEEE
+__ZN7WebCore25deserializeIDBValueBufferEPN3JSC9ExecStateERKN3WTF6VectorIhLm0ENS3_15CrashOnOverflowEEEb
+__ZN7WebCore25generateIndexKeysForValueEPN3JSC9ExecStateERKNS_16IDBIndexMetadataERKN10Deprecated11ScriptValueERN3WTF6VectorINS_10IDBKeyDataELm0ENSA_15CrashOnOverflowEEE
__ZN7WebCore6IDBKeyD1Ev
__ZNK7WebCore10IDBKeyData17maybeCreateIDBKeyEv
__ZNK7WebCore10IDBKeyData6encodeERNS_12KeyedEncoderE
@@ -3260,13 +3260,13 @@
#if ENABLE(IOS_TOUCH_EVENTS)
.objc_class_name_WebEventRegion
__ZN7WebCore12EventHandler10touchEventEP8WebEvent
-__ZN7WebCore8Document13getTouchRectsERN3WTF6VectorINS_7IntRectELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore8Document13getTouchRectsERN3WTF6VectorINS_7IntRectELm0ENS1_15CrashOnOverflowEEE
#endif
#if ENABLE(MEDIA_SOURCE)
__ZN7WebCore12SourceBuffer25bufferedSamplesForTrackIDERKN3WTF12AtomicStringE
__ZN7WebCore14JSSourceBuffer9toWrappedEN3JSC7JSValueE
-__ZN7WebCore26MockMediaPlayerMediaSource19registerMediaEngineEPFvPFN3WTF10PassOwnPtrINS_27MediaPlayerPrivateInterfaceEEEPNS_11MediaPlayerEEPFvRNS1_7HashSetINS1_6StringENS1_10StringHashENS1_10HashTraitsISA_EEEEEPFNS5_12SupportsTypeERKNS_28MediaEngineSupportParametersEEPFvRNS1_6VectorISA_Lj0ENS1_15CrashOnOverflowEEEEPFvvEPFvRKSA_EPFbSX_SX_EE
+__ZN7WebCore26MockMediaPlayerMediaSource19registerMediaEngineEPFvPFN3WTF10PassOwnPtrINS_27MediaPlayerPrivateInterfaceEEEPNS_11MediaPlayerEEPFvRNS1_7HashSetINS1_6StringENS1_10StringHashENS1_10HashTraitsISA_EEEEEPFNS5_12SupportsTypeERKNS_28MediaEngineSupportParametersEEPFvRNS1_6VectorISA_Lm0ENS1_15CrashOnOverflowEEEEPFvvEPFvRKSA_EPFbSX_SX_EE
#endif
#if ENABLE(MEDIA_STREAM)
@@ -3439,12 +3439,12 @@
__ZN7WebCore16HTMLMediaElement15clearMediaCacheEv
__ZN7WebCore16HTMLMediaElement15togglePlayStateEv
__ZN7WebCore16HTMLMediaElement16returnToRealtimeEv
-__ZN7WebCore16HTMLMediaElement20getSitesInMediaCacheERN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEE
+__ZN7WebCore16HTMLMediaElement20getSitesInMediaCacheERN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore16HTMLMediaElement22clearMediaCacheForSiteERKN3WTF6StringE
__ZN7WebCore16HTMLMediaElement4playEv
__ZN7WebCore16HTMLMediaElement5pauseEv
__ZN7WebCore16HTMLMediaElement8setMutedEb
-__ZN7WebCore25MediaPlayerFactorySupport23callRegisterMediaEngineEPFvPFvPFN3WTF10PassOwnPtrINS_27MediaPlayerPrivateInterfaceEEEPNS_11MediaPlayerEEPFvRNS1_7HashSetINS1_6StringENS1_10StringHashENS1_10HashTraitsISA_EEEEEPFNS5_12SupportsTypeERKNS_28MediaEngineSupportParametersEEPFvRNS1_6VectorISA_Lj0ENS1_15CrashOnOverflowEEEEPFvvEPFvRKSA_EPFbSX_SX_EEE
+__ZN7WebCore25MediaPlayerFactorySupport23callRegisterMediaEngineEPFvPFvPFN3WTF10PassOwnPtrINS_27MediaPlayerPrivateInterfaceEEEPNS_11MediaPlayerEEPFvRNS1_7HashSetINS1_6StringENS1_10StringHashENS1_10HashTraitsISA_EEEEEPFNS5_12SupportsTypeERKNS_28MediaEngineSupportParametersEEPFvRNS1_6VectorISA_Lm0ENS1_15CrashOnOverflowEEEEPFvvEPFvRKSA_EPFbSX_SX_EEE
__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_10TimeRangesE
__ZNK7WebCore10TimeRanges7nearestEd
__ZNK7WebCore16HTMLMediaElement11currentTimeEv
@@ -3500,8 +3500,8 @@
__ZN7WebCore32WebVideoFullscreenInterfaceAVKit21setCanPlayFastReverseEb
__ZN7WebCore32WebVideoFullscreenInterfaceAVKit26setWebVideoFullscreenModelEPNS_23WebVideoFullscreenModelE
__ZN7WebCore32WebVideoFullscreenInterfaceAVKit28requestHideAndExitFullscreenEv
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit29setAudioMediaSelectionOptionsERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEEy
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit31setLegibleMediaSelectionOptionsERKN3WTF6VectorINS1_6StringELj0ENS1_15CrashOnOverflowEEEy
+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit29setAudioMediaSelectionOptionsERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEEy
+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit31setLegibleMediaSelectionOptionsERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEEy
__ZN7WebCore32WebVideoFullscreenInterfaceAVKit35setWebVideoFullscreenChangeObserverEPNS_32WebVideoFullscreenChangeObserverE
__ZN7WebCore32WebVideoFullscreenInterfaceAVKit7setRateEbf
__ZN7WebCore32WebVideoFullscreenInterfaceAVKitC2Ev
Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (176963 => 176964)
--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2014-12-08 20:40:27 UTC (rev 176964)
@@ -431,7 +431,7 @@
}
};
-template<typename T, unsigned inlineCapacity> JSC::JSValue jsArray(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const Vector<T, inlineCapacity>& vector)
+template<typename T, size_t 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 (176963 => 176964)
--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp 2014-12-08 20:40:27 UTC (rev 176964)
@@ -424,7 +424,7 @@
return getObjectParameter(this, exec, kVertexAttrib);
}
-template<typename T, unsigned inlineCapacity>
+template<typename T, size_t inlineCapacity>
bool toVector(JSC::ExecState* exec, JSC::JSValue value, Vector<T, inlineCapacity>& vector)
{
if (!value.isObject())
Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (176963 => 176964)
--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-12-08 20:40:27 UTC (rev 176964)
@@ -1072,7 +1072,7 @@
}
bool hasAnyCombinators(const Vector<SelectorFragmentList>& selectorList);
-template <unsigned inlineCapacity>
+template <size_t inlineCapacity>
bool hasAnyCombinators(const Vector<SelectorFragment, inlineCapacity>& selectorFragmentList);
bool hasAnyCombinators(const Vector<SelectorFragmentList>& selectorList)
@@ -1084,7 +1084,7 @@
return false;
}
-template <unsigned inlineCapacity>
+template <size_t inlineCapacity>
bool hasAnyCombinators(const Vector<SelectorFragment, inlineCapacity>& selectorFragmentList)
{
if (selectorFragmentList.isEmpty())
Modified: trunk/Source/WebCore/editing/TextIterator.cpp (176963 => 176964)
--- trunk/Source/WebCore/editing/TextIterator.cpp 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2014-12-08 20:40:27 UTC (rev 176964)
@@ -100,8 +100,8 @@
FindOptions m_options;
Vector<UChar> m_buffer;
- unsigned m_overlap;
- unsigned m_prefixLength;
+ size_t m_overlap;
+ size_t m_prefixLength;
bool m_atBreak;
bool m_needsMoreContext;
@@ -113,7 +113,7 @@
private:
void append(UChar, bool isCharacterStart);
- unsigned length() const;
+ size_t length() const;
String m_target;
FindOptions m_options;
@@ -2010,12 +2010,12 @@
m_atBreak = false;
} else if (m_buffer.size() == m_buffer.capacity()) {
memcpy(m_buffer.data(), m_buffer.data() + m_buffer.size() - m_overlap, m_overlap * sizeof(UChar));
- m_prefixLength -= std::min(m_prefixLength, static_cast<unsigned>(m_buffer.size()) - m_overlap);
+ m_prefixLength -= std::min(m_prefixLength, m_buffer.size() - m_overlap);
m_buffer.shrink(m_overlap);
}
- unsigned oldLength = m_buffer.size();
- unsigned usableLength = std::min(m_buffer.capacity() - oldLength, text.length());
+ size_t oldLength = m_buffer.size();
+ size_t usableLength = std::min<size_t>(m_buffer.capacity() - oldLength, text.length());
ASSERT(usableLength);
m_buffer.grow(oldLength + usableLength);
for (unsigned i = 0; i < usableLength; ++i)
@@ -2038,13 +2038,13 @@
m_atBreak = false;
- unsigned wordBoundaryContextStart = text.length();
+ size_t wordBoundaryContextStart = text.length();
if (wordBoundaryContextStart) {
U16_BACK_1(text, 0, wordBoundaryContextStart);
wordBoundaryContextStart = startOfLastWordBoundaryContext(text.substring(0, wordBoundaryContextStart));
}
- unsigned usableLength = std::min(m_buffer.capacity() - m_prefixLength, text.length() - wordBoundaryContextStart);
+ size_t usableLength = std::min(m_buffer.capacity() - m_prefixLength, text.length() - wordBoundaryContextStart);
WTF::append(m_buffer, text.substring(text.length() - usableLength, usableLength));
m_prefixLength += usableLength;
@@ -2190,7 +2190,7 @@
inline size_t SearchBuffer::search(size_t& start)
{
- unsigned size = m_buffer.size();
+ size_t size = m_buffer.size();
if (m_atBreak) {
if (!size)
return 0;
@@ -2221,7 +2221,7 @@
// The same match may appear later, matching more characters,
// possibly including a combining character that's not yet in the buffer.
if (!m_atBreak && static_cast<size_t>(matchStart) >= size - m_overlap) {
- unsigned overlap = m_overlap;
+ size_t overlap = m_overlap;
if (m_options & AtWordStarts) {
// Ensure that there is sufficient context before matchStart the next time around for
// determining if it is at a word boundary.
@@ -2358,11 +2358,11 @@
// Returns the number of characters that were appended to the buffer (what we are searching in).
// That's not necessarily the same length as the passed-in target string, because case folding
// can make two strings match even though they're not the same length.
-unsigned SearchBuffer::length() const
+size_t SearchBuffer::length() const
{
- unsigned bufferSize = m_target.length();
- unsigned length = 0;
- for (unsigned i = 0; i < bufferSize; ++i)
+ size_t bufferSize = m_target.length();
+ size_t length = 0;
+ for (size_t i = 0; i < bufferSize; ++i)
length += m_isCharacterStartBuffer[i];
return length;
}
Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (176963 => 176964)
--- trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-12-08 20:40:27 UTC (rev 176964)
@@ -510,7 +510,7 @@
HTMLElement::parseAttribute(name, value);
}
-template<class T, unsigned inlineCapacity> static void removeFromVector(Vector<T*, inlineCapacity> & vec, T* item)
+template<class T, size_t n> static void removeFromVector(Vector<T*, n> & vec, T* item)
{
size_t size = vec.size();
for (size_t i = 0; i != size; ++i)
Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.h (176963 => 176964)
--- trunk/Source/WebCore/html/parser/HTMLParserIdioms.h 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebCore/html/parser/HTMLParserIdioms.h 2014-12-08 20:40:27 UTC (rev 176964)
@@ -40,7 +40,7 @@
// Strip leading and trailing whitespace as defined by the HTML specification.
WEBCORE_EXPORT String stripLeadingAndTrailingHTMLSpaces(const String&);
-template<unsigned inlineCapacity>
+template<size_t inlineCapacity>
String stripLeadingAndTrailingHTMLSpaces(const Vector<UChar, inlineCapacity>& vector)
{
return stripLeadingAndTrailingHTMLSpaces(StringImpl::create8BitIfPossible(vector));
Modified: trunk/Source/WebCore/html/parser/XSSAuditor.cpp (176963 => 176964)
--- trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2014-12-08 20:40:27 UTC (rev 176964)
@@ -113,7 +113,7 @@
}
// If other files need this, we should move this to HTMLParserIdioms.h
-template<unsigned inlineCapacity>
+template<size_t inlineCapacity>
bool threadSafeMatch(const Vector<UChar, inlineCapacity>& vector, const QualifiedName& qname)
{
return equalIgnoringNullity(vector, qname.localName().impl());
Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (176963 => 176964)
--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-12-08 20:40:27 UTC (rev 176964)
@@ -252,11 +252,11 @@
void SharedBuffer::duplicateDataBufferIfNecessary() const
{
- unsigned currentCapacity = m_buffer->data.capacity();
+ size_t currentCapacity = m_buffer->data.capacity();
if (m_buffer->hasOneRef() || m_size <= currentCapacity)
return;
- unsigned newCapacity = std::max(m_size, currentCapacity * 2);
+ size_t newCapacity = std::max(static_cast<size_t>(m_size), currentCapacity * 2);
RefPtr<DataBuffer> newBuffer = adoptRef(new DataBuffer);
newBuffer->data.reserveInitialCapacity(newCapacity);
newBuffer->data = ""
Modified: trunk/Source/WebKit2/ChangeLog (176963 => 176964)
--- trunk/Source/WebKit2/ChangeLog 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-08 20:40:27 UTC (rev 176964)
@@ -1,3 +1,15 @@
+2014-12-08 Chris Dumez <cdu...@apple.com>
+
+ Revert r176293 & r176275
+
+ Unreviewed, revert r176293 & r176275 changing the Vector API to use unsigned type
+ instead of size_t. There is some disagreement regarding the long-term direction
+ of the API and we shouldn’t leave the API partly transitioned to unsigned type
+ while making a decision.
+
+ * Platform/IPC/ArgumentCoders.h:
+ * Platform/IPC/DataReference.h:
+
2014-12-08 Anders Carlsson <ander...@apple.com>
Make deleting all cookies after a given date a little more sane
Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h (176963 => 176964)
--- trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2014-12-08 20:40:27 UTC (rev 176964)
@@ -143,9 +143,9 @@
}
};
-template<bool fixedSizeElements, typename T, unsigned inlineCapacity> struct VectorArgumentCoder;
+template<bool fixedSizeElements, typename T, size_t inlineCapacity> struct VectorArgumentCoder;
-template<typename T, unsigned inlineCapacity> struct VectorArgumentCoder<false, T, inlineCapacity> {
+template<typename T, size_t 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, unsigned inlineCapacity> struct VectorArgumentCoder<true, T, inlineCapacity> {
+template<typename T, size_t 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, unsigned inlineCapacity> struct ArgumentCoder<Vector<T, inlineCapacity>> : VectorArgumentCoder<std::is_arithmetic<T>::value, T, inlineCapacity> { };
+template<typename T, size_t 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 (176963 => 176964)
--- trunk/Source/WebKit2/Platform/IPC/DataReference.h 2014-12-08 20:36:27 UTC (rev 176963)
+++ trunk/Source/WebKit2/Platform/IPC/DataReference.h 2014-12-08 20:40:27 UTC (rev 176964)
@@ -48,7 +48,7 @@
{
}
- template<unsigned inlineCapacity>
+ template<size_t inlineCapacity>
DataReference(const Vector<uint8_t, inlineCapacity>& vector)
: m_data(vector.data())
, m_size(vector.size())
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
