<!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>[177316] 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/177316">177316</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-15 15:24:12 -0800 (Mon, 15 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/177284">r177284</a>.
https://bugs.webkit.org/show_bug.cgi?id=139658
"Breaks API tests and LayoutTests on Yosemite Debug"
(Requested by msaboff on #webkit).
Reverted changeset:
"Make sure range based iteration of Vector<> still receives
bounds checking"
https://bugs.webkit.org/show_bug.cgi?id=138821
http://trac.webkit.org/changeset/177284</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLAbbreviationsh">trunk/Source/JavaScriptCore/ftl/FTLAbbreviations.h</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntDatacpp">trunk/Source/JavaScriptCore/llint/LLIntData.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserh">trunk/Source/JavaScriptCore/parser/Parser.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArraycpp">trunk/Source/JavaScriptCore/runtime/JSArray.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretoolsProfileTreeNodeh">trunk/Source/JavaScriptCore/tools/ProfileTreeNode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreyarrYarrJITcpp">trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxproj">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxprojfilters">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWTFwtfRefCountedArrayh">trunk/Source/WTF/wtf/RefCountedArray.h</a></li>
<li><a href="#trunkSourceWTFwtfVectorh">trunk/Source/WTF/wtf/Vector.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValuecpp">trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorcpp">trunk/Source/WebCore/editing/TextIterator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagemacServicesOverlayControllermm">trunk/Source/WebCore/page/mac/ServicesOverlayController.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSegmentedFontDatacpp">trunk/Source/WebCore/platform/graphics/SegmentedFontData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsWOFFFileFormatcpp">trunk/Source/WebCore/platform/graphics/WOFFFileFormat.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGradientCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GradientCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersgifGIFImageDecodercpp">trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleGridResolvedPositioncpp">trunk/Source/WebCore/rendering/style/GridResolvedPosition.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFontElementcpp">trunk/Source/WebCore/svg/SVGFontElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGPathByteStreamh">trunk/Source/WebCore/svg/SVGPathByteStream.h</a></li>
<li><a href="#trunkSourceWebCorexmlXPathNodeSeth">trunk/Source/WebCore/xml/XPathNodeSet.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfIndexedIteratorh">trunk/Source/WTF/wtf/IndexedIterator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-12-15 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r177284.
+ https://bugs.webkit.org/show_bug.cgi?id=139658
+
+ "Breaks API tests and LayoutTests on Yosemite Debug"
+ (Requested by msaboff on #webkit).
+
+ Reverted changeset:
+
+ "Make sure range based iteration of Vector<> still receives
+ bounds checking"
+ https://bugs.webkit.org/show_bug.cgi?id=138821
+ http://trac.webkit.org/changeset/177284
+
</ins><span class="cx"> 2014-12-15 Dániel Bátyai <dbatyai.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] FTL JIT not working on ARM64
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -229,9 +229,9 @@
</span><span class="cx"> Base::visitChildren(thisObject, visitor);
</span><span class="cx"> visitor.append(&thisObject->m_symbolTable);
</span><span class="cx"> for (FunctionExpressionVector::iterator ptr = thisObject->m_functionDecls.begin(), end = thisObject->m_functionDecls.end(); ptr != end; ++ptr)
</span><del>- visitor.append(WTF::getPtr(ptr));
</del><ins>+ visitor.append(ptr);
</ins><span class="cx"> for (FunctionExpressionVector::iterator ptr = thisObject->m_functionExprs.begin(), end = thisObject->m_functionExprs.end(); ptr != end; ++ptr)
</span><del>- visitor.append(WTF::getPtr(ptr));
</del><ins>+ visitor.append(ptr);
</ins><span class="cx"> visitor.appendValues(thisObject->m_constantRegisters.data(), thisObject->m_constantRegisters.size());
</span><span class="cx"> if (thisObject->m_rareData) {
</span><span class="cx"> for (size_t i = 0, end = thisObject->m_rareData->m_regexps.size(); i != end; i++)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -2283,8 +2283,8 @@
</span><span class="cx"> int topScopeIndex = -1;
</span><span class="cx"> int bottomScopeIndex = -1;
</span><span class="cx"> if (flipScopes) {
</span><del>- topScopeIndex = topScope - m_scopeContextStack.data();
- bottomScopeIndex = bottomScope - m_scopeContextStack.data();
</del><ins>+ topScopeIndex = topScope - m_scopeContextStack.begin();
+ bottomScopeIndex = bottomScope - m_scopeContextStack.begin();
</ins><span class="cx"> savedScopeContextStack = m_scopeContextStack;
</span><span class="cx"> m_scopeContextStack.shrink(finallyContext.scopeContextStackSize);
</span><span class="cx"> }
</span><span class="lines">@@ -2328,7 +2328,7 @@
</span><span class="cx"> if (flipScopes) {
</span><span class="cx"> m_scopeContextStack = savedScopeContextStack;
</span><span class="cx"> topScope = &m_scopeContextStack[topScopeIndex]; // assert it's within bounds
</span><del>- bottomScope = m_scopeContextStack.data() + bottomScopeIndex; // don't assert, since it the index might be -1.
</del><ins>+ bottomScope = m_scopeContextStack.begin() + bottomScopeIndex; // don't assert, since it the index might be -1.
</ins><span class="cx"> }
</span><span class="cx"> if (flipSwitches)
</span><span class="cx"> m_switchContextStack = savedSwitchContextStack;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -4910,7 +4910,7 @@
</span><span class="cx"> addBranch(
</span><span class="cx"> m_jit.branch32(JITCompiler::AboveOrEqual, value, Imm32(table.ctiOffsets.size())),
</span><span class="cx"> data->fallThrough.block);
</span><del>- m_jit.move(TrustedImmPtr(table.ctiOffsets.data()), scratch);
</del><ins>+ m_jit.move(TrustedImmPtr(table.ctiOffsets.begin()), scratch);
</ins><span class="cx"> m_jit.loadPtr(JITCompiler::BaseIndex(scratch, value, JITCompiler::timesPtr()), scratch);
</span><span class="cx"> m_jit.jump(scratch);
</span><span class="cx"> data->didUseJumpTable = true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLAbbreviationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLAbbreviations.h (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLAbbreviations.h 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/JavaScriptCore/ftl/FTLAbbreviations.h 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> static inline LValue mdString(LContext context, const char* string) { return mdString(context, string, std::strlen(string)); }
</span><span class="cx"> static inline LValue mdNode(LContext context, LValue* args, unsigned numArgs) { return llvm->MDNodeInContext(context, args, numArgs); }
</span><span class="cx"> template<typename VectorType>
</span><del>-static inline LValue mdNode(LContext context, const VectorType& vector) { return mdNode(context, const_cast<LValue*>(vector.data()), vector.size()); }
</del><ins>+static inline LValue mdNode(LContext context, const VectorType& vector) { return mdNode(context, const_cast<LValue*>(vector.begin()), vector.size()); }
</ins><span class="cx"> static inline LValue mdNode(LContext context) { return mdNode(context, 0, 0); }
</span><span class="cx"> static inline LValue mdNode(LContext context, LValue arg1) { return mdNode(context, &arg1, 1); }
</span><span class="cx"> static inline LValue mdNode(LContext context, LValue arg1, LValue arg2)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> template<typename VectorType>
</span><span class="cx"> inline LValue buildCall(LBuilder builder, LValue function, const VectorType& vector)
</span><span class="cx"> {
</span><del>- return buildCall(builder, function, vector.data(), vector.size());
</del><ins>+ return buildCall(builder, function, vector.begin(), vector.size());
</ins><span class="cx"> }
</span><span class="cx"> static inline LValue buildCall(LBuilder builder, LValue function)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntData.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntData.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/JavaScriptCore/llint/LLIntData.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> Vector<int> testVector;
</span><span class="cx"> testVector.resize(42);
</span><span class="cx"> ASSERT(bitwise_cast<uint32_t*>(&testVector)[sizeof(void*)/sizeof(uint32_t) + 1] == 42);
</span><del>- ASSERT(bitwise_cast<int**>(&testVector)[0] == testVector.data());
</del><ins>+ ASSERT(bitwise_cast<int**>(&testVector)[0] == testVector.begin());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ASSERT(StringImpl::s_hashFlag8BitBuffer == 32);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -130,8 +130,10 @@
</span><span class="cx"> if (rhs.m_labels) {
</span><span class="cx"> m_labels = std::make_unique<LabelStack>();
</span><span class="cx">
</span><del>- for (auto label : *rhs.m_labels)
- m_labels->append(ScopeLabelInfo(label.m_ident, label.m_isLoop));
</del><ins>+ typedef LabelStack::const_iterator iterator;
+ iterator end = rhs.m_labels->end();
+ for (iterator it = rhs.m_labels->begin(); it != end; ++it)
+ m_labels->append(ScopeLabelInfo(it->m_ident, it->m_isLoop));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArray.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> // properties, so we have to perform deletion with caution, if not we can
</span><span class="cx"> // delete values in any order.
</span><span class="cx"> if (map->sparseMode()) {
</span><del>- qsort(keys.data(), keys.size(), sizeof(unsigned), compareKeysForQSort);
</del><ins>+ qsort(keys.begin(), keys.size(), sizeof(unsigned), compareKeysForQSort);
</ins><span class="cx"> unsigned i = keys.size();
</span><span class="cx"> while (i) {
</span><span class="cx"> unsigned index = keys[--i];
</span><span class="lines">@@ -1190,13 +1190,13 @@
</span><span class="cx">
</span><span class="cx"> #if HAVE(MERGESORT)
</span><span class="cx"> if (isSortingPrimitiveValues)
</span><del>- qsort(values.data(), values.size(), sizeof(ValueStringPair), compareByStringPairForQSort);
</del><ins>+ qsort(values.begin(), values.size(), sizeof(ValueStringPair), compareByStringPairForQSort);
</ins><span class="cx"> else
</span><del>- mergesort(values.data(), values.size(), sizeof(ValueStringPair), compareByStringPairForQSort);
</del><ins>+ mergesort(values.begin(), values.size(), sizeof(ValueStringPair), compareByStringPairForQSort);
</ins><span class="cx"> #else
</span><span class="cx"> // FIXME: The qsort library function is likely to not be a stable sort.
</span><span class="cx"> // ECMAScript-262 does not specify a stable sort, but in practice, browsers perform a stable sort.
</span><del>- qsort(values.data(), values.size(), sizeof(ValueStringPair), compareByStringPairForQSort);
</del><ins>+ qsort(values.begin(), values.size(), sizeof(ValueStringPair), compareByStringPairForQSort);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // If the toString function changed the length of the array or vector storage,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretoolsProfileTreeNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tools/ProfileTreeNode.h (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tools/ProfileTreeNode.h 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/JavaScriptCore/tools/ProfileTreeNode.h 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> Vector<MapEntry*> entries;
</span><span class="cx"> for (Map::iterator it = m_children->begin(); it != m_children->end(); ++it)
</span><span class="cx"> entries.append(&*it);
</span><del>- qsort(entries.data(), entries.size(), sizeof(MapEntry*), compareEntries);
</del><ins>+ qsort(entries.begin(), entries.size(), sizeof(MapEntry*), compareEntries);
</ins><span class="cx">
</span><span class="cx"> // Iterate over the children in sample-frequency order.
</span><span class="cx"> for (size_t e = 0; e < entries.size(); ++e) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreyarrYarrJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> if (charClass->m_ranges.size()) {
</span><span class="cx"> unsigned matchIndex = 0;
</span><span class="cx"> JumpList failures;
</span><del>- matchCharacterClassRange(character, failures, matchDest, charClass->m_ranges.data(), charClass->m_ranges.size(), &matchIndex, charClass->m_matches.data(), charClass->m_matches.size());
</del><ins>+ matchCharacterClassRange(character, failures, matchDest, charClass->m_ranges.begin(), charClass->m_ranges.size(), &matchIndex, charClass->m_matches.begin(), charClass->m_matches.size());
</ins><span class="cx"> while (matchIndex < charClass->m_matches.size())
</span><span class="cx"> matchDest.append(branch32(Equal, character, Imm32((unsigned short)charClass->m_matches[matchIndex++])));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WTF/ChangeLog 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-12-15 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r177284.
+ https://bugs.webkit.org/show_bug.cgi?id=139658
+
+ "Breaks API tests and LayoutTests on Yosemite Debug"
+ (Requested by msaboff on #webkit).
+
+ Reverted changeset:
+
+ "Make sure range based iteration of Vector<> still receives
+ bounds checking"
+ https://bugs.webkit.org/show_bug.cgi?id=138821
+ http://trac.webkit.org/changeset/177284
+
</ins><span class="cx"> 2014-12-15 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Purge PassRefPtr from FocusEvent code.
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -221,7 +221,6 @@
</span><span class="cx"> <ClInclude Include="..\wtf\HashTable.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\HashTraits.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\HexNumber.h" />
</span><del>- <ClInclude Include="..\wtf\IndexedIterator.h" />
</del><span class="cx"> <ClInclude Include="..\wtf\IteratorAdaptors.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\IteratorRange.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\ListHashSet.h" />
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -470,9 +470,6 @@
</span><span class="cx"> <ClInclude Include="..\wtf\HexNumber.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\wtf\IndexedIterator.h">
- <Filter>wtf</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\wtf\IteratorAdaptors.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -100,7 +100,6 @@
</span><span class="cx"> A748745217A0BDAE00FA04CB /* SixCharacterHash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A748744F17A0BDAE00FA04CB /* SixCharacterHash.cpp */; };
</span><span class="cx"> A748745317A0BDAE00FA04CB /* SixCharacterHash.h in Headers */ = {isa = PBXBuildFile; fileRef = A748745017A0BDAE00FA04CB /* SixCharacterHash.h */; };
</span><span class="cx"> A748745417A0BDAE00FA04CB /* StringHashDumpContext.h in Headers */ = {isa = PBXBuildFile; fileRef = A748745117A0BDAE00FA04CB /* StringHashDumpContext.h */; };
</span><del>- A7DC2F041A09A22D0072F4E3 /* IndexedIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = A7DC2F031A099DE30072F4E3 /* IndexedIterator.h */; };
</del><span class="cx"> A7E643C617C5423B003BB16B /* Compression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E643C417C5423B003BB16B /* Compression.cpp */; };
</span><span class="cx"> A7E643C717C5423B003BB16B /* Compression.h in Headers */ = {isa = PBXBuildFile; fileRef = A7E643C517C5423B003BB16B /* Compression.h */; };
</span><span class="cx"> A876DBD8151816E500DADB95 /* Platform.h in Headers */ = {isa = PBXBuildFile; fileRef = A876DBD7151816E500DADB95 /* Platform.h */; };
</span><span class="lines">@@ -394,7 +393,6 @@
</span><span class="cx"> A748744F17A0BDAE00FA04CB /* SixCharacterHash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SixCharacterHash.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A748745017A0BDAE00FA04CB /* SixCharacterHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SixCharacterHash.h; sourceTree = "<group>"; };
</span><span class="cx"> A748745117A0BDAE00FA04CB /* StringHashDumpContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringHashDumpContext.h; sourceTree = "<group>"; };
</span><del>- A7DC2F031A099DE30072F4E3 /* IndexedIterator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IndexedIterator.h; sourceTree = "<group>"; };
</del><span class="cx"> A7E643C417C5423B003BB16B /* Compression.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Compression.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A7E643C517C5423B003BB16B /* Compression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Compression.h; sourceTree = "<group>"; };
</span><span class="cx"> A876DBD7151816E500DADB95 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Platform.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -900,7 +898,6 @@
</span><span class="cx"> 974CFC8D16A4F327006D5404 /* WeakPtr.h */,
</span><span class="cx"> A8A4737A151A825B004123FF /* WTFThreadData.cpp */,
</span><span class="cx"> A8A4737B151A825B004123FF /* WTFThreadData.h */,
</span><del>- A7DC2F031A099DE30072F4E3 /* IndexedIterator.h */,
</del><span class="cx"> );
</span><span class="cx"> path = wtf;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -1074,7 +1071,6 @@
</span><span class="cx"> A8A473AD151A825B004123FF /* cached-powers.h in Headers */,
</span><span class="cx"> A8A4745E151A825B004123FF /* CharacterNames.h in Headers */,
</span><span class="cx"> A8A47394151A825B004123FF /* CheckedArithmetic.h in Headers */,
</span><del>- A7DC2F041A09A22D0072F4E3 /* IndexedIterator.h in Headers */,
</del><span class="cx"> A8A47395151A825B004123FF /* CheckedBoolean.h in Headers */,
</span><span class="cx"> A8A4745F151A825B004123FF /* Collator.h in Headers */,
</span><span class="cx"> 0FC4EDE61696149600F65041 /* CommaPrinter.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfIndexedIteratorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/wtf/IndexedIterator.h (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/IndexedIterator.h 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WTF/wtf/IndexedIterator.h 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -1,358 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WTF_IndexedIterator_h
-#define WTF_IndexedIterator_h
-
-namespace WTF {
-
-#define INDEXED_ITERATOR_OVERFLOW(check) do {\
- if (!(check))\
- OverflowHandler::overflowed();\
-} while (0)
-
-template <typename VectorType, typename T, typename OverflowHandler = CrashOnOverflow> struct IndexedIterator {
- typedef struct IndexedIterator<const VectorType, const T, OverflowHandler> const_iterator;
-
- typedef T ValueType;
- typedef ptrdiff_t difference_type;
- typedef ValueType value_type;
- typedef ValueType* pointer;
- typedef ValueType& reference;
- typedef std::bidirectional_iterator_tag iterator_category;
-
- IndexedIterator()
- : m_vector(nullptr)
- , m_position(0)
- {
- }
-
- IndexedIterator(VectorType& vector, ValueType* position)
- : m_vector(&vector)
- , m_position(position - vector.data())
- {
- }
-
- IndexedIterator(const IndexedIterator& other)
- : m_vector(other.m_vector)
- , m_position(other.m_position)
- {
- }
-
- ValueType* operator->() const { return &m_vector->at(m_position); }
- ValueType& operator*() const { return m_vector->at(m_position); }
- ValueType* get() const
- {
- if (!m_vector)
- return nullptr;
- INDEXED_ITERATOR_OVERFLOW(m_position <= m_vector->size());
- return m_vector->data() + m_position;
- }
-
- IndexedIterator& operator++()
- {
- m_position++;
- return *this;
- }
-
- IndexedIterator operator++(int)
- {
- IndexedIterator result(*this);
- m_position++;
- return result;
- }
-
- IndexedIterator& operator--()
- {
- m_position--;
- return *this;
- }
-
- IndexedIterator operator--(int)
- {
- IndexedIterator result(*this);
- m_position--;
- return result;
- }
-
- // This conversion operator allows implicit conversion to bool but not to other integer types.
- typedef size_t (IndexedIterator::*UnspecifiedBoolType);
- operator UnspecifiedBoolType() const { return m_vector ? &IndexedIterator::m_position : nullptr; }
-
-#if __SIZEOF_SIZE_T__ != __SIZEOF_INT__ || PLATFORM(COCOA)
-#define _UNSIGNED_If_DIFFERENT(macro) macro(unsigned)
-#else
-#define _UNSIGNED_If_DIFFERENT(macro)
-#endif
-
-#define FOR_EACH_INTEGER_TYPE(macro) \
- macro(size_t) \
- macro(int32_t) \
- macro(long) \
- macro(long long) \
- macro(unsigned long long) \
- _UNSIGNED_If_DIFFERENT(macro)
-
-#define MODIFIER_OPS(type) \
- IndexedIterator& operator+=(type increment) \
- { \
- m_position += increment; \
- return *this; \
- } \
-\
- IndexedIterator& operator-=(type decrement) \
- { \
- m_position -= decrement; \
- return *this; \
- }
-
- FOR_EACH_INTEGER_TYPE(MODIFIER_OPS)
-
-#undef MODIFIER_OPS
-
-#define ARITHMETIC_OPS(type) \
- IndexedIterator operator+(type increment) const \
- { \
- IndexedIterator result(*this); \
- result.m_position += increment; \
- return result; \
- } \
-\
- IndexedIterator operator-(type decrement) const \
- { \
- IndexedIterator result(*this); \
- result.m_position -= decrement; \
- return result; \
- }
-
-
- FOR_EACH_INTEGER_TYPE(ARITHMETIC_OPS)
-
-#undef ARITHMETIC_OPS
-
- ptrdiff_t operator-(const const_iterator& right) const
- {
- return m_position - right.m_position;
- }
-
- ptrdiff_t operator-(const ValueType* right) const
- {
- return get() - right;
- }
-
- void operator=(const IndexedIterator& other)
- {
- m_vector = other.m_vector;
- m_position = other.m_position;
- }
-
- bool operator==(const const_iterator& other) const
- {
- return unsafeGet() == other.unsafeGet();
- }
-
- bool operator!=(const const_iterator& other) const
- {
- return unsafeGet() != other.unsafeGet();
- }
-
- bool operator==(const ValueType* other) const
- {
- return unsafeGet() == other;
- }
-
- bool operator!=(const ValueType* other) const
- {
- return unsafeGet() != other;
- }
-
- bool operator<(const ValueType* other) const
- {
- return unsafeGet() < other;
- }
-
- bool operator<=(const ValueType* other) const
- {
- return unsafeGet() <= other;
- }
-
- bool operator<(const const_iterator& other) const
- {
- return unsafeGet() < other.unsafeGet();
- }
-
- bool operator<=(const const_iterator& other) const
- {
- return unsafeGet() <= other.unsafeGet();
- }
-
- bool operator>(const IndexedIterator& other) const
- {
- return unsafeGet() > other.unsafeGet();
- }
-
- bool operator>=(const const_iterator& other) const
- {
- return unsafeGet() >= other.unsafeGet();
- }
-
- bool operator>(const ValueType* other) const
- {
- return unsafeGet() > other;
- }
-
- bool operator>=(const ValueType* other) const
- {
- return unsafeGet() >= other;
- }
-
- operator const_iterator() const
- {
- const_iterator result;
- result.m_vector = m_vector;
- result.m_position = m_position;
- return result;
- }
-
- VectorType* m_vector;
- size_t m_position;
-
- ValueType* unsafeGet() const
- {
- if (!m_vector)
- return nullptr;
- return get();
- }
-};
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline typename IndexedIterator<T, ValueType, OverflowHandler>::ValueType* getPtr(IndexedIterator<T, ValueType, OverflowHandler> p)
-{
- return p.get();
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline ptrdiff_t operator-(const ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return left - right.get();
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline ptrdiff_t operator-(ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return left - right.get();
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline ptrdiff_t operator-(const ValueType* left, const IndexedIterator<const T, const ValueType, OverflowHandler>& right)
-{
- return left - right.get();
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline bool operator==(ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return right == left;
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline bool operator==(const ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return right == left;
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline bool operator!=(ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return right != left;
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline bool operator!=(const ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return right != left;
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline bool operator<=(ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return right >= left;
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline bool operator<=(const ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return right >= left;
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline bool operator>=(ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return right <= left;
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline bool operator>=(const ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return right <= left;
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline bool operator<(ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return right > left;
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline bool operator<(const ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return right > left;
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline bool operator>(ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return right < left;
-}
-
-template <typename T, typename ValueType, typename OverflowHandler>
-inline bool operator>(const ValueType* left, const IndexedIterator<T, ValueType, OverflowHandler>& right)
-{
- return right < left;
-}
-
-template <typename VectorType, typename OverflowHandler> struct IndexedIteratorSelector {
- typedef typename VectorType::ValueType ValueType;
- typedef IndexedIterator<VectorType, ValueType, OverflowHandler> iterator;
- typedef typename iterator::const_iterator const_iterator;
- static iterator makeIterator(VectorType& vector, ValueType* p) { return iterator(vector, p); }
- static const_iterator makeConstIterator(const VectorType& vector, const ValueType* p) { return const_iterator(vector, p); }
-};
-
-#undef INDEXED_ITERATOR_OVERFLOW
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWTFwtfRefCountedArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefCountedArray.h (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefCountedArray.h 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WTF/wtf/RefCountedArray.h 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> Header::fromPayload(m_data)->refCount = 1;
</span><span class="cx"> Header::fromPayload(m_data)->length = other.size();
</span><span class="cx"> ASSERT(Header::fromPayload(m_data)->length == other.size());
</span><del>- VectorTypeOperations<T>::uninitializedCopy(getPtr(other.begin()), getPtr(other.end()), m_data);
</del><ins>+ VectorTypeOperations<T>::uninitializedCopy(other.begin(), other.end(), m_data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefCountedArray& operator=(const RefCountedArray& other)
</span></span></pre></div>
<a id="trunkSourceWTFwtfVectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Vector.h (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Vector.h 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WTF/wtf/Vector.h 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #include <utility>
</span><span class="cx"> #include <wtf/CheckedArithmetic.h>
</span><span class="cx"> #include <wtf/FastMalloc.h>
</span><del>-#include <wtf/GetPtr.h>
-#include <wtf/IndexedIterator.h>
</del><span class="cx"> #include <wtf/MallocPtr.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -555,17 +553,14 @@
</span><span class="cx"> class Vector : private VectorBuffer<T, inlineCapacity> {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> private:
</span><del>-
</del><span class="cx"> typedef VectorBuffer<T, inlineCapacity> Base;
</span><span class="cx"> typedef VectorTypeOperations<T> TypeOperations;
</span><del>- typedef IndexedIteratorSelector<Vector, OverflowHandler> IteratorSelector;
</del><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> typedef T ValueType;
</span><span class="cx">
</span><del>- typedef typename IteratorSelector::iterator iterator;
- typedef typename IteratorSelector::const_iterator const_iterator;
-
</del><ins>+ typedef T* iterator;
+ typedef const T* const_iterator;
</ins><span class="cx"> typedef std::reverse_iterator<iterator> reverse_iterator;
</span><span class="cx"> typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
</span><span class="cx">
</span><span class="lines">@@ -578,14 +573,14 @@
</span><span class="cx"> : Base(size, size)
</span><span class="cx"> {
</span><span class="cx"> if (begin())
</span><del>- TypeOperations::initialize(getPtr(begin()), getPtr(end()));
</del><ins>+ TypeOperations::initialize(begin(), end());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector(size_t size, const T& val)
</span><span class="cx"> : Base(size, size)
</span><span class="cx"> {
</span><span class="cx"> if (begin())
</span><del>- TypeOperations::uninitializedFill(getPtr(begin()), getPtr(end()), val);
</del><ins>+ TypeOperations::uninitializedFill(begin(), end(), val);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector(std::initializer_list<T> initializerList)
</span><span class="lines">@@ -649,10 +644,10 @@
</span><span class="cx"> const T* data() const { return Base::buffer(); }
</span><span class="cx"> static ptrdiff_t dataMemoryOffset() { return Base::bufferMemoryOffset(); }
</span><span class="cx">
</span><del>- iterator begin() { return IteratorSelector::makeIterator(*this, data()); }
- iterator end() { return begin() + size(); }
- const_iterator begin() const { return IteratorSelector::makeConstIterator(*this, data()); }
- const_iterator end() const { return begin() + size(); }
</del><ins>+ iterator begin() { return data(); }
+ iterator end() { return begin() + m_size; }
+ const_iterator begin() const { return data(); }
+ const_iterator end() const { return begin() + m_size; }
</ins><span class="cx">
</span><span class="cx"> reverse_iterator rbegin() { return reverse_iterator(end()); }
</span><span class="cx"> reverse_iterator rend() { return reverse_iterator(begin()); }
</span><span class="lines">@@ -687,7 +682,6 @@
</span><span class="cx">
</span><span class="cx"> void clear() { shrinkCapacity(0); }
</span><span class="cx">
</span><del>- void append(const_iterator, size_t);
</del><span class="cx"> template<typename U> void append(const U*, size_t);
</span><span class="cx"> template<typename U> void append(U&&);
</span><span class="cx"> template<typename U> void uncheckedAppend(U&& val);
</span><span class="lines">@@ -751,7 +745,7 @@
</span><span class="cx"> : Base(other.capacity(), other.size())
</span><span class="cx"> {
</span><span class="cx"> if (begin())
</span><del>- TypeOperations::uninitializedCopy(getPtr(other.begin()), getPtr(other.end()), getPtr(begin()));
</del><ins>+ TypeOperations::uninitializedCopy(other.begin(), other.end(), begin());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler>
</span><span class="lines">@@ -760,7 +754,7 @@
</span><span class="cx"> : Base(other.capacity(), other.size())
</span><span class="cx"> {
</span><span class="cx"> if (begin())
</span><del>- TypeOperations::uninitializedCopy(getPtr(other.begin()), getPtr(other.end()), getPtr(begin()));
</del><ins>+ TypeOperations::uninitializedCopy(other.begin(), other.end(), begin());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler>
</span><span class="lines">@@ -777,8 +771,8 @@
</span><span class="cx"> ASSERT(begin());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- std::copy(getPtr(other.begin()), getPtr(other.begin() + size()), getPtr(begin()));
- TypeOperations::uninitializedCopy(getPtr(other.begin() + size()), getPtr(other.end()), getPtr(end()));
</del><ins>+ std::copy(other.begin(), other.begin() + size(), begin());
+ TypeOperations::uninitializedCopy(other.begin() + size(), other.end(), end());
</ins><span class="cx"> m_size = other.size();
</span><span class="cx">
</span><span class="cx"> return *this;
</span><span class="lines">@@ -802,9 +796,9 @@
</span><span class="cx"> reserveCapacity(other.size());
</span><span class="cx"> ASSERT(begin());
</span><span class="cx"> }
</span><del>-
- std::copy(getPtr(other.begin()), getPtr(other.begin() + size()), getPtr(begin()));
- TypeOperations::uninitializedCopy(getPtr(other.begin() + size()), getPtr(other.end()), getPtr(end()));
</del><ins>+
+ std::copy(other.begin(), other.begin() + size(), begin());
+ TypeOperations::uninitializedCopy(other.begin() + size(), other.end(), end());
</ins><span class="cx"> m_size = other.size();
</span><span class="cx">
</span><span class="cx"> return *this;
</span><span class="lines">@@ -864,8 +858,8 @@
</span><span class="cx"> ASSERT(begin());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- std::fill(getPtr(begin()), getPtr(end()), val);
- TypeOperations::uninitializedFill(getPtr(end()), getPtr(begin()) + newSize, val);
</del><ins>+ std::fill(begin(), end(), val);
+ TypeOperations::uninitializedFill(end(), begin() + newSize, val);
</ins><span class="cx"> m_size = newSize;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -886,13 +880,13 @@
</span><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler>
</span><span class="cx"> T* Vector<T, inlineCapacity, OverflowHandler>::expandCapacity(size_t newMinCapacity, T* ptr)
</span><span class="cx"> {
</span><del>- if (ptr < getPtr(begin()) || ptr >= getPtr(end())) {
</del><ins>+ if (ptr < begin() || ptr >= end()) {
</ins><span class="cx"> expandCapacity(newMinCapacity);
</span><span class="cx"> return ptr;
</span><span class="cx"> }
</span><span class="cx"> size_t index = ptr - begin();
</span><span class="cx"> expandCapacity(newMinCapacity);
</span><del>- return getPtr(begin() + index);
</del><ins>+ return begin() + index;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler>
</span><span class="lines">@@ -904,15 +898,15 @@
</span><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler>
</span><span class="cx"> const T* Vector<T, inlineCapacity, OverflowHandler>::tryExpandCapacity(size_t newMinCapacity, const T* ptr)
</span><span class="cx"> {
</span><del>- if (ptr < getPtr(begin()) || ptr >= getPtr(end())) {
</del><ins>+ if (ptr < begin() || ptr >= end()) {
</ins><span class="cx"> if (!tryExpandCapacity(newMinCapacity))
</span><span class="cx"> return 0;
</span><span class="cx"> return ptr;
</span><span class="cx"> }
</span><del>- size_t index = (ptr - begin());
</del><ins>+ size_t index = ptr - begin();
</ins><span class="cx"> if (!tryExpandCapacity(newMinCapacity))
</span><span class="cx"> return 0;
</span><del>- return getPtr(begin()) + index;
</del><ins>+ return begin() + index;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
</span><span class="lines">@@ -926,12 +920,12 @@
</span><span class="cx"> inline void Vector<T, inlineCapacity, OverflowHandler>::resize(size_t size)
</span><span class="cx"> {
</span><span class="cx"> if (size <= m_size)
</span><del>- TypeOperations::destruct(getPtr(begin()) + size, getPtr(end()));
</del><ins>+ TypeOperations::destruct(begin() + size, end());
</ins><span class="cx"> else {
</span><span class="cx"> if (size > capacity())
</span><span class="cx"> expandCapacity(size);
</span><span class="cx"> if (begin())
</span><del>- TypeOperations::initialize(getPtr(end()), getPtr(begin()) + size);
</del><ins>+ TypeOperations::initialize(end(), begin() + size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_size = size;
</span><span class="lines">@@ -948,7 +942,7 @@
</span><span class="cx"> void Vector<T, inlineCapacity, OverflowHandler>::shrink(size_t size)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(size <= m_size);
</span><del>- TypeOperations::destruct(getPtr(begin()) + size, getPtr(end()));
</del><ins>+ TypeOperations::destruct(begin() + size, end());
</ins><span class="cx"> m_size = size;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -959,7 +953,7 @@
</span><span class="cx"> if (size > capacity())
</span><span class="cx"> expandCapacity(size);
</span><span class="cx"> if (begin())
</span><del>- TypeOperations::initialize(getPtr(end()), getPtr(begin()) + size);
</del><ins>+ TypeOperations::initialize(end(), begin() + size);
</ins><span class="cx"> m_size = size;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -968,11 +962,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (newCapacity <= capacity())
</span><span class="cx"> return;
</span><del>- T* oldBuffer = getPtr(begin());
- T* oldEnd = getPtr(end());
</del><ins>+ T* oldBuffer = begin();
+ T* oldEnd = end();
</ins><span class="cx"> Base::allocateBuffer(newCapacity);
</span><span class="cx"> ASSERT(begin());
</span><del>- TypeOperations::move(oldBuffer, oldEnd, getPtr(begin()));
</del><ins>+ TypeOperations::move(oldBuffer, oldEnd, begin());
</ins><span class="cx"> Base::deallocateBuffer(oldBuffer);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -981,12 +975,12 @@
</span><span class="cx"> {
</span><span class="cx"> if (newCapacity <= capacity())
</span><span class="cx"> return true;
</span><del>- T* oldBuffer = getPtr(begin());
- T* oldEnd = getPtr(end());
</del><ins>+ T* oldBuffer = begin();
+ T* oldEnd = end();
</ins><span class="cx"> if (!Base::tryAllocateBuffer(newCapacity))
</span><span class="cx"> return false;
</span><span class="cx"> ASSERT(begin());
</span><del>- TypeOperations::move(oldBuffer, oldEnd, getPtr(begin()));
</del><ins>+ TypeOperations::move(oldBuffer, oldEnd, begin());
</ins><span class="cx"> Base::deallocateBuffer(oldBuffer);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1009,17 +1003,17 @@
</span><span class="cx"> if (newCapacity < size())
</span><span class="cx"> shrink(newCapacity);
</span><span class="cx">
</span><del>- T* oldBuffer = getPtr(begin());
</del><ins>+ T* oldBuffer = begin();
</ins><span class="cx"> if (newCapacity > 0) {
</span><span class="cx"> if (Base::shouldReallocateBuffer(newCapacity)) {
</span><span class="cx"> Base::reallocateBuffer(newCapacity);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- T* oldEnd = getPtr(end());
</del><ins>+ T* oldEnd = end();
</ins><span class="cx"> Base::allocateBuffer(newCapacity);
</span><span class="cx"> if (begin() != oldBuffer)
</span><del>- TypeOperations::move(oldBuffer, oldEnd, getPtr(begin()));
</del><ins>+ TypeOperations::move(oldBuffer, oldEnd, begin());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Base::deallocateBuffer(oldBuffer);
</span><span class="lines">@@ -1039,17 +1033,11 @@
</span><span class="cx"> }
</span><span class="cx"> if (newSize < m_size)
</span><span class="cx"> CRASH();
</span><del>- T* dest = getPtr(end());
</del><ins>+ T* dest = end();
</ins><span class="cx"> VectorCopier<std::is_trivial<T>::value, U>::uninitializedCopy(data, &data[dataSize], dest);
</span><span class="cx"> m_size = newSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T, size_t inlineCapacity, typename OverflowHandler>
-void Vector<T, inlineCapacity, OverflowHandler>::append(const_iterator data, size_t dataSize)
-{
- append(getPtr(data), dataSize);
-}
-
</del><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
</span><span class="cx"> bool Vector<T, inlineCapacity, OverflowHandler>::tryAppend(const U* data, size_t dataSize)
</span><span class="cx"> {
</span><span class="lines">@@ -1062,7 +1050,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (newSize < m_size)
</span><span class="cx"> return false;
</span><del>- T* dest = getPtr(end());
</del><ins>+ T* dest = end();
</ins><span class="cx"> VectorCopier<std::is_trivial<T>::value, U>::uninitializedCopy(data, &data[dataSize], dest);
</span><span class="cx"> m_size = newSize;
</span><span class="cx"> return true;
</span><span class="lines">@@ -1072,7 +1060,7 @@
</span><span class="cx"> ALWAYS_INLINE void Vector<T, inlineCapacity, OverflowHandler>::append(U&& value)
</span><span class="cx"> {
</span><span class="cx"> if (size() != capacity()) {
</span><del>- new (NotNull, getPtr(end())) T(std::forward<U>(value));
</del><ins>+ new (NotNull, end()) T(std::forward<U>(value));
</ins><span class="cx"> ++m_size;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1089,7 +1077,7 @@
</span><span class="cx"> ptr = expandCapacity(size() + 1, ptr);
</span><span class="cx"> ASSERT(begin());
</span><span class="cx">
</span><del>- new (NotNull, getPtr(end())) T(std::forward<U>(*ptr));
</del><ins>+ new (NotNull, end()) T(std::forward<U>(*ptr));
</ins><span class="cx"> ++m_size;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1102,14 +1090,14 @@
</span><span class="cx"> ASSERT(size() < capacity());
</span><span class="cx">
</span><span class="cx"> auto ptr = std::addressof(value);
</span><del>- new (NotNull, getPtr(end())) T(std::forward<U>(*ptr));
</del><ins>+ new (NotNull, end()) T(std::forward<U>(*ptr));
</ins><span class="cx"> ++m_size;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U, size_t otherCapacity>
</span><span class="cx"> inline void Vector<T, inlineCapacity, OverflowHandler>::appendVector(const Vector<U, otherCapacity>& val)
</span><span class="cx"> {
</span><del>- append(getPtr(val.begin()), val.size());
</del><ins>+ append(val.begin(), val.size());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
</span><span class="lines">@@ -1123,8 +1111,8 @@
</span><span class="cx"> }
</span><span class="cx"> if (newSize < m_size)
</span><span class="cx"> CRASH();
</span><del>- T* spot = getPtr(begin()) + position;
- TypeOperations::moveOverlapping(spot, getPtr(end()), spot + dataSize);
</del><ins>+ T* spot = begin() + position;
+ TypeOperations::moveOverlapping(spot, end(), spot + dataSize);
</ins><span class="cx"> VectorCopier<std::is_trivial<T>::value, U>::uninitializedCopy(data, &data[dataSize], spot);
</span><span class="cx"> m_size = newSize;
</span><span class="cx"> }
</span><span class="lines">@@ -1140,8 +1128,8 @@
</span><span class="cx"> ASSERT(begin());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- T* spot = getPtr(begin()) + position;
- TypeOperations::moveOverlapping(spot, getPtr(end()), spot + 1);
</del><ins>+ T* spot = begin() + position;
+ TypeOperations::moveOverlapping(spot, end(), spot + 1);
</ins><span class="cx"> new (NotNull, spot) T(std::forward<U>(*ptr));
</span><span class="cx"> ++m_size;
</span><span class="cx"> }
</span><span class="lines">@@ -1149,16 +1137,16 @@
</span><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U, size_t c>
</span><span class="cx"> inline void Vector<T, inlineCapacity, OverflowHandler>::insertVector(size_t position, const Vector<U, c>& val)
</span><span class="cx"> {
</span><del>- insert(position, getPtr(val.begin()), val.size());
</del><ins>+ insert(position, val.begin(), val.size());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler>
</span><span class="cx"> inline void Vector<T, inlineCapacity, OverflowHandler>::remove(size_t position)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(position < size());
</span><del>- T* spot = getPtr(begin()) + position;
</del><ins>+ T* spot = begin() + position;
</ins><span class="cx"> spot->~T();
</span><del>- TypeOperations::moveOverlapping(spot + 1, getPtr(end()), spot);
</del><ins>+ TypeOperations::moveOverlapping(spot + 1, end(), spot);
</ins><span class="cx"> --m_size;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1167,10 +1155,10 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(position <= size());
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(position + length <= size());
</span><del>- T* beginSpot = getPtr(begin()) + position;
</del><ins>+ T* beginSpot = begin() + position;
</ins><span class="cx"> T* endSpot = beginSpot + length;
</span><span class="cx"> TypeOperations::destruct(beginSpot, endSpot);
</span><del>- TypeOperations::moveOverlapping(endSpot, getPtr(end()), beginSpot);
</del><ins>+ TypeOperations::moveOverlapping(endSpot, end(), beginSpot);
</ins><span class="cx"> m_size -= length;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/ChangeLog 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-12-15 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r177284.
+ https://bugs.webkit.org/show_bug.cgi?id=139658
+
+ "Breaks API tests and LayoutTests on Yosemite Debug"
+ (Requested by msaboff on #webkit).
+
+ Reverted changeset:
+
+ "Make sure range based iteration of Vector<> still receives
+ bounds checking"
+ https://bugs.webkit.org/show_bug.cgi?id=138821
+ http://trac.webkit.org/changeset/177284
+
</ins><span class="cx"> 2014-12-15 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> cloneNode(true) does not clone nested template elements' contents
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -1442,8 +1442,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (buffer.isEmpty())
</span><span class="cx"> return String();
</span><del>- const uint8_t* ptr = getPtr(buffer.begin());
- const uint8_t* end = getPtr(buffer.end());
</del><ins>+ const uint8_t* ptr = buffer.begin();
+ const uint8_t* end = buffer.end();
</ins><span class="cx"> uint32_t version;
</span><span class="cx"> if (!readLittleEndian(ptr, end, version) || version > CurrentVersion)
</span><span class="cx"> return String();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -2073,11 +2073,11 @@
</span><span class="cx"> // creating a new one each time.
</span><span class="cx"> normalizeCharacters(match, matchLength, m_normalizedMatch);
</span><span class="cx">
</span><del>- const UChar* a = getPtr(m_normalizedTarget.begin());
- const UChar* aEnd = getPtr(m_normalizedTarget.end());
</del><ins>+ const UChar* a = m_normalizedTarget.begin();
+ const UChar* aEnd = m_normalizedTarget.end();
</ins><span class="cx">
</span><del>- const UChar* b = getPtr(m_normalizedMatch.begin());
- const UChar* bEnd = getPtr(m_normalizedMatch.end());
</del><ins>+ const UChar* b = m_normalizedMatch.begin();
+ const UChar* bEnd = m_normalizedMatch.end();
</ins><span class="cx">
</span><span class="cx"> while (true) {
</span><span class="cx"> // Skip runs of non-kana-letter characters. This is necessary so we can
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacServicesOverlayControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.mm (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx">
</span><span class="cx"> if (!cgRects.isEmpty()) {
</span><span class="cx"> CGRect visibleRect = mainFrameView->visibleContentRect();
</span><del>- RetainPtr<DDHighlightRef> ddHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection(nullptr, cgRects.data(), cgRects.size(), visibleRect, DDHighlightStyleBubbleNone | DDHighlightStyleStandardIconArrow | DDHighlightStyleButtonShowAlways, YES, NSWritingDirectionNatural, NO, YES));
</del><ins>+ RetainPtr<DDHighlightRef> ddHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection(nullptr, cgRects.begin(), cgRects.size(), visibleRect, DDHighlightStyleBubbleNone | DDHighlightStyleStandardIconArrow | DDHighlightStyleButtonShowAlways, YES, NSWritingDirectionNatural, NO, YES));
</ins><span class="cx">
</span><span class="cx"> newPotentialHighlights.add(Highlight::createForSelection(*this, ddHighlight, selectionRange));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSegmentedFontDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SegmentedFontData.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx">
</span><span class="cx"> const SimpleFontData* SegmentedFontData::fontDataForCharacter(UChar32 c) const
</span><span class="cx"> {
</span><del>- auto end = m_ranges.end();
- for (auto it = m_ranges.begin(); it != end; ++it) {
</del><ins>+ Vector<FontDataRange>::const_iterator end = m_ranges.end();
+ for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
</ins><span class="cx"> if (it->from() <= c && it->to() >= c)
</span><span class="cx"> return it->fontData().get();
</span><span class="cx"> }
</span><span class="lines">@@ -49,8 +49,8 @@
</span><span class="cx">
</span><span class="cx"> bool SegmentedFontData::containsCharacter(UChar32 c) const
</span><span class="cx"> {
</span><del>- auto end = m_ranges.end();
- for (auto it = m_ranges.begin(); it != end; ++it) {
</del><ins>+ Vector<FontDataRange>::const_iterator end = m_ranges.end();
+ for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
</ins><span class="cx"> if (c >= it->from() && c <= it->to())
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -76,8 +76,8 @@
</span><span class="cx">
</span><span class="cx"> bool SegmentedFontData::isLoading() const
</span><span class="cx"> {
</span><del>- auto end = m_ranges.end();
- for (auto it = m_ranges.begin(); it != end; ++it) {
</del><ins>+ Vector<FontDataRange>::const_iterator end = m_ranges.end();
+ for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
</ins><span class="cx"> if (it->fontData()->isLoading())
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsWOFFFileFormatcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/WOFFFileFormat.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/WOFFFileFormat.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/platform/graphics/WOFFFileFormat.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> uLongf destLen = tableOrigLength;
</span><span class="cx"> if (!sfnt.tryReserveCapacity(sfnt.size() + tableOrigLength))
</span><span class="cx"> return false;
</span><del>- Bytef* dest = reinterpret_cast<Bytef*>(getPtr(sfnt.end()));
</del><ins>+ Bytef* dest = reinterpret_cast<Bytef*>(sfnt.end());
</ins><span class="cx"> sfnt.grow(sfnt.size() + tableOrigLength);
</span><span class="cx"> if (uncompress(dest, &destLen, reinterpret_cast<const Bytef*>(woff->data() + tableOffset), tableCompLength) != Z_OK)
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGradientCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GradientCairo.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GradientCairo.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/platform/graphics/cairo/GradientCairo.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> else
</span><span class="cx"> m_gradient = cairo_pattern_create_linear(m_p0.x(), m_p0.y(), m_p1.x(), m_p1.y());
</span><span class="cx">
</span><del>- auto stopIterator = m_stops.begin();
</del><ins>+ Vector<ColorStop>::iterator stopIterator = m_stops.begin();
</ins><span class="cx"> while (stopIterator != m_stops.end()) {
</span><span class="cx"> cairo_pattern_add_color_stop_rgba(m_gradient, stopIterator->stop,
</span><span class="cx"> stopIterator->red, stopIterator->green, stopIterator->blue,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersgifGIFImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> // always use ImageSource::clear(true, ...) to completely free the memory in
</span><span class="cx"> // this case.
</span><span class="cx"> clearBeforeFrame = std::min(clearBeforeFrame, m_frameBufferCache.size() - 1);
</span><del>- const auto end = m_frameBufferCache.begin() + clearBeforeFrame;
</del><ins>+ const Vector<ImageFrame>::iterator end(m_frameBufferCache.begin() + clearBeforeFrame);
</ins><span class="cx">
</span><span class="cx"> // We need to preserve frames such that:
</span><span class="cx"> // * We don't clear |end|
</span><span class="lines">@@ -165,14 +165,14 @@
</span><span class="cx"> // * If the frame is partial, we're decoding it, so don't clear it; if it
</span><span class="cx"> // has a disposal method other than DisposeOverwritePrevious, stop
</span><span class="cx"> // scanning, as we'll only need this frame when decoding the next one.
</span><del>- auto i = end;
</del><ins>+ Vector<ImageFrame>::iterator i(end);
</ins><span class="cx"> for (; (i != m_frameBufferCache.begin()) && ((i->status() == ImageFrame::FrameEmpty) || (i->disposalMethod() == ImageFrame::DisposeOverwritePrevious)); --i) {
</span><span class="cx"> if ((i->status() == ImageFrame::FrameComplete) && (i != end))
</span><span class="cx"> i->clearPixelData();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Now |i| holds the last frame we need to preserve; clear prior frames.
</span><del>- for (auto j = m_frameBufferCache.begin(); j != i; ++j) {
</del><ins>+ for (Vector<ImageFrame>::iterator j(m_frameBufferCache.begin()); j != i; ++j) {
</ins><span class="cx"> ASSERT(j->status() != ImageFrame::FramePartial);
</span><span class="cx"> if (j->status() != ImageFrame::FrameEmpty)
</span><span class="cx"> j->clearPixelData();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -1577,8 +1577,8 @@
</span><span class="cx"> context->beginTransparencyLayer(1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto topLayer = layers.rend();
- for (auto it = layers.rbegin(); it != topLayer; ++it)
</del><ins>+ Vector<const FillLayer*>::const_reverse_iterator topLayer = layers.rend();
+ for (Vector<const FillLayer*>::const_reverse_iterator it = layers.rbegin(); it != topLayer; ++it)
</ins><span class="cx"> paintFillLayer(paintInfo, c, *it, rect, bleedAvoidance, op, backgroundObject, baseBgColorUsage);
</span><span class="cx">
</span><span class="cx"> if (shouldDrawBackgroundInSeparateBuffer)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleGridResolvedPositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/GridResolvedPosition.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/GridResolvedPosition.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/rendering/style/GridResolvedPosition.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> // already converted to an index in our grid representation (ie one was removed from the grid line to account for
</span><span class="cx"> // the side).
</span><span class="cx"> unsigned firstLineBeforePositionIndex = 0;
</span><del>- auto firstLineBeforePosition = std::lower_bound(gridLines.begin(), gridLines.end(), position);
</del><ins>+ const unsigned* firstLineBeforePosition = std::lower_bound(gridLines.begin(), gridLines.end(), position);
</ins><span class="cx"> if (firstLineBeforePosition != gridLines.end()) {
</span><span class="cx"> if (*firstLineBeforePosition > position && firstLineBeforePosition != gridLines.begin())
</span><span class="cx"> --firstLineBeforePosition;
</span><span class="lines">@@ -316,8 +316,9 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<GridSpan> GridResolvedPosition::resolveRowEndColumnEndNamedGridLinePositionAgainstOppositePosition(const GridResolvedPosition& resolvedOppositePosition, const GridPosition& position, const Vector<unsigned>& gridLines)
</span><span class="cx"> {
</span><ins>+ ASSERT(gridLines.size());
</ins><span class="cx"> unsigned firstLineAfterOppositePositionIndex = gridLines.size() - 1;
</span><del>- auto firstLineAfterOppositePosition = std::upper_bound(gridLines.begin(), gridLines.end(), resolvedOppositePosition);
</del><ins>+ const unsigned* firstLineAfterOppositePosition = std::upper_bound(gridLines.begin(), gridLines.end(), resolvedOppositePosition);
</ins><span class="cx"> if (firstLineAfterOppositePosition != gridLines.end())
</span><span class="cx"> firstLineAfterOppositePositionIndex = firstLineAfterOppositePosition - gridLines.begin();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontElement.cpp (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontElement.cpp 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/svg/SVGFontElement.cpp 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -252,31 +252,31 @@
</span><span class="cx"> {
</span><span class="cx"> if (!g1.isEmpty() && kerningMap.glyphMap.contains(g1)) {
</span><span class="cx"> SVGKerningVector* kerningVector = kerningMap.glyphMap.get(g1);
</span><del>- size_t it = kerningVector->size();
- while (it-- > 0) {
- auto& value = kerningVector->at(it);
- if (matches(u2, g2, value))
- return value.kerning;
</del><ins>+ SVGKerningVector::const_iterator it = kerningVector->end() - 1;
+ const SVGKerningVector::const_iterator begin = kerningVector->begin() - 1;
+ for (; it != begin; --it) {
+ if (matches(u2, g2, *it))
+ return it->kerning;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!u1.isEmpty()) {
</span><span class="cx"> if (kerningMap.unicodeMap.contains(u1)) {
</span><span class="cx"> SVGKerningVector* kerningVector = kerningMap.unicodeMap.get(u1);
</span><del>- size_t it = kerningVector->size();
- while (it-- > 0) {
- auto& value = kerningVector->at(it);
- if (matches(u2, g2, value))
- return value.kerning;
</del><ins>+ SVGKerningVector::const_iterator it = kerningVector->end() - 1;
+ const SVGKerningVector::const_iterator begin = kerningVector->begin() - 1;
+ for (; it != begin; --it) {
+ if (matches(u2, g2, *it))
+ return it->kerning;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!kerningMap.kerningUnicodeRangeMap.isEmpty()) {
</span><del>- size_t it = kerningMap.kerningUnicodeRangeMap.size();
- while (it-- > 0) {
- auto& value = kerningMap.kerningUnicodeRangeMap[it];
- if (matches(u1, u2, g2, value))
- return value.kerning;
</del><ins>+ Vector<SVGKerningPair>::const_iterator it = kerningMap.kerningUnicodeRangeMap.end() - 1;
+ const Vector<SVGKerningPair>::const_iterator begin = kerningMap.kerningUnicodeRangeMap.begin() - 1;
+ for (; it != begin; --it) {
+ if (matches(u1, u2, g2, *it))
+ return it->kerning;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGPathByteStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGPathByteStream.h (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGPathByteStream.h 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/svg/SVGPathByteStream.h 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx"> void append(unsigned char byte) { m_data.append(byte); }
</span><span class="cx"> void append(SVGPathByteStream* other)
</span><span class="cx"> {
</span><del>- for (auto& byte : *other)
- append(byte);
</del><ins>+ for (DataIterator it = other->begin(); it != other->end(); ++it)
+ append(*it);
</ins><span class="cx"> }
</span><span class="cx"> void clear() { m_data.clear(); }
</span><span class="cx"> bool isEmpty() const { return !m_data.size(); }
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXPathNodeSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XPathNodeSet.h (177315 => 177316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XPathNodeSet.h 2014-12-15 22:58:17 UTC (rev 177315)
+++ trunk/Source/WebCore/xml/XPathNodeSet.h 2014-12-15 23:24:12 UTC (rev 177316)
</span><span class="lines">@@ -64,8 +64,8 @@
</span><span class="cx"> void markSubtreesDisjoint(bool disjoint) { m_subtreesAreDisjoint = disjoint; }
</span><span class="cx"> bool subtreesAreDisjoint() const { return m_subtreesAreDisjoint || m_nodes.size() < 2; }
</span><span class="cx">
</span><del>- const Vector<RefPtr<Node>>::iterator begin() const { return m_nodes.begin(); }
- const Vector<RefPtr<Node>>::iterator end() const { return m_nodes.end(); }
</del><ins>+ const RefPtr<Node>* begin() const { return m_nodes.begin(); }
+ const RefPtr<Node>* end() const { return m_nodes.end(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void traversalSort() const;
</span></span></pre>
</div>
</div>
</body>
</html>