<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176293] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176293">176293</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-18 16:17:27 -0800 (Tue, 18 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have Vector::capacity() return an unsigned instead of a size_t
https://bugs.webkit.org/show_bug.cgi?id=138842
Reviewed by Andreas Kling.
Source/WebCore:
Update the code base now that Vector::capacity() returns an unsigned
type instead of a size_t.
No new tests, no behavior change.
* editing/TextIterator.cpp:
(WebCore::SearchBuffer::append):
(WebCore::SearchBuffer::prependContext):
(WebCore::SearchBuffer::search):
(WebCore::SearchBuffer::length):
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::duplicateDataBufferIfNecessary):
Source/WTF:
Have Vector::capacity() return an unsigned instead of a size_t as
capacity is stored as an unsigned internally.
* wtf/Vector.h:
(WTF::Vector::capacity):
(WTF::OverflowHandler>::expandCapacity):
(WTF::OverflowHandler>::tryExpandCapacity):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfVectorh">trunk/Source/WTF/wtf/Vector.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorcpp">trunk/Source/WebCore/editing/TextIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBuffercpp">trunk/Source/WebCore/platform/SharedBuffer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (176292 => 176293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-11-18 23:07:30 UTC (rev 176292)
+++ trunk/Source/WTF/ChangeLog 2014-11-19 00:17:27 UTC (rev 176293)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-11-18 Chris Dumez <cdumez@apple.com>
+
+ Have Vector::capacity() return an unsigned instead of a size_t
+ https://bugs.webkit.org/show_bug.cgi?id=138842
+
+ Reviewed by Andreas Kling.
+
+ Have Vector::capacity() return an unsigned instead of a size_t as
+ capacity is stored as an unsigned internally.
+
+ * wtf/Vector.h:
+ (WTF::Vector::capacity):
+ (WTF::OverflowHandler>::expandCapacity):
+ (WTF::OverflowHandler>::tryExpandCapacity):
+
</ins><span class="cx"> 2014-11-18 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Removed the custom allocator for ListHashSet nodes
</span></span></pre></div>
<a id="trunkSourceWTFwtfVectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Vector.h (176292 => 176293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Vector.h 2014-11-18 23:07:30 UTC (rev 176292)
+++ trunk/Source/WTF/wtf/Vector.h 2014-11-19 00:17:27 UTC (rev 176293)
</span><span class="lines">@@ -610,7 +610,7 @@
</span><span class="cx">
</span><span class="cx"> size_t size() const { return m_size; }
</span><span class="cx"> static ptrdiff_t sizeMemoryOffset() { return OBJECT_OFFSETOF(Vector, m_size); }
</span><del>- size_t capacity() const { return Base::capacity(); }
</del><ins>+ unsigned capacity() const { return Base::capacity(); }
</ins><span class="cx"> bool isEmpty() const { return !size(); }
</span><span class="cx">
</span><span class="cx"> T& at(unsigned i)
</span><span class="lines">@@ -875,7 +875,7 @@
</span><span class="cx"> template<typename T, unsigned inlineCapacity, typename OverflowHandler>
</span><span class="cx"> void Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(unsigned newMinCapacity)
</span><span class="cx"> {
</span><del>- reserveCapacity(std::max(newMinCapacity, std::max(16u, static_cast<unsigned>(capacity() + capacity() / 4 + 1))));
</del><ins>+ reserveCapacity(std::max(newMinCapacity, std::max(16u, capacity() + capacity() / 4 + 1)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, unsigned inlineCapacity, typename OverflowHandler>
</span><span class="lines">@@ -893,7 +893,7 @@
</span><span class="cx"> template<typename T, unsigned inlineCapacity, typename OverflowHandler>
</span><span class="cx"> bool Vector<T, inlineCapacity, OverflowHandler>::tryExpandCapacity(unsigned newMinCapacity)
</span><span class="cx"> {
</span><del>- return tryReserveCapacity(std::max(newMinCapacity, std::max(16u, static_cast<unsigned>(capacity() + capacity() / 4 + 1))));
</del><ins>+ return tryReserveCapacity(std::max(newMinCapacity, std::max(16u, capacity() + capacity() / 4 + 1)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, unsigned inlineCapacity, typename OverflowHandler>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176292 => 176293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-18 23:07:30 UTC (rev 176292)
+++ trunk/Source/WebCore/ChangeLog 2014-11-19 00:17:27 UTC (rev 176293)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-11-18 Chris Dumez <cdumez@apple.com>
+
+ Have Vector::capacity() return an unsigned instead of a size_t
+ https://bugs.webkit.org/show_bug.cgi?id=138842
+
+ Reviewed by Andreas Kling.
+
+ Update the code base now that Vector::capacity() returns an unsigned
+ type instead of a size_t.
+
+ No new tests, no behavior change.
+
+ * editing/TextIterator.cpp:
+ (WebCore::SearchBuffer::append):
+ (WebCore::SearchBuffer::prependContext):
+ (WebCore::SearchBuffer::search):
+ (WebCore::SearchBuffer::length):
+ * platform/SharedBuffer.cpp:
+ (WebCore::SharedBuffer::duplicateDataBufferIfNecessary):
+
</ins><span class="cx"> 2014-11-18 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Removed the custom allocator for ListHashSet nodes
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (176292 => 176293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp 2014-11-18 23:07:30 UTC (rev 176292)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2014-11-19 00:17:27 UTC (rev 176293)
</span><span class="lines">@@ -100,8 +100,8 @@
</span><span class="cx"> FindOptions m_options;
</span><span class="cx">
</span><span class="cx"> Vector<UChar> m_buffer;
</span><del>- size_t m_overlap;
- size_t m_prefixLength;
</del><ins>+ unsigned m_overlap;
+ unsigned m_prefixLength;
</ins><span class="cx"> bool m_atBreak;
</span><span class="cx"> bool m_needsMoreContext;
</span><span class="cx">
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void append(UChar, bool isCharacterStart);
</span><del>- size_t length() const;
</del><ins>+ unsigned length() const;
</ins><span class="cx">
</span><span class="cx"> String m_target;
</span><span class="cx"> FindOptions m_options;
</span><span class="lines">@@ -2010,12 +2010,12 @@
</span><span class="cx"> m_atBreak = false;
</span><span class="cx"> } else if (m_buffer.size() == m_buffer.capacity()) {
</span><span class="cx"> memcpy(m_buffer.data(), m_buffer.data() + m_buffer.size() - m_overlap, m_overlap * sizeof(UChar));
</span><del>- m_prefixLength -= std::min(m_prefixLength, m_buffer.size() - m_overlap);
</del><ins>+ m_prefixLength -= std::min(m_prefixLength, static_cast<unsigned>(m_buffer.size()) - m_overlap);
</ins><span class="cx"> m_buffer.shrink(m_overlap);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- size_t oldLength = m_buffer.size();
- size_t usableLength = std::min<size_t>(m_buffer.capacity() - oldLength, text.length());
</del><ins>+ unsigned oldLength = m_buffer.size();
+ unsigned usableLength = std::min(m_buffer.capacity() - oldLength, text.length());
</ins><span class="cx"> ASSERT(usableLength);
</span><span class="cx"> m_buffer.grow(oldLength + usableLength);
</span><span class="cx"> for (unsigned i = 0; i < usableLength; ++i)
</span><span class="lines">@@ -2038,13 +2038,13 @@
</span><span class="cx">
</span><span class="cx"> m_atBreak = false;
</span><span class="cx">
</span><del>- size_t wordBoundaryContextStart = text.length();
</del><ins>+ unsigned wordBoundaryContextStart = text.length();
</ins><span class="cx"> if (wordBoundaryContextStart) {
</span><span class="cx"> U16_BACK_1(text, 0, wordBoundaryContextStart);
</span><span class="cx"> wordBoundaryContextStart = startOfLastWordBoundaryContext(text.substring(0, wordBoundaryContextStart));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- size_t usableLength = std::min(m_buffer.capacity() - m_prefixLength, text.length() - wordBoundaryContextStart);
</del><ins>+ unsigned usableLength = std::min(m_buffer.capacity() - m_prefixLength, text.length() - wordBoundaryContextStart);
</ins><span class="cx"> WTF::append(m_buffer, text.substring(text.length() - usableLength, usableLength));
</span><span class="cx"> m_prefixLength += usableLength;
</span><span class="cx">
</span><span class="lines">@@ -2190,7 +2190,7 @@
</span><span class="cx">
</span><span class="cx"> inline size_t SearchBuffer::search(size_t& start)
</span><span class="cx"> {
</span><del>- size_t size = m_buffer.size();
</del><ins>+ unsigned size = m_buffer.size();
</ins><span class="cx"> if (m_atBreak) {
</span><span class="cx"> if (!size)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -2221,7 +2221,7 @@
</span><span class="cx"> // The same match may appear later, matching more characters,
</span><span class="cx"> // possibly including a combining character that's not yet in the buffer.
</span><span class="cx"> if (!m_atBreak && static_cast<size_t>(matchStart) >= size - m_overlap) {
</span><del>- size_t overlap = m_overlap;
</del><ins>+ unsigned overlap = m_overlap;
</ins><span class="cx"> if (m_options & AtWordStarts) {
</span><span class="cx"> // Ensure that there is sufficient context before matchStart the next time around for
</span><span class="cx"> // determining if it is at a word boundary.
</span><span class="lines">@@ -2358,11 +2358,11 @@
</span><span class="cx"> // Returns the number of characters that were appended to the buffer (what we are searching in).
</span><span class="cx"> // That's not necessarily the same length as the passed-in target string, because case folding
</span><span class="cx"> // can make two strings match even though they're not the same length.
</span><del>-size_t SearchBuffer::length() const
</del><ins>+unsigned SearchBuffer::length() const
</ins><span class="cx"> {
</span><del>- size_t bufferSize = m_target.length();
- size_t length = 0;
- for (size_t i = 0; i < bufferSize; ++i)
</del><ins>+ unsigned bufferSize = m_target.length();
+ unsigned length = 0;
+ for (unsigned i = 0; i < bufferSize; ++i)
</ins><span class="cx"> length += m_isCharacterStartBuffer[i];
</span><span class="cx"> return length;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (176292 => 176293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-11-18 23:07:30 UTC (rev 176292)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-11-19 00:17:27 UTC (rev 176293)
</span><span class="lines">@@ -252,11 +252,11 @@
</span><span class="cx">
</span><span class="cx"> void SharedBuffer::duplicateDataBufferIfNecessary() const
</span><span class="cx"> {
</span><del>- size_t currentCapacity = m_buffer->data.capacity();
</del><ins>+ unsigned currentCapacity = m_buffer->data.capacity();
</ins><span class="cx"> if (m_buffer->hasOneRef() || m_size <= currentCapacity)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- size_t newCapacity = std::max(static_cast<size_t>(m_size), currentCapacity * 2);
</del><ins>+ unsigned newCapacity = std::max(m_size, currentCapacity * 2);
</ins><span class="cx"> RefPtr<DataBuffer> newBuffer = adoptRef(new DataBuffer);
</span><span class="cx"> newBuffer->data.reserveInitialCapacity(newCapacity);
</span><span class="cx"> newBuffer->data = m_buffer->data;
</span></span></pre>
</div>
</div>
</body>
</html>