<!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>[181348] trunk</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/181348">181348</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-10 14:54:21 -0700 (Tue, 10 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use unsigned for HashSet size.
https://bugs.webkit.org/show_bug.cgi?id=142518
Patch by Alex Christensen <achristensen@webkit.org> on 2015-03-10
Reviewed by Benjamin Poulain.
Source/JavaScriptCore:
* dfg/DFGAvailabilityMap.cpp:
(JSC::DFG::AvailabilityMap::prune):
* ftl/FTLOSRExitCompiler.cpp:
(JSC::FTL::compileStub):
* heap/MarkedBlockSet.h:
(JSC::MarkedBlockSet::remove):
* runtime/WeakMapData.h:
Source/WebCore:
* Modules/websockets/WebSocketDeflateFramer.cpp:
(WebCore::WebSocketExtensionDeflateFrame::processResponse):
* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneSerializer::checkForDuplicate):
(WebCore::CloneSerializer::writeConstantPoolIndex):
* dom/ScriptRunner.cpp:
(WebCore::ScriptRunner::~ScriptRunner):
* loader/ResourceLoadScheduler.h:
* platform/graphics/Font.cpp:
(WebCore::Font::systemFallbackFontForCharacter):
* platform/graphics/FontCache.cpp:
(WebCore::FontCache::purgeInactiveFontDataIfNeeded):
(WebCore::FontCache::purgeInactiveFontData):
* platform/graphics/FontCache.h:
* platform/graphics/freetype/FontCacheFreeType.cpp:
(WebCore::FontCache::systemFallbackForCharacters):
* platform/graphics/ios/FontCacheIOS.mm:
(WebCore::FontCache::getSystemFontFallbackForCharacters):
(WebCore::FontCache::systemFallbackForCharacters):
(WebCore::FontCache::similarFont):
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::shouldAutoActivateFontIfNeeded):
(WebCore::FontCache::systemFallbackForCharacters):
(WebCore::FontCache::similarFont):
* platform/graphics/win/FontCacheWin.cpp:
(WebCore::FontCache::systemFallbackForCharacters):
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::FlexBoxIterator::next):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::computeOverflowFromCells):
Source/WTF:
* wtf/HashCountedSet.h:
(WTF::Traits>::size):
(WTF::Traits>::capacity):
* wtf/HashMap.h:
(WTF::X>::size):
(WTF::X>::capacity):
* wtf/HashSet.h:
(WTF::V>::size):
(WTF::V>::capacity):
* wtf/HashTable.h:
(WTF::HashTable::Stats::recordCollisionAtCount):
(WTF::HashTable::Stats::dumpStats):
(WTF::HashTable::size):
(WTF::HashTable::capacity):
(WTF::KeyTraits>::deallocateTable):
(WTF::KeyTraits>::checkTableConsistencyExceptSize):
* wtf/HashTraits.h:
* wtf/ListHashSet.h:
(WTF::U>::size):
(WTF::U>::capacity):
Tools:
* TestWebKitAPI/Tests/WTF/HashMap.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WTF/HashSet.cpp:
(TestWebKitAPI::testInitialCapacity):
* TestWebKitAPI/Tests/WTF/ListHashSet.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAvailabilityMapcpp">trunk/Source/JavaScriptCore/dfg/DFGAvailabilityMap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOSRExitCompilercpp">trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedBlockSeth">trunk/Source/JavaScriptCore/heap/MarkedBlockSet.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWeakMapDatah">trunk/Source/JavaScriptCore/runtime/WeakMapData.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfHashCountedSeth">trunk/Source/WTF/wtf/HashCountedSet.h</a></li>
<li><a href="#trunkSourceWTFwtfHashMaph">trunk/Source/WTF/wtf/HashMap.h</a></li>
<li><a href="#trunkSourceWTFwtfHashSeth">trunk/Source/WTF/wtf/HashSet.h</a></li>
<li><a href="#trunkSourceWTFwtfHashTableh">trunk/Source/WTF/wtf/HashTable.h</a></li>
<li><a href="#trunkSourceWTFwtfHashTraitsh">trunk/Source/WTF/wtf/HashTraits.h</a></li>
<li><a href="#trunkSourceWTFwtfListHashSeth">trunk/Source/WTF/wtf/ListHashSet.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketDeflateFramercpp">trunk/Source/WebCore/Modules/websockets/WebSocketDeflateFramer.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValuecpp">trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptRunnercpp">trunk/Source/WebCore/dom/ScriptRunner.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadSchedulerh">trunk/Source/WebCore/loader/ResourceLoadScheduler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontcpp">trunk/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCachecpp">trunk/Source/WebCore/platform/graphics/FontCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCacheh">trunk/Source/WebCore/platform/graphics/FontCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfreetypeFontCacheFreeTypecpp">trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm">trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm">trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCacheWincpp">trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectioncpp">trunk/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFHashMapcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFHashSetcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFListHashSetcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-03-10 Alex Christensen <achristensen@webkit.org>
+
+ Use unsigned for HashSet size.
+ https://bugs.webkit.org/show_bug.cgi?id=142518
+
+ Reviewed by Benjamin Poulain.
+
+ * dfg/DFGAvailabilityMap.cpp:
+ (JSC::DFG::AvailabilityMap::prune):
+ * ftl/FTLOSRExitCompiler.cpp:
+ (JSC::FTL::compileStub):
+ * heap/MarkedBlockSet.h:
+ (JSC::MarkedBlockSet::remove):
+ * runtime/WeakMapData.h:
+
</ins><span class="cx"> 2015-03-10 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Use std::numeric_limits<unsigned>::max() instead of (unsigned)-1.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAvailabilityMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAvailabilityMap.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAvailabilityMap.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/JavaScriptCore/dfg/DFGAvailabilityMap.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> possibleNodes.add(m_locals[i].node());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int oldPossibleNodesSize;
</del><ins>+ unsigned oldPossibleNodesSize;
</ins><span class="cx"> do {
</span><span class="cx"> oldPossibleNodesSize = possibleNodes.size();
</span><span class="cx"> for (auto pair : m_heap) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOSRExitCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> toMaterialize.add(materialization);
</span><span class="cx">
</span><span class="cx"> while (!toMaterialize.isEmpty()) {
</span><del>- int previousToMaterializeSize = toMaterialize.size();
</del><ins>+ unsigned previousToMaterializeSize = toMaterialize.size();
</ins><span class="cx">
</span><span class="cx"> Vector<ExitTimeObjectMaterialization*> worklist;
</span><span class="cx"> worklist.appendRange(toMaterialize.begin(), toMaterialize.end());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlockSet.h (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlockSet.h 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlockSet.h 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> inline void MarkedBlockSet::remove(MarkedBlock* block)
</span><span class="cx"> {
</span><del>- int oldCapacity = m_set.capacity();
</del><ins>+ unsigned oldCapacity = m_set.capacity();
</ins><span class="cx"> m_set.remove(block);
</span><span class="cx"> if (m_set.capacity() != oldCapacity) // Indicates we've removed a lot of blocks.
</span><span class="cx"> recomputeFilter();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWeakMapDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WeakMapData.h (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WeakMapData.h 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/JavaScriptCore/runtime/WeakMapData.h 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual void visitWeakReferences(SlotVisitor&) override;
</span><span class="cx"> virtual void finalizeUnconditionally() override;
</span><del>- int m_liveKeyCount;
</del><ins>+ unsigned m_liveKeyCount;
</ins><span class="cx"> WeakMapData* m_target;
</span><span class="cx"> };
</span><span class="cx"> DeadKeyCleaner m_deadKeyCleaner;
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WTF/ChangeLog 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-03-10 Alex Christensen <achristensen@webkit.org>
+
+ Use unsigned for HashSet size.
+ https://bugs.webkit.org/show_bug.cgi?id=142518
+
+ Reviewed by Benjamin Poulain.
+
+ * wtf/HashCountedSet.h:
+ (WTF::Traits>::size):
+ (WTF::Traits>::capacity):
+ * wtf/HashMap.h:
+ (WTF::X>::size):
+ (WTF::X>::capacity):
+ * wtf/HashSet.h:
+ (WTF::V>::size):
+ (WTF::V>::capacity):
+ * wtf/HashTable.h:
+ (WTF::HashTable::Stats::recordCollisionAtCount):
+ (WTF::HashTable::Stats::dumpStats):
+ (WTF::HashTable::size):
+ (WTF::HashTable::capacity):
+ (WTF::KeyTraits>::deallocateTable):
+ (WTF::KeyTraits>::checkTableConsistencyExceptSize):
+ * wtf/HashTraits.h:
+ * wtf/ListHashSet.h:
+ (WTF::U>::size):
+ (WTF::U>::capacity):
+
</ins><span class="cx"> 2015-03-10 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr from svg/properties classes.
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashCountedSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashCountedSet.h (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashCountedSet.h 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WTF/wtf/HashCountedSet.h 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx">
</span><span class="cx"> void swap(HashCountedSet&);
</span><span class="cx">
</span><del>- int size() const;
- int capacity() const;
</del><ins>+ unsigned size() const;
+ unsigned capacity() const;
</ins><span class="cx"> bool isEmpty() const;
</span><span class="cx">
</span><span class="cx"> // Iterators iterate over pairs of values and counts.
</span><span class="lines">@@ -84,13 +84,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Value, typename HashFunctions, typename Traits>
</span><del>- inline int HashCountedSet<Value, HashFunctions, Traits>::size() const
</del><ins>+ inline unsigned HashCountedSet<Value, HashFunctions, Traits>::size() const
</ins><span class="cx"> {
</span><span class="cx"> return m_impl.size();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Value, typename HashFunctions, typename Traits>
</span><del>- inline int HashCountedSet<Value, HashFunctions, Traits>::capacity() const
</del><ins>+ inline unsigned HashCountedSet<Value, HashFunctions, Traits>::capacity() const
</ins><span class="cx"> {
</span><span class="cx"> return m_impl.capacity();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashMap.h (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashMap.h 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WTF/wtf/HashMap.h 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -81,8 +81,8 @@
</span><span class="cx">
</span><span class="cx"> void swap(HashMap&);
</span><span class="cx">
</span><del>- int size() const;
- int capacity() const;
</del><ins>+ unsigned size() const;
+ unsigned capacity() const;
</ins><span class="cx"> bool isEmpty() const;
</span><span class="cx">
</span><span class="cx"> // iterators iterate over pairs of keys and values
</span><span class="lines">@@ -195,13 +195,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V, typename W, typename X>
</span><del>-inline int HashMap<T, U, V, W, X>::size() const
</del><ins>+inline unsigned HashMap<T, U, V, W, X>::size() const
</ins><span class="cx"> {
</span><span class="cx"> return m_impl.size();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V, typename W, typename X>
</span><del>-inline int HashMap<T, U, V, W, X>::capacity() const
</del><ins>+inline unsigned HashMap<T, U, V, W, X>::capacity() const
</ins><span class="cx"> {
</span><span class="cx"> return m_impl.capacity();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashSet.h (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashSet.h 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WTF/wtf/HashSet.h 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -63,8 +63,8 @@
</span><span class="cx">
</span><span class="cx"> void swap(HashSet&);
</span><span class="cx">
</span><del>- int size() const;
- int capacity() const;
</del><ins>+ unsigned size() const;
+ unsigned capacity() const;
</ins><span class="cx"> bool isEmpty() const;
</span><span class="cx">
</span><span class="cx"> iterator begin() const;
</span><span class="lines">@@ -149,13 +149,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V>
</span><del>- inline int HashSet<T, U, V>::size() const
</del><ins>+ inline unsigned HashSet<T, U, V>::size() const
</ins><span class="cx"> {
</span><span class="cx"> return m_impl.size();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V>
</span><del>- inline int HashSet<T, U, V>::capacity() const
</del><ins>+ inline unsigned HashSet<T, U, V>::capacity() const
</ins><span class="cx"> {
</span><span class="cx"> return m_impl.capacity();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashTable.h (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashTable.h 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WTF/wtf/HashTable.h 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -313,16 +313,16 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int numAccesses;
- int numRehashes;
- int numRemoves;
- int numReinserts;
</del><ins>+ unsigned numAccesses;
+ unsigned numRehashes;
+ unsigned numRemoves;
+ unsigned numReinserts;
</ins><span class="cx">
</span><del>- int maxCollisions;
- int numCollisions;
- int collisionGraph[4096];
</del><ins>+ unsigned maxCollisions;
+ unsigned numCollisions;
+ unsigned collisionGraph[4096];
</ins><span class="cx">
</span><del>- void recordCollisionAtCount(int count)
</del><ins>+ void recordCollisionAtCount(unsigned count)
</ins><span class="cx"> {
</span><span class="cx"> if (count > maxCollisions)
</span><span class="cx"> maxCollisions = count;
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> dataLogF("%d accesses\n", numAccesses);
</span><span class="cx"> dataLogF("%d total collisions, average %.2f probes per access\n", numCollisions, 1.0 * (numAccesses + numCollisions) / numAccesses);
</span><span class="cx"> dataLogF("longest collision chain: %d\n", maxCollisions);
</span><del>- for (int i = 1; i <= maxCollisions; i++) {
</del><ins>+ for (unsigned i = 1; i <= maxCollisions; i++) {
</ins><span class="cx"> dataLogF(" %d lookups with exactly %d collisions (%.2f%% , %.2f%% with this many or more)\n", collisionGraph[i], i, 100.0 * (collisionGraph[i] - collisionGraph[i+1]) / numAccesses, 100.0 * collisionGraph[i] / numAccesses);
</span><span class="cx"> }
</span><span class="cx"> dataLogF("%d rehashes\n", numRehashes);
</span><span class="lines">@@ -371,8 +371,8 @@
</span><span class="cx"> const_iterator begin() const { return isEmpty() ? end() : makeConstIterator(m_table); }
</span><span class="cx"> const_iterator end() const { return makeKnownGoodConstIterator(m_table + m_tableSize); }
</span><span class="cx">
</span><del>- int size() const { return m_keyCount; }
- int capacity() const { return m_tableSize; }
</del><ins>+ unsigned size() const { return m_keyCount; }
+ unsigned capacity() const { return m_tableSize; }
</ins><span class="cx"> bool isEmpty() const { return !m_keyCount; }
</span><span class="cx">
</span><span class="cx"> AddResult add(const ValueType& value) { return add<IdentityTranslatorType>(Extractor::extract(value), value); }
</span><span class="lines">@@ -421,8 +421,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static ValueType* allocateTable(int size);
- static void deallocateTable(ValueType* table, int size);
</del><ins>+ static ValueType* allocateTable(unsigned size);
+ static void deallocateTable(ValueType* table, unsigned size);
</ins><span class="cx">
</span><span class="cx"> typedef std::pair<ValueType*, bool> LookupType;
</span><span class="cx"> typedef std::pair<LookupType, unsigned> FullLookupType;
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx"> ValueType* expand(ValueType* entry = nullptr);
</span><span class="cx"> void shrink() { rehash(m_tableSize / 2, nullptr); }
</span><span class="cx">
</span><del>- ValueType* rehash(int newTableSize, ValueType* entry);
</del><ins>+ ValueType* rehash(unsigned newTableSize, ValueType* entry);
</ins><span class="cx"> ValueType* reinsert(ValueType&&);
</span><span class="cx">
</span><span class="cx"> static void initializeBucket(ValueType& bucket);
</span><span class="lines">@@ -469,14 +469,14 @@
</span><span class="cx"> static void invalidateIterators() { }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- static const int m_maxLoad = 2;
- static const int m_minLoad = 6;
</del><ins>+ static const unsigned m_maxLoad = 2;
+ static const unsigned m_minLoad = 6;
</ins><span class="cx">
</span><span class="cx"> ValueType* m_table;
</span><del>- int m_tableSize;
- int m_tableSizeMask;
- int m_keyCount;
- int m_deletedCount;
</del><ins>+ unsigned m_tableSize;
+ unsigned m_tableSizeMask;
+ unsigned m_keyCount;
+ unsigned m_deletedCount;
</ins><span class="cx">
</span><span class="cx"> #if CHECK_HASHTABLE_ITERATORS
</span><span class="cx"> public:
</span><span class="lines">@@ -526,7 +526,7 @@
</span><span class="cx"> struct HashTableCapacityForSize {
</span><span class="cx"> static const unsigned value = HashTableCapacityForSizeSplitter<size, !(size & (size - 1))>::value;
</span><span class="cx"> COMPILE_ASSERT(size > 0, HashTableNonZeroMinimumCapacity);
</span><del>- COMPILE_ASSERT(!static_cast<int>(value >> 31), HashTableNoCapacityOverflow);
</del><ins>+ COMPILE_ASSERT(!static_cast<unsigned>(value >> 31), HashTableNoCapacityOverflow);
</ins><span class="cx"> COMPILE_ASSERT(value > (2 * size), HashTableCapacityHoldsContentSize);
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -589,11 +589,11 @@
</span><span class="cx"> {
</span><span class="cx"> checkKey<HashTranslator>(key);
</span><span class="cx">
</span><del>- int k = 0;
- int sizeMask = m_tableSizeMask;
</del><ins>+ unsigned k = 0;
+ unsigned sizeMask = m_tableSizeMask;
</ins><span class="cx"> ValueType* table = m_table;
</span><span class="cx"> unsigned h = HashTranslator::hash(key);
</span><del>- int i = h & sizeMask;
</del><ins>+ unsigned i = h & sizeMask;
</ins><span class="cx">
</span><span class="cx"> if (!table)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -646,15 +646,15 @@
</span><span class="cx"> ASSERT(m_table);
</span><span class="cx"> checkKey<HashTranslator>(key);
</span><span class="cx">
</span><del>- int k = 0;
</del><ins>+ unsigned k = 0;
</ins><span class="cx"> ValueType* table = m_table;
</span><del>- int sizeMask = m_tableSizeMask;
</del><ins>+ unsigned sizeMask = m_tableSizeMask;
</ins><span class="cx"> unsigned h = HashTranslator::hash(key);
</span><del>- int i = h & sizeMask;
</del><ins>+ unsigned i = h & sizeMask;
</ins><span class="cx">
</span><span class="cx"> #if DUMP_HASHTABLE_STATS
</span><span class="cx"> ++HashTableStats::numAccesses;
</span><del>- int probeCount = 0;
</del><ins>+ unsigned probeCount = 0;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if DUMP_HASHTABLE_STATS_PER_TABLE
</span><span class="lines">@@ -707,11 +707,11 @@
</span><span class="cx"> ASSERT(m_table);
</span><span class="cx"> checkKey<HashTranslator>(key);
</span><span class="cx">
</span><del>- int k = 0;
</del><ins>+ unsigned k = 0;
</ins><span class="cx"> ValueType* table = m_table;
</span><del>- int sizeMask = m_tableSizeMask;
</del><ins>+ unsigned sizeMask = m_tableSizeMask;
</ins><span class="cx"> unsigned h = HashTranslator::hash(key);
</span><del>- int i = h & sizeMask;
</del><ins>+ unsigned i = h & sizeMask;
</ins><span class="cx">
</span><span class="cx"> #if DUMP_HASHTABLE_STATS
</span><span class="cx"> ++HashTableStats::numAccesses;
</span><span class="lines">@@ -801,11 +801,11 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_table);
</span><span class="cx">
</span><del>- int k = 0;
</del><ins>+ unsigned k = 0;
</ins><span class="cx"> ValueType* table = m_table;
</span><del>- int sizeMask = m_tableSizeMask;
</del><ins>+ unsigned sizeMask = m_tableSizeMask;
</ins><span class="cx"> unsigned h = HashTranslator::hash(key);
</span><del>- int i = h & sizeMask;
</del><ins>+ unsigned i = h & sizeMask;
</ins><span class="cx">
</span><span class="cx"> #if DUMP_HASHTABLE_STATS
</span><span class="cx"> ++HashTableStats::numAccesses;
</span><span class="lines">@@ -1058,22 +1058,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
</span><del>- auto HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::allocateTable(int size) -> ValueType*
</del><ins>+ auto HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::allocateTable(unsigned size) -> ValueType*
</ins><span class="cx"> {
</span><span class="cx"> // would use a template member function with explicit specializations here, but
</span><span class="cx"> // gcc doesn't appear to support that
</span><span class="cx"> if (Traits::emptyValueIsZero)
</span><span class="cx"> return static_cast<ValueType*>(fastZeroedMalloc(size * sizeof(ValueType)));
</span><span class="cx"> ValueType* result = static_cast<ValueType*>(fastMalloc(size * sizeof(ValueType)));
</span><del>- for (int i = 0; i < size; i++)
</del><ins>+ for (unsigned i = 0; i < size; i++)
</ins><span class="cx"> initializeBucket(result[i]);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
</span><del>- void HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::deallocateTable(ValueType* table, int size)
</del><ins>+ void HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::deallocateTable(ValueType* table, unsigned size)
</ins><span class="cx"> {
</span><del>- for (int i = 0; i < size; ++i) {
</del><ins>+ for (unsigned i = 0; i < size; ++i) {
</ins><span class="cx"> if (!isDeletedBucket(table[i]))
</span><span class="cx"> table[i].~ValueType();
</span><span class="cx"> }
</span><span class="lines">@@ -1083,7 +1083,7 @@
</span><span class="cx"> template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
</span><span class="cx"> auto HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::expand(ValueType* entry) -> ValueType*
</span><span class="cx"> {
</span><del>- int newSize;
</del><ins>+ unsigned newSize;
</ins><span class="cx"> if (m_tableSize == 0)
</span><span class="cx"> newSize = KeyTraits::minimumTableSize;
</span><span class="cx"> else if (mustRehashInPlace())
</span><span class="lines">@@ -1095,11 +1095,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
</span><del>- auto HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::rehash(int newTableSize, ValueType* entry) -> ValueType*
</del><ins>+ auto HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::rehash(unsigned newTableSize, ValueType* entry) -> ValueType*
</ins><span class="cx"> {
</span><span class="cx"> internalCheckTableConsistencyExceptSize();
</span><span class="cx">
</span><del>- int oldTableSize = m_tableSize;
</del><ins>+ unsigned oldTableSize = m_tableSize;
</ins><span class="cx"> ValueType* oldTable = m_table;
</span><span class="cx">
</span><span class="cx"> #if DUMP_HASHTABLE_STATS
</span><span class="lines">@@ -1117,7 +1117,7 @@
</span><span class="cx"> m_table = allocateTable(newTableSize);
</span><span class="cx">
</span><span class="cx"> Value* newEntry = nullptr;
</span><del>- for (int i = 0; i != oldTableSize; ++i) {
</del><ins>+ for (unsigned i = 0; i != oldTableSize; ++i) {
</ins><span class="cx"> if (isEmptyOrDeletedBucket(oldTable[i])) {
</span><span class="cx"> ASSERT(&oldTable[i] != entry);
</span><span class="cx"> continue;
</span><span class="lines">@@ -1254,9 +1254,9 @@
</span><span class="cx"> if (!m_table)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- int count = 0;
- int deletedCount = 0;
- for (int j = 0; j < m_tableSize; ++j) {
</del><ins>+ unsigned count = 0;
+ unsigned deletedCount = 0;
+ for (unsigned j = 0; j < m_tableSize; ++j) {
</ins><span class="cx"> ValueType* entry = m_table + j;
</span><span class="cx"> if (isEmptyBucket(*entry))
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashTraitsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashTraits.h (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashTraits.h 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WTF/wtf/HashTraits.h 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> // The starting table size. Can be overridden when we know beforehand that
</span><span class="cx"> // a hash table will have at least N entries.
</span><del>- static const int minimumTableSize = 8;
</del><ins>+ static const unsigned minimumTableSize = 8;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Default integer traits disallow both 0 and -1 as keys (max value instead of -1 for unsigned).
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> static const bool emptyValueIsZero = FirstTraits::emptyValueIsZero && SecondTraits::emptyValueIsZero;
</span><span class="cx"> static EmptyValueType emptyValue() { return std::make_pair(FirstTraits::emptyValue(), SecondTraits::emptyValue()); }
</span><span class="cx">
</span><del>- static const int minimumTableSize = FirstTraits::minimumTableSize;
</del><ins>+ static const unsigned minimumTableSize = FirstTraits::minimumTableSize;
</ins><span class="cx">
</span><span class="cx"> static void constructDeletedValue(TraitType& slot) { FirstTraits::constructDeletedValue(slot.first); }
</span><span class="cx"> static bool isDeletedValue(const TraitType& value) { return FirstTraits::isDeletedValue(value.first); }
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> static const bool emptyValueIsZero = KeyTraits::emptyValueIsZero && ValueTraits::emptyValueIsZero;
</span><span class="cx"> static EmptyValueType emptyValue() { return KeyValuePair<typename KeyTraits::EmptyValueType, typename ValueTraits::EmptyValueType>(KeyTraits::emptyValue(), ValueTraits::emptyValue()); }
</span><span class="cx">
</span><del>- static const int minimumTableSize = KeyTraits::minimumTableSize;
</del><ins>+ static const unsigned minimumTableSize = KeyTraits::minimumTableSize;
</ins><span class="cx">
</span><span class="cx"> static void constructDeletedValue(TraitType& slot) { KeyTraits::constructDeletedValue(slot.key); }
</span><span class="cx"> static bool isDeletedValue(const TraitType& value) { return KeyTraits::isDeletedValue(value.key); }
</span></span></pre></div>
<a id="trunkSourceWTFwtfListHashSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ListHashSet.h (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ListHashSet.h 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WTF/wtf/ListHashSet.h 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -78,8 +78,8 @@
</span><span class="cx">
</span><span class="cx"> void swap(ListHashSet&);
</span><span class="cx">
</span><del>- int size() const;
- int capacity() const;
</del><ins>+ unsigned size() const;
+ unsigned capacity() const;
</ins><span class="cx"> bool isEmpty() const;
</span><span class="cx">
</span><span class="cx"> iterator begin() { return makeIterator(m_head); }
</span><span class="lines">@@ -347,13 +347,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U>
</span><del>-inline int ListHashSet<T, U>::size() const
</del><ins>+inline unsigned ListHashSet<T, U>::size() const
</ins><span class="cx"> {
</span><span class="cx"> return m_impl.size();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U>
</span><del>-inline int ListHashSet<T, U>::capacity() const
</del><ins>+inline unsigned ListHashSet<T, U>::capacity() const
</ins><span class="cx"> {
</span><span class="cx"> return m_impl.capacity();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/ChangeLog 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2015-03-10 Alex Christensen <achristensen@webkit.org>
+
+ Use unsigned for HashSet size.
+ https://bugs.webkit.org/show_bug.cgi?id=142518
+
+ Reviewed by Benjamin Poulain.
+
+ * Modules/websockets/WebSocketDeflateFramer.cpp:
+ (WebCore::WebSocketExtensionDeflateFrame::processResponse):
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::CloneSerializer::checkForDuplicate):
+ (WebCore::CloneSerializer::writeConstantPoolIndex):
+ * dom/ScriptRunner.cpp:
+ (WebCore::ScriptRunner::~ScriptRunner):
+ * loader/ResourceLoadScheduler.h:
+ * platform/graphics/Font.cpp:
+ (WebCore::Font::systemFallbackFontForCharacter):
+ * platform/graphics/FontCache.cpp:
+ (WebCore::FontCache::purgeInactiveFontDataIfNeeded):
+ (WebCore::FontCache::purgeInactiveFontData):
+ * platform/graphics/FontCache.h:
+ * platform/graphics/freetype/FontCacheFreeType.cpp:
+ (WebCore::FontCache::systemFallbackForCharacters):
+ * platform/graphics/ios/FontCacheIOS.mm:
+ (WebCore::FontCache::getSystemFontFallbackForCharacters):
+ (WebCore::FontCache::systemFallbackForCharacters):
+ (WebCore::FontCache::similarFont):
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::shouldAutoActivateFontIfNeeded):
+ (WebCore::FontCache::systemFallbackForCharacters):
+ (WebCore::FontCache::similarFont):
+ * platform/graphics/win/FontCacheWin.cpp:
+ (WebCore::FontCache::systemFallbackForCharacters):
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::FlexBoxIterator::next):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::computeOverflowFromCells):
+
</ins><span class="cx"> 2015-03-10 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Refactor media controls code
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketDeflateFramercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketDeflateFramer.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketDeflateFramer.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketDeflateFramer.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> }
</span><span class="cx"> m_responseProcessed = true;
</span><span class="cx">
</span><del>- int expectedNumParameters = 0;
</del><ins>+ unsigned expectedNumParameters = 0;
</ins><span class="cx"> int windowBits = 15;
</span><span class="cx"> HashMap<String, String>::const_iterator parameter = serverParameters.find("max_window_bits");
</span><span class="cx"> if (parameter != serverParameters.end()) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> // Handle duplicate references
</span><span class="cx"> if (found != m_objectPool.end()) {
</span><span class="cx"> write(ObjectReferenceTag);
</span><del>- ASSERT(static_cast<int32_t>(found->value) < m_objectPool.size());
</del><ins>+ ASSERT(found->value < m_objectPool.size());
</ins><span class="cx"> writeObjectIndex(found->value);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -965,7 +965,7 @@
</span><span class="cx">
</span><span class="cx"> template <class T> void writeConstantPoolIndex(const T& constantPool, unsigned i)
</span><span class="cx"> {
</span><del>- ASSERT(static_cast<int32_t>(i) < constantPool.size());
</del><ins>+ ASSERT(i < constantPool.size());
</ins><span class="cx"> if (constantPool.size() <= 0xFF)
</span><span class="cx"> write(static_cast<uint8_t>(i));
</span><span class="cx"> else if (constantPool.size() <= 0xFFFF)
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptRunner.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptRunner.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/dom/ScriptRunner.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> m_document.decrementLoadEventDelayCount();
</span><span class="cx"> for (size_t i = 0; i < m_scriptsToExecuteInOrder.size(); ++i)
</span><span class="cx"> m_document.decrementLoadEventDelayCount();
</span><del>- for (int i = 0; i < m_pendingAsyncScripts.size(); ++i)
</del><ins>+ for (unsigned i = 0; i < m_pendingAsyncScripts.size(); ++i)
</ins><span class="cx"> m_document.decrementLoadEventDelayCount();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadScheduler.h (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadScheduler.h 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/loader/ResourceLoadScheduler.h 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> typedef HashSet<RefPtr<ResourceLoader>> RequestMap;
</span><span class="cx"> RequestMap m_requestsLoading;
</span><span class="cx"> const String m_name;
</span><del>- const int m_maxRequestsInFlight;
</del><ins>+ const unsigned m_maxRequestsInFlight;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum CreateHostPolicy {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx">
</span><span class="cx"> if (!fallbackFont) {
</span><span class="cx"> UChar codeUnits[2];
</span><del>- int codeUnitsLength;
</del><ins>+ unsigned codeUnitsLength;
</ins><span class="cx"> if (U_IS_BMP(character)) {
</span><span class="cx"> codeUnits[0] = FontCascade::normalizeSpaces(character);
</span><span class="cx"> codeUnitsLength = 1;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -368,15 +368,15 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-const int cMaxInactiveFontData = 120;
-const int cTargetInactiveFontData = 100;
</del><ins>+const unsigned cMaxInactiveFontData = 120;
+const unsigned cTargetInactiveFontData = 100;
</ins><span class="cx"> #else
</span><del>-const int cMaxInactiveFontData = 225;
-const int cTargetInactiveFontData = 200;
</del><ins>+const unsigned cMaxInactiveFontData = 225;
+const unsigned cTargetInactiveFontData = 200;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-const int cMaxUnderMemoryPressureInactiveFontData = 50;
-const int cTargetUnderMemoryPressureInactiveFontData = 30;
</del><ins>+const unsigned cMaxUnderMemoryPressureInactiveFontData = 50;
+const unsigned cTargetUnderMemoryPressureInactiveFontData = 30;
</ins><span class="cx">
</span><span class="cx"> RefPtr<Font> FontCache::fontForFamily(const FontDescription& fontDescription, const AtomicString& family, bool checkingAlternateName)
</span><span class="cx"> {
</span><span class="lines">@@ -411,19 +411,19 @@
</span><span class="cx"> void FontCache::purgeInactiveFontDataIfNeeded()
</span><span class="cx"> {
</span><span class="cx"> bool underMemoryPressure = MemoryPressureHandler::singleton().isUnderMemoryPressure();
</span><del>- int inactiveFontDataLimit = underMemoryPressure ? cMaxUnderMemoryPressureInactiveFontData : cMaxInactiveFontData;
</del><ins>+ unsigned inactiveFontDataLimit = underMemoryPressure ? cMaxUnderMemoryPressureInactiveFontData : cMaxInactiveFontData;
</ins><span class="cx">
</span><span class="cx"> if (cachedFonts().size() < inactiveFontDataLimit)
</span><span class="cx"> return;
</span><del>- int inactiveCount = inactiveFontCount();
</del><ins>+ unsigned inactiveCount = inactiveFontCount();
</ins><span class="cx"> if (inactiveCount <= inactiveFontDataLimit)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- int targetFontDataLimit = underMemoryPressure ? cTargetUnderMemoryPressureInactiveFontData : cTargetInactiveFontData;
</del><ins>+ unsigned targetFontDataLimit = underMemoryPressure ? cTargetUnderMemoryPressureInactiveFontData : cTargetInactiveFontData;
</ins><span class="cx"> purgeInactiveFontData(inactiveCount - targetFontDataLimit);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FontCache::purgeInactiveFontData(int purgeCount)
</del><ins>+void FontCache::purgeInactiveFontData(unsigned purgeCount)
</ins><span class="cx"> {
</span><span class="cx"> pruneUnreferencedEntriesFromFontCascadeCache();
</span><span class="cx"> pruneSystemFallbackFonts();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> WEBCORE_EXPORT static FontCache& singleton();
</span><span class="cx">
</span><span class="cx"> // This method is implemented by the platform.
</span><del>- RefPtr<Font> systemFallbackForCharacters(const FontDescription&, const Font* originalFontData, bool isPlatformFont, const UChar* characters, int length);
</del><ins>+ RefPtr<Font> systemFallbackForCharacters(const FontDescription&, const Font* originalFontData, bool isPlatformFont, const UChar* characters, unsigned length);
</ins><span class="cx">
</span><span class="cx"> // Also implemented by the platform.
</span><span class="cx"> void platformInit();
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT size_t fontCount();
</span><span class="cx"> WEBCORE_EXPORT size_t inactiveFontCount();
</span><del>- WEBCORE_EXPORT void purgeInactiveFontData(int count = INT_MAX);
</del><ins>+ WEBCORE_EXPORT void purgeInactiveFontData(unsigned count = UINT_MAX);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> RefPtr<Font> fontFromDescriptionAndLogFont(const FontDescription&, const LOGFONT&, AtomicString& outFontFamilyName);
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> // These methods are implemented by each platform.
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> FontPlatformData* getCustomFallbackFont(const UInt32, const FontDescription&);
</span><del>- PassRefPtr<Font> getSystemFontFallbackForCharacters(const FontDescription&, const Font*, const UChar* characters, int length);
</del><ins>+ PassRefPtr<Font> getSystemFontFallbackForCharacters(const FontDescription&, const Font*, const UChar* characters, unsigned length);
</ins><span class="cx"> #endif
</span><span class="cx"> std::unique_ptr<FontPlatformData> createFontPlatformData(const FontDescription&, const AtomicString& family);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeFontCacheFreeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> return FcFontSetMatch(0, sets, 1, pattern, &fontConfigResult);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Font> FontCache::systemFallbackForCharacters(const FontDescription& description, const Font* originalFontData, bool, const UChar* characters, int length)
</del><ins>+RefPtr<Font> FontCache::systemFallbackForCharacters(const FontDescription& description, const Font* originalFontData, bool, const UChar* characters, unsigned length)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<FcPattern> pattern = adoptRef(createFontConfigPatternForCharacters(characters, length));
</span><span class="cx"> const FontPlatformData& fontData = originalFontData->platformData();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> return characterSet;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Font> FontCache::getSystemFontFallbackForCharacters(const FontDescription& description, const Font* originalFontData, const UChar* characters, int length)
</del><ins>+PassRefPtr<Font> FontCache::getSystemFontFallbackForCharacters(const FontDescription& description, const Font* originalFontData, const UChar* characters, unsigned length)
</ins><span class="cx"> {
</span><span class="cx"> const FontPlatformData& platformData = originalFontData->platformData();
</span><span class="cx"> CTFontRef ctFont = platformData.font();
</span><span class="lines">@@ -194,11 +194,11 @@
</span><span class="cx"> return LanguageSpecificFont::None;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Font> FontCache::systemFallbackForCharacters(const FontDescription& description, const Font* originalFontData, bool, const UChar* characters, int length)
</del><ins>+RefPtr<Font> FontCache::systemFallbackForCharacters(const FontDescription& description, const Font* originalFontData, bool, const UChar* characters, unsigned length)
</ins><span class="cx"> {
</span><span class="cx"> // Unlike OS X, our fallback font on iPhone is Arial Unicode, which doesn't have some apple-specific glyphs like F8FF.
</span><span class="cx"> // Fall back to the Apple Fallback font in this case.
</span><del>- if (length > 0 && requiresCustomFallbackFont(*characters)) {
</del><ins>+ if (length && requiresCustomFallbackFont(*characters)) {
</ins><span class="cx"> auto* fallback = getCustomFallbackFont(*characters, description);
</span><span class="cx"> if (!fallback)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LanguageSpecificFont languageSpecificFont = LanguageSpecificFont::None;
</span><del>- if (length > 0)
</del><ins>+ if (length)
</ins><span class="cx"> languageSpecificFont = languageSpecificFallbackFont(c);
</span><span class="cx">
</span><span class="cx"> RefPtr<Font> font;
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx"> static String* matchWords[3] = { &arabic.get(), &pashto.get(), &urdu.get() };
</span><span class="cx"> static NeverDestroyed<AtomicString> geezaPlain("GeezaPro", AtomicString::ConstructFromLiteral);
</span><span class="cx"> static NeverDestroyed<AtomicString> geezaBold("GeezaPro-Bold", AtomicString::ConstructFromLiteral);
</span><del>- for (int j = 0; j < 3 && !font; ++j) {
</del><ins>+ for (unsigned j = 0; j < 3 && !font; ++j) {
</ins><span class="cx"> if (family.contains(*matchWords[j], false))
</span><span class="cx"> font = fontForFamily(description, isFontWeightBold(description.weight()) ? geezaBold : geezaPlain);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static NeverDestroyed<HashSet<AtomicString>> knownFamilies;
</span><del>- static const int maxCacheSize = 128;
</del><ins>+ static const unsigned maxCacheSize = 128;
</ins><span class="cx"> ASSERT(knownFamilies.get().size() <= maxCacheSize);
</span><span class="cx"> if (knownFamilies.get().size() == maxCacheSize)
</span><span class="cx"> knownFamilies.get().remove(knownFamilies.get().begin());
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> return knownFamilies.get().add(family).isNewEntry;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Font> FontCache::systemFallbackForCharacters(const FontDescription& description, const Font* originalFontData, bool isPlatformFont, const UChar* characters, int length)
</del><ins>+RefPtr<Font> FontCache::systemFallbackForCharacters(const FontDescription& description, const Font* originalFontData, bool isPlatformFont, const UChar* characters, unsigned length)
</ins><span class="cx"> {
</span><span class="cx"> UChar32 character;
</span><span class="cx"> U16_GET(characters, 0, 0, length, character);
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> static String* matchWords[3] = { new String("Arabic"), new String("Pashto"), new String("Urdu") };
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, geezaStr, ("Geeza Pro", AtomicString::ConstructFromLiteral));
</span><del>- for (int j = 0; j < 3 && !font; ++j) {
</del><ins>+ for (unsigned j = 0; j < 3 && !font; ++j) {
</ins><span class="cx"> if (family.contains(*matchWords[j], false))
</span><span class="cx"> font = fontForFamily(description, geezaStr);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontCacheWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> return hfont;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Font> FontCache::systemFallbackForCharacters(const FontDescription& description, const Font* originalFontData, bool, const UChar* characters, int length)
</del><ins>+RefPtr<Font> FontCache::systemFallbackForCharacters(const FontDescription& description, const Font* originalFontData, bool, const UChar* characters, unsigned length)
</ins><span class="cx"> {
</span><span class="cx"> UChar character = characters[0];
</span><span class="cx"> RefPtr<Font> fontData;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> if (!m_ordinalIteration)
</span><span class="cx"> m_currentOrdinal = m_forward ? 1 : m_largestOrdinal;
</span><span class="cx"> else {
</span><del>- if (m_ordinalIteration >= m_ordinalValues.size() + 1)
</del><ins>+ if (m_ordinalIteration > m_ordinalValues.size())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // Only copy+sort the values once per layout even if the iterator is reset.
</span><span class="lines">@@ -110,11 +110,11 @@
</span><span class="cx"> RenderDeprecatedFlexibleBox* m_box;
</span><span class="cx"> RenderBox* m_currentChild;
</span><span class="cx"> bool m_forward;
</span><del>- unsigned int m_currentOrdinal;
- unsigned int m_largestOrdinal;
- HashSet<unsigned int> m_ordinalValues;
- Vector<unsigned int> m_sortedOrdinalValues;
- int m_ordinalIteration;
</del><ins>+ unsigned m_currentOrdinal;
+ unsigned m_largestOrdinal;
+ HashSet<unsigned> m_ordinalValues;
+ Vector<unsigned> m_sortedOrdinalValues;
+ unsigned m_ordinalIteration;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RenderDeprecatedFlexibleBox::RenderDeprecatedFlexibleBox(Element& element, Ref<RenderStyle>&& style)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx"> clearOverflow();
</span><span class="cx"> m_overflowingCells.clear();
</span><span class="cx"> unsigned totalCellsCount = nEffCols * totalRows;
</span><del>- int maxAllowedOverflowingCellsCount = totalCellsCount < gMinTableSizeToUseFastPaintPathWithOverflowingCell ? 0 : gMaxAllowedOverflowingCellRatioForFastPaintPath * totalCellsCount;
</del><ins>+ unsigned maxAllowedOverflowingCellsCount = totalCellsCount < gMinTableSizeToUseFastPaintPathWithOverflowingCell ? 0 : gMaxAllowedOverflowingCellRatioForFastPaintPath * totalCellsCount;
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> bool hasOverflowingCell = false;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Tools/ChangeLog 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-10 Alex Christensen <achristensen@webkit.org>
+
+ Use unsigned for HashSet size.
+ https://bugs.webkit.org/show_bug.cgi?id=142518
+
+ Reviewed by Benjamin Poulain.
+
+ * TestWebKitAPI/Tests/WTF/HashMap.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WTF/HashSet.cpp:
+ (TestWebKitAPI::testInitialCapacity):
+ * TestWebKitAPI/Tests/WTF/ListHashSet.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2015-03-10 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Add WebKitSystemInterface for iOS 8.2
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFHashMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> { 4, "four" },
</span><span class="cx"> };
</span><span class="cx">
</span><del>- EXPECT_EQ(4, map.size());
</del><ins>+ EXPECT_EQ(4u, map.size());
</ins><span class="cx">
</span><span class="cx"> EXPECT_EQ("one", map.get(1));
</span><span class="cx"> EXPECT_EQ("two", map.get(2));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFHashSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> HashSet<int, DefaultHash<int>::Hash, InitialCapacityTestHashTraits<initialCapacity> > testSet;
</span><span class="cx">
</span><span class="cx"> // Initial capacity is null.
</span><del>- ASSERT_EQ(0, testSet.capacity());
</del><ins>+ ASSERT_EQ(0u, testSet.capacity());
</ins><span class="cx">
</span><span class="cx"> // Adding items up to size should never change the capacity.
</span><span class="cx"> for (size_t i = 0; i < size; ++i) {
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFListHashSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp (181347 => 181348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp 2015-03-10 21:26:36 UTC (rev 181347)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp 2015-03-10 21:54:21 UTC (rev 181348)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> result = list.appendOrMoveToLast(3);
</span><span class="cx"> ASSERT_TRUE(result.isNewEntry);
</span><span class="cx">
</span><del>- ASSERT_EQ(list.size(), 3);
</del><ins>+ ASSERT_EQ(list.size(), 3u);
</ins><span class="cx">
</span><span class="cx"> // The list should be in order 1, 2, 3.
</span><span class="cx"> ListHashSet<int>::iterator iterator = list.begin();
</span><span class="lines">@@ -99,11 +99,11 @@
</span><span class="cx"> ASSERT_TRUE(result.isNewEntry);
</span><span class="cx"> result = list.appendOrMoveToLast(1);
</span><span class="cx"> ASSERT_FALSE(result.isNewEntry);
</span><del>- ASSERT_EQ(1, list.size());
</del><ins>+ ASSERT_EQ(1u, list.size());
</ins><span class="cx">
</span><span class="cx"> list.add(2);
</span><span class="cx"> list.add(3);
</span><del>- ASSERT_EQ(3, list.size());
</del><ins>+ ASSERT_EQ(3u, list.size());
</ins><span class="cx">
</span><span class="cx"> // Appending 2 move it to the end.
</span><span class="cx"> ASSERT_EQ(3, list.last());
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> ASSERT_FALSE(result.isNewEntry);
</span><span class="cx"> result = list.appendOrMoveToLast(1);
</span><span class="cx"> ASSERT_FALSE(result.isNewEntry);
</span><del>- ASSERT_EQ(3, list.size());
</del><ins>+ ASSERT_EQ(3u, list.size());
</ins><span class="cx">
</span><span class="cx"> ListHashSet<int>::iterator iterator = list.begin();
</span><span class="cx"> ASSERT_EQ(3, *iterator);
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> result = list.prependOrMoveToFirst(3);
</span><span class="cx"> ASSERT_TRUE(result.isNewEntry);
</span><span class="cx">
</span><del>- ASSERT_EQ(list.size(), 3);
</del><ins>+ ASSERT_EQ(list.size(), 3u);
</ins><span class="cx">
</span><span class="cx"> // The list should be in order 3, 1, 2.
</span><span class="cx"> ListHashSet<int>::iterator iterator = list.begin();
</span><span class="lines">@@ -160,11 +160,11 @@
</span><span class="cx"> ASSERT_TRUE(result.isNewEntry);
</span><span class="cx"> result = list.prependOrMoveToFirst(1);
</span><span class="cx"> ASSERT_FALSE(result.isNewEntry);
</span><del>- ASSERT_EQ(1, list.size());
</del><ins>+ ASSERT_EQ(1u, list.size());
</ins><span class="cx">
</span><span class="cx"> list.add(2);
</span><span class="cx"> list.add(3);
</span><del>- ASSERT_EQ(3, list.size());
</del><ins>+ ASSERT_EQ(3u, list.size());
</ins><span class="cx">
</span><span class="cx"> // Prepending 2 move it to the beginning.
</span><span class="cx"> ASSERT_EQ(1, list.first());
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> ASSERT_FALSE(result.isNewEntry);
</span><span class="cx"> result = list.prependOrMoveToFirst(3);
</span><span class="cx"> ASSERT_FALSE(result.isNewEntry);
</span><del>- ASSERT_EQ(3, list.size());
</del><ins>+ ASSERT_EQ(3u, list.size());
</ins><span class="cx">
</span><span class="cx"> ListHashSet<int>::iterator iterator = list.begin();
</span><span class="cx"> ASSERT_EQ(3, *iterator);
</span></span></pre>
</div>
</div>
</body>
</html>