<!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>[160344] 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/160344">160344</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-12-09 17:28:05 -0800 (Mon, 09 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace use of WTF::FixedArray with std::array
https://bugs.webkit.org/show_bug.cgi?id=125475
Reviewed by Anders Carlsson.
../JavaScriptCore:
* bytecode/CodeBlockHash.cpp:
(JSC::CodeBlockHash::dump):
* bytecode/Opcode.cpp:
(JSC::OpcodeStats::~OpcodeStats):
* dfg/DFGCSEPhase.cpp:
* ftl/FTLAbstractHeap.h:
* heap/MarkedSpace.h:
* parser/ParserArena.h:
* runtime/CodeCache.h:
* runtime/DateInstanceCache.h:
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::reset):
* runtime/JSGlobalObject.h:
* runtime/JSString.h:
* runtime/LiteralParser.h:
* runtime/NumericStrings.h:
* runtime/RegExpCache.h:
* runtime/SmallStrings.h:
../WebCore:
* crypto/parameters/CryptoAlgorithmAesCbcParams.h:
* platform/graphics/GlyphMetricsMap.h:
../WTF:
* wtf/AVLTree.h:
* wtf/Bitmap.h:
* wtf/SixCharacterHash.cpp:
(WTF::integerToSixCharacterHashString):
* wtf/SixCharacterHash.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockHashcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlockHash.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeOpcodecpp">trunk/Source/JavaScriptCore/bytecode/Opcode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCSEPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLAbstractHeaph">trunk/Source/JavaScriptCore/ftl/FTLAbstractHeap.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedSpaceh">trunk/Source/JavaScriptCore/heap/MarkedSpace.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserArenah">trunk/Source/JavaScriptCore/parser/ParserArena.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCodeCacheh">trunk/Source/JavaScriptCore/runtime/CodeCache.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeDateInstanceCacheh">trunk/Source/JavaScriptCore/runtime/DateInstanceCache.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringh">trunk/Source/JavaScriptCore/runtime/JSString.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLiteralParserh">trunk/Source/JavaScriptCore/runtime/LiteralParser.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeNumericStringsh">trunk/Source/JavaScriptCore/runtime/NumericStrings.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpCacheh">trunk/Source/JavaScriptCore/runtime/RegExpCache.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSmallStringsh">trunk/Source/JavaScriptCore/runtime/SmallStrings.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAVLTreeh">trunk/Source/WTF/wtf/AVLTree.h</a></li>
<li><a href="#trunkSourceWTFwtfBitmaph">trunk/Source/WTF/wtf/Bitmap.h</a></li>
<li><a href="#trunkSourceWTFwtfSixCharacterHashcpp">trunk/Source/WTF/wtf/SixCharacterHash.cpp</a></li>
<li><a href="#trunkSourceWTFwtfSixCharacterHashh">trunk/Source/WTF/wtf/SixCharacterHash.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecryptoparametersCryptoAlgorithmAesCbcParamsh">trunk/Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParams.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGlyphMetricsMaph">trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-12-09 Sam Weinig <sam@webkit.org>
+
+ Replace use of WTF::FixedArray with std::array
+ https://bugs.webkit.org/show_bug.cgi?id=125475
+
+ Reviewed by Anders Carlsson.
+
+ * bytecode/CodeBlockHash.cpp:
+ (JSC::CodeBlockHash::dump):
+ * bytecode/Opcode.cpp:
+ (JSC::OpcodeStats::~OpcodeStats):
+ * dfg/DFGCSEPhase.cpp:
+ * ftl/FTLAbstractHeap.h:
+ * heap/MarkedSpace.h:
+ * parser/ParserArena.h:
+ * runtime/CodeCache.h:
+ * runtime/DateInstanceCache.h:
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::reset):
+ * runtime/JSGlobalObject.h:
+ * runtime/JSString.h:
+ * runtime/LiteralParser.h:
+ * runtime/NumericStrings.h:
+ * runtime/RegExpCache.h:
+ * runtime/SmallStrings.h:
+
</ins><span class="cx"> 2013-12-09 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove miscellaneous unnecessary build statements
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockHashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlockHash.cpp (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlockHash.cpp 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlockHash.cpp 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> void CodeBlockHash::dump(PrintStream& out) const
</span><span class="cx"> {
</span><del>- FixedArray<char, 7> buffer = integerToSixCharacterHashString(m_hash);
</del><ins>+ std::array<char, 7> buffer = integerToSixCharacterHashString(m_hash);
</ins><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> CodeBlockHash recompute(buffer.data());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeOpcodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/Opcode.cpp (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/Opcode.cpp 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/bytecode/Opcode.cpp 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #include "Opcode.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(OPCODE_STATS)
</span><ins>+#include <array>
</ins><span class="cx"> #include <wtf/DataLog.h>
</span><del>-#include <wtf/FixedArray.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace std;
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> for (int j = 0; j < numOpcodeIDs; ++j)
</span><span class="cx"> totalInstructionPairs += opcodePairCounts[i][j];
</span><span class="cx">
</span><del>- FixedArray<int, numOpcodeIDs> sortedIndices;
</del><ins>+ std::array<int, numOpcodeIDs> sortedIndices;
</ins><span class="cx"> for (int i = 0; i < numOpcodeIDs; ++i)
</span><span class="cx"> sortedIndices[i] = i;
</span><span class="cx"> qsort(sortedIndices.data(), numOpcodeIDs, sizeof(int), compareOpcodeIndices);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCSEPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "DFGGraph.h"
</span><span class="cx"> #include "DFGPhase.h"
</span><span class="cx"> #include "JSCellInlines.h"
</span><ins>+#include <array>
</ins><span class="cx"> #include <wtf/FastBitVector.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace DFG {
</span><span class="lines">@@ -1410,7 +1411,7 @@
</span><span class="cx"> BasicBlock* m_currentBlock;
</span><span class="cx"> Node* m_currentNode;
</span><span class="cx"> unsigned m_indexInBlock;
</span><del>- FixedArray<unsigned, LastNodeType> m_lastSeen;
</del><ins>+ std::array<unsigned, LastNodeType> m_lastSeen;
</ins><span class="cx"> bool m_changed; // Only tracks changes that have a substantive effect on other optimizations.
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLAbstractHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLAbstractHeap.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLAbstractHeap.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/ftl/FTLAbstractHeap.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx">
</span><span class="cx"> #include "FTLAbbreviations.h"
</span><span class="cx"> #include "JSCJSValue.h"
</span><ins>+#include <array>
</ins><span class="cx"> #include <wtf/FastMalloc.h>
</span><del>-#include <wtf/FixedArray.h>
</del><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> size_t m_elementSize;
</span><span class="cx"> LValue m_scaleTerm;
</span><span class="cx"> bool m_canShift;
</span><del>- FixedArray<AbstractField, 16> m_smallIndices;
</del><ins>+ std::array<AbstractField, 16> m_smallIndices;
</ins><span class="cx">
</span><span class="cx"> struct WithoutZeroOrOneHashTraits : WTF::GenericHashTraits<ptrdiff_t> {
</span><span class="cx"> static void constructDeletedValue(ptrdiff_t& slot) { slot = 1; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedSpaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -26,10 +26,10 @@
</span><span class="cx"> #include "MarkedAllocator.h"
</span><span class="cx"> #include "MarkedBlock.h"
</span><span class="cx"> #include "MarkedBlockSet.h"
</span><ins>+#include <array>
</ins><span class="cx"> #include <wtf/PageAllocationAligned.h>
</span><span class="cx"> #include <wtf/Bitmap.h>
</span><span class="cx"> #include <wtf/DoublyLinkedList.h>
</span><del>-#include <wtf/FixedArray.h>
</del><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -137,8 +137,8 @@
</span><span class="cx"> static const size_t impreciseCount = impreciseCutoff / impreciseStep;
</span><span class="cx">
</span><span class="cx"> struct Subspace {
</span><del>- FixedArray<MarkedAllocator, preciseCount> preciseAllocators;
- FixedArray<MarkedAllocator, impreciseCount> impreciseAllocators;
</del><ins>+ std::array<MarkedAllocator, preciseCount> preciseAllocators;
+ std::array<MarkedAllocator, impreciseCount> impreciseAllocators;
</ins><span class="cx"> MarkedAllocator largeAllocator;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserArenah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ParserArena.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ParserArena.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/parser/ParserArena.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define ParserArena_h
</span><span class="cx">
</span><span class="cx"> #include "Identifier.h"
</span><ins>+#include <array>
</ins><span class="cx"> #include <wtf/SegmentedVector.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -64,8 +65,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> IdentifierVector m_identifiers;
</span><del>- FixedArray<Identifier*, MaximumCachableCharacter> m_shortIdentifiers;
- FixedArray<Identifier*, MaximumCachableCharacter> m_recentIdentifiers;
</del><ins>+ std::array<Identifier*, MaximumCachableCharacter> m_shortIdentifiers;
+ std::array<Identifier*, MaximumCachableCharacter> m_recentIdentifiers;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCodeCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CodeCache.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CodeCache.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/runtime/CodeCache.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "Strong.h"
</span><span class="cx"> #include "WeakRandom.h"
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><del>-#include <wtf/FixedArray.h>
</del><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/RandomNumber.h>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeDateInstanceCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/DateInstanceCache.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/DateInstanceCache.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/runtime/DateInstanceCache.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "JSCJSValue.h"
</span><span class="cx"> #include "JSDateMath.h"
</span><del>-#include <wtf/FixedArray.h>
</del><ins>+#include <array>
</ins><span class="cx"> #include <wtf/HashFunctions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> CacheEntry& lookup(double d) { return m_cache[WTF::FloatHash<double>::hash(d) & (cacheSize - 1)]; }
</span><span class="cx">
</span><del>- FixedArray<CacheEntry, cacheSize> m_cache;
</del><ins>+ std::array<CacheEntry, cacheSize> m_cache;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> putDirectWithoutTransition(vm, vm.propertyNames->JSON, JSONObject::create(vm, JSONObject::createStructure(vm, this, m_objectPrototype.get())), DontEnum);
</span><span class="cx"> putDirectWithoutTransition(vm, vm.propertyNames->Math, MathObject::create(vm, this, MathObject::createStructure(vm, this, m_objectPrototype.get())), DontEnum);
</span><span class="cx">
</span><del>- FixedArray<InternalFunction*, NUMBER_OF_TYPED_ARRAY_TYPES> typedArrayConstructors;
</del><ins>+ std::array<InternalFunction*, NUMBER_OF_TYPED_ARRAY_TYPES> typedArrayConstructors;
</ins><span class="cx"> typedArrayConstructors[toIndex(TypeInt8)] = JSInt8ArrayConstructor::create(vm, JSInt8ArrayConstructor::createStructure(vm, this, m_functionPrototype.get()), m_typedArrays[toIndex(TypeInt8)].prototype.get(), "Int8Array");
</span><span class="cx"> typedArrayConstructors[toIndex(TypeInt16)] = JSInt16ArrayConstructor::create(vm, JSInt16ArrayConstructor::createStructure(vm, this, m_functionPrototype.get()), m_typedArrays[toIndex(TypeInt16)].prototype.get(), "Int16Array");
</span><span class="cx"> typedArrayConstructors[toIndex(TypeInt32)] = JSInt32ArrayConstructor::create(vm, JSInt32ArrayConstructor::createStructure(vm, this, m_functionPrototype.get()), m_typedArrays[toIndex(TypeInt32)].prototype.get(), "Int32Array");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "VM.h"
</span><span class="cx"> #include "Watchpoint.h"
</span><span class="cx"> #include <JavaScriptCore/JSBase.h>
</span><ins>+#include <array>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -227,7 +228,7 @@
</span><span class="cx"> WriteBarrier<Structure> structure;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- FixedArray<TypedArrayData, NUMBER_OF_TYPED_ARRAY_TYPES> m_typedArrays;
</del><ins>+ std::array<TypedArrayData, NUMBER_OF_TYPED_ARRAY_TYPES> m_typedArrays;
</ins><span class="cx">
</span><span class="cx"> void* m_specialPointers[Special::TableSize]; // Special pointers used by the LLInt and JIT.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSString.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSString.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/runtime/JSString.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -22,12 +22,14 @@
</span><span class="cx">
</span><span class="cx"> #ifndef JSString_h
</span><span class="cx"> #define JSString_h
</span><ins>+
</ins><span class="cx"> #include "CallFrame.h"
</span><span class="cx"> #include "CommonIdentifiers.h"
</span><span class="cx"> #include "Identifier.h"
</span><span class="cx"> #include "PropertyDescriptor.h"
</span><span class="cx"> #include "PropertySlot.h"
</span><span class="cx"> #include "Structure.h"
</span><ins>+#include <array>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -322,7 +324,7 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE JSString* getIndexSlowCase(ExecState*, unsigned);
</span><span class="cx">
</span><del>- mutable FixedArray<WriteBarrier<JSString>, s_maxInternalRopeLength> m_fibers;
</del><ins>+ mutable std::array<WriteBarrier<JSString>, s_maxInternalRopeLength> m_fibers;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLiteralParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/LiteralParser.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/LiteralParser.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/runtime/LiteralParser.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "Identifier.h"
</span><span class="cx"> #include "JSCJSValue.h"
</span><span class="cx"> #include "JSGlobalObjectFunctions.h"
</span><ins>+#include <array>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -155,8 +156,8 @@
</span><span class="cx"> ParserMode m_mode;
</span><span class="cx"> String m_parseErrorMessage;
</span><span class="cx"> static unsigned const MaximumCachableCharacter = 128;
</span><del>- FixedArray<Identifier, MaximumCachableCharacter> m_shortIdentifiers;
- FixedArray<Identifier, MaximumCachableCharacter> m_recentIdentifiers;
</del><ins>+ std::array<Identifier, MaximumCachableCharacter> m_shortIdentifiers;
+ std::array<Identifier, MaximumCachableCharacter> m_recentIdentifiers;
</ins><span class="cx"> ALWAYS_INLINE const Identifier makeIdentifier(const LChar* characters, size_t length);
</span><span class="cx"> ALWAYS_INLINE const Identifier makeIdentifier(const UChar* characters, size_t length);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeNumericStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/NumericStrings.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/NumericStrings.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/runtime/NumericStrings.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef NumericStrings_h
</span><span class="cx"> #define NumericStrings_h
</span><span class="cx">
</span><del>-#include <wtf/FixedArray.h>
</del><ins>+#include <array>
</ins><span class="cx"> #include <wtf/HashFunctions.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -87,10 +87,10 @@
</span><span class="cx"> return smallIntCache[i];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FixedArray<CacheEntry<double>, cacheSize> doubleCache;
- FixedArray<CacheEntry<int>, cacheSize> intCache;
- FixedArray<CacheEntry<unsigned>, cacheSize> unsignedCache;
- FixedArray<String, cacheSize> smallIntCache;
</del><ins>+ std::array<CacheEntry<double>, cacheSize> doubleCache;
+ std::array<CacheEntry<int>, cacheSize> intCache;
+ std::array<CacheEntry<unsigned>, cacheSize> unsignedCache;
+ std::array<String, cacheSize> smallIntCache;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpCache.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpCache.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/runtime/RegExpCache.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "Strong.h"
</span><span class="cx"> #include "Weak.h"
</span><span class="cx"> #include "WeakInlines.h"
</span><del>-#include <wtf/FixedArray.h>
</del><ins>+#include <array>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx">
</span><span class="cx"> #ifndef RegExpCache_h
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> void addToStrongCache(RegExp*);
</span><span class="cx"> RegExpCacheMap m_weakCache; // Holds all regular expressions currently live.
</span><span class="cx"> int m_nextEntryInStrongCache;
</span><del>- WTF::FixedArray<Strong<RegExp>, maxStrongCacheableEntries> m_strongCache; // Holds a select few regular expressions that have compiled and executed
</del><ins>+ std::array<Strong<RegExp>, maxStrongCacheableEntries> m_strongCache; // Holds a select few regular expressions that have compiled and executed
</ins><span class="cx"> VM* m_vm;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSmallStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SmallStrings.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SmallStrings.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/JavaScriptCore/runtime/SmallStrings.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> #define SmallStrings_h
</span><span class="cx">
</span><span class="cx"> #include "WriteBarrier.h"
</span><del>-
-#include <wtf/FixedArray.h>
</del><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/WTF/ChangeLog 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-09 Sam Weinig <sam@webkit.org>
+
+ Replace use of WTF::FixedArray with std::array
+ https://bugs.webkit.org/show_bug.cgi?id=125475
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/AVLTree.h:
+ * wtf/Bitmap.h:
+ * wtf/SixCharacterHash.cpp:
+ (WTF::integerToSixCharacterHashString):
+ * wtf/SixCharacterHash.h:
+
</ins><span class="cx"> 2013-12-06 Roger Fong <roger_fong@apple.com> and Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Support compiling with VS2013
</span></span></pre></div>
<a id="trunkSourceWTFwtfAVLTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/AVLTree.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/AVLTree.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/WTF/wtf/AVLTree.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx"> #ifndef AVL_TREE_H_
</span><span class="cx"> #define AVL_TREE_H_
</span><span class="cx">
</span><ins>+#include <array>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><del>-#include <wtf/FixedArray.h>
</del><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> void reset() { for (unsigned i = 0; i < maxDepth; ++i) m_data[i] = false; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- FixedArray<bool, maxDepth> m_data;
</del><ins>+ std::array<bool, maxDepth> m_data;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // How to determine maxDepth:
</span></span></pre></div>
<a id="trunkSourceWTFwtfBitmaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Bitmap.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Bitmap.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/WTF/wtf/Bitmap.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx"> #ifndef Bitmap_h
</span><span class="cx"> #define Bitmap_h
</span><span class="cx">
</span><ins>+#include <array>
</ins><span class="cx"> #include <wtf/Atomics.h>
</span><del>-#include <wtf/FixedArray.h>
</del><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <stdint.h>
</span><span class="cx"> #include <string.h>
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> // a 64 bit unsigned int would give 0xffff8000
</span><span class="cx"> static const WordType one = 1;
</span><span class="cx">
</span><del>- FixedArray<WordType, words> bits;
</del><ins>+ std::array<WordType, words> bits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<size_t size, BitmapAtomicMode atomicMode, typename WordType>
</span></span></pre></div>
<a id="trunkSourceWTFwtfSixCharacterHashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/SixCharacterHash.cpp (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SixCharacterHash.cpp 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/WTF/wtf/SixCharacterHash.cpp 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -58,11 +58,11 @@
</span><span class="cx"> return hash;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FixedArray<char, 7> integerToSixCharacterHashString(unsigned hash)
</del><ins>+std::array<char, 7> integerToSixCharacterHashString(unsigned hash)
</ins><span class="cx"> {
</span><del>- ASSERT(strlen(TABLE) == 62);
-
- FixedArray<char, 7> buffer;
</del><ins>+ static_assert(WTF_ARRAY_LENGTH(TABLE) - 1 == 62, "Six character hash table is not 62 characters long.");
+
+ std::array<char, 7> buffer;
</ins><span class="cx"> unsigned accumulator = hash;
</span><span class="cx"> for (unsigned i = 6; i--;) {
</span><span class="cx"> buffer[i] = TABLE[accumulator % 62];
</span></span></pre></div>
<a id="trunkSourceWTFwtfSixCharacterHashh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/SixCharacterHash.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SixCharacterHash.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/WTF/wtf/SixCharacterHash.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef SixCharacterHash_h
</span><span class="cx"> #define SixCharacterHash_h
</span><span class="cx">
</span><del>-#include <wtf/FixedArray.h>
</del><ins>+#include <array>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> // Takes a 32-bit integer and constructs a six-character string that contains
</span><span class="cx"> // the character hash.
</span><del>-WTF_EXPORT_PRIVATE FixedArray<char, 7> integerToSixCharacterHashString(unsigned);
</del><ins>+WTF_EXPORT_PRIVATE std::array<char, 7> integerToSixCharacterHashString(unsigned);
</ins><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/WebCore/ChangeLog 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-09 Sam Weinig <sam@webkit.org>
+
+ Replace use of WTF::FixedArray with std::array
+ https://bugs.webkit.org/show_bug.cgi?id=125475
+
+ Reviewed by Anders Carlsson.
+
+ * crypto/parameters/CryptoAlgorithmAesCbcParams.h:
+ * platform/graphics/GlyphMetricsMap.h:
+
</ins><span class="cx"> 2013-12-09 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor the CFURLConnectionClient to be the synchronous implementation of an abstract network delegate
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoparametersCryptoAlgorithmAesCbcParamsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParams.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParams.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParams.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define CryptoAlgorithmAesCbcParams_h
</span><span class="cx">
</span><span class="cx"> #include "CryptoAlgorithmParameters.h"
</span><del>-#include <wtf/FixedArray.h>
</del><ins>+#include <array>
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx">
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> class CryptoAlgorithmAesCbcParams FINAL : public CryptoAlgorithmParameters {
</span><span class="cx"> public:
</span><span class="cx"> // The initialization vector. MUST be 16 bytes.
</span><del>- FixedArray<char, 16> iv;
</del><ins>+ std::array<char, 16> iv;
</ins><span class="cx">
</span><span class="cx"> virtual Class parametersClass() const OVERRIDE { return Class::AesCbcParams; }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGlyphMetricsMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h (160343 => 160344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h 2013-12-10 00:37:20 UTC (rev 160343)
+++ trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h 2013-12-10 01:28:05 UTC (rev 160344)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #define GlyphMetricsMap_h
</span><span class="cx">
</span><span class="cx"> #include "Glyph.h"
</span><del>-#include <wtf/FixedArray.h>
</del><ins>+#include <array>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> private:
</span><span class="cx"> struct GlyphMetricsPage {
</span><span class="cx"> static const size_t size = 256; // Usually covers Latin-1 in a single page.
</span><del>- FixedArray<T, size> m_metrics;
</del><ins>+ std::array<T, size> m_metrics;
</ins><span class="cx">
</span><span class="cx"> T metricsForGlyph(Glyph glyph) const { return m_metrics[glyph % size]; }
</span><span class="cx"> void setMetricsForGlyph(Glyph glyph, const T& metrics)
</span></span></pre>
</div>
</div>
</body>
</html>