<!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>[183065] 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/183065">183065</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-04-21 09:18:22 -0700 (Tue, 21 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&) constructor explicit
https://bugs.webkit.org/show_bug.cgi?id=143970
Reviewed by Darin Adler.
Make Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&)
constructor explicit as it copies the vector and it is easy to call it
by mistake.
Source/JavaScriptCore:
* bytecode/UnlinkedInstructionStream.cpp:
(JSC::UnlinkedInstructionStream::UnlinkedInstructionStream):
* bytecode/UnlinkedInstructionStream.h:
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::lower):
Source/WebCore:
* Modules/indexeddb/IDBDatabaseBackend.cpp:
(WebCore::IDBDatabaseBackend::setIndexKeys):
(WebCore::IDBDatabaseBackend::setIndexesReady):
* Modules/indexeddb/IDBDatabaseBackend.h:
* Modules/indexeddb/IDBServerConnection.h:
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::minimumRegisterRequirements):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasClasses):
* cssjit/StackAllocator.h:
(WebCore::StackAllocator::push):
(WebCore::StackAllocator::pop):
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::GridIterator::nextGridItem):
(WebCore::RenderGrid::GridIterator::isEmptyAreaEnough):
* rendering/style/SVGRenderStyle.cpp:
(WebCore::SVGRenderStyle::paintTypesForPaintOrder):
* rendering/style/SVGRenderStyle.h:
* rendering/svg/RenderSVGShape.cpp:
(WebCore::RenderSVGShape::fillStrokeMarkers):
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::paint):
* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::appendLigatureGlyphs):
(WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
Source/WebKit2:
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
(WebKit::WebIDBServerConnection::setIndexKeys):
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
Source/WTF:
* wtf/RefCountedArray.h:
(WTF::RefCountedArray::RefCountedArray):
* wtf/Vector.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedInstructionStreamcpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedInstructionStream.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedInstructionStreamh">trunk/Source/JavaScriptCore/bytecode/UnlinkedInstructionStream.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</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="#trunkSourceWebCoreModulesindexeddbIDBDatabaseBackendcpp">trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabaseBackendh">trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBServerConnectionh">trunk/Source/WebCore/Modules/indexeddb/IDBServerConnection.h</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCorecssjitStackAllocatorh">trunk/Source/WebCore/cssjit/StackAllocator.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleSVGRenderStylecpp">trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleSVGRenderStyleh">trunk/Source/WebCore/rendering/style/SVGRenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGShapecpp">trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGToOTFFontConversioncpp">trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitNotificationProvidercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectionh">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-04-21 Chris Dumez <cdumez@apple.com>
+
+ Make Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&) constructor explicit
+ https://bugs.webkit.org/show_bug.cgi?id=143970
+
+ Reviewed by Darin Adler.
+
+ Make Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&)
+ constructor explicit as it copies the vector and it is easy to call it
+ by mistake.
+
+ * bytecode/UnlinkedInstructionStream.cpp:
+ (JSC::UnlinkedInstructionStream::UnlinkedInstructionStream):
+ * bytecode/UnlinkedInstructionStream.h:
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::lower):
+
</ins><span class="cx"> 2015-04-20 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><span class="cx"> PhantomNewObject should be marked NodeMustGenerate
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedInstructionStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedInstructionStream.cpp (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedInstructionStream.cpp 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedInstructionStream.cpp 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> *(ptr++) = (value >> 24) & 0xff;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-UnlinkedInstructionStream::UnlinkedInstructionStream(const Vector<UnlinkedInstruction>& instructions)
</del><ins>+UnlinkedInstructionStream::UnlinkedInstructionStream(const Vector<UnlinkedInstruction, 0, UnsafeVectorOverflow>& instructions)
</ins><span class="cx"> : m_instructionCount(instructions.size())
</span><span class="cx"> {
</span><span class="cx"> Vector<unsigned char> buffer;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedInstructionStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedInstructionStream.h (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedInstructionStream.h 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedInstructionStream.h 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> class UnlinkedInstructionStream {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- explicit UnlinkedInstructionStream(const Vector<UnlinkedInstruction>&);
</del><ins>+ explicit UnlinkedInstructionStream(const Vector<UnlinkedInstruction, 0, UnsafeVectorOverflow>&);
</ins><span class="cx">
</span><span class="cx"> unsigned count() const { return m_instructionCount; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> m_out.appendTo(m_prologue, stackOverflow);
</span><span class="cx"> createPhiVariables();
</span><span class="cx">
</span><del>- Vector<BasicBlock*> preOrder = m_graph.blocksInPreOrder();
</del><ins>+ auto preOrder = m_graph.blocksInPreOrder();
</ins><span class="cx">
</span><span class="cx"> int maxNumberOfArguments = -1;
</span><span class="cx"> for (BasicBlock* block : preOrder) {
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WTF/ChangeLog 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-21 Chris Dumez <cdumez@apple.com>
+
+ Make Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&) constructor explicit
+ https://bugs.webkit.org/show_bug.cgi?id=143970
+
+ Reviewed by Darin Adler.
+
+ Make Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&)
+ constructor explicit as it copies the vector and it is easy to call it
+ by mistake.
+
+ * wtf/RefCountedArray.h:
+ (WTF::RefCountedArray::RefCountedArray):
+ * wtf/Vector.h:
+
</ins><span class="cx"> 2015-04-21 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove some stray uses of OwnPtr and PassOwnPtr in WTF (outside of the template definitions and traits)
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefCountedArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefCountedArray.h (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefCountedArray.h 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WTF/wtf/RefCountedArray.h 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -72,7 +72,8 @@
</span><span class="cx"> VectorTypeOperations<T>::initialize(begin(), end());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- explicit RefCountedArray(const Vector<T>& other)
</del><ins>+ template<size_t inlineCapacity, typename OverflowHandler>
+ explicit RefCountedArray(const Vector<T, inlineCapacity, OverflowHandler>& other)
</ins><span class="cx"> {
</span><span class="cx"> if (other.isEmpty()) {
</span><span class="cx"> m_data = 0;
</span></span></pre></div>
<a id="trunkSourceWTFwtfVectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Vector.h (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Vector.h 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WTF/wtf/Vector.h 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -639,7 +639,7 @@
</span><span class="cx">
</span><span class="cx"> Vector(const Vector&);
</span><span class="cx"> template<size_t otherCapacity, typename otherOverflowBehaviour>
</span><del>- Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&);
</del><ins>+ explicit Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&);
</ins><span class="cx">
</span><span class="cx"> Vector& operator=(const Vector&);
</span><span class="cx"> template<size_t otherCapacity, typename otherOverflowBehaviour>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebCore/ChangeLog 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2015-04-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Make Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&) constructor explicit
+ https://bugs.webkit.org/show_bug.cgi?id=143970
+
+ Reviewed by Darin Adler.
+
+ Make Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&)
+ constructor explicit as it copies the vector and it is easy to call it
+ by mistake.
+
+ * Modules/indexeddb/IDBDatabaseBackend.cpp:
+ (WebCore::IDBDatabaseBackend::setIndexKeys):
+ (WebCore::IDBDatabaseBackend::setIndexesReady):
+ * Modules/indexeddb/IDBDatabaseBackend.h:
+ * Modules/indexeddb/IDBServerConnection.h:
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::minimumRegisterRequirements):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasClasses):
+ * cssjit/StackAllocator.h:
+ (WebCore::StackAllocator::push):
+ (WebCore::StackAllocator::pop):
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::GridIterator::nextGridItem):
+ (WebCore::RenderGrid::GridIterator::isEmptyAreaEnough):
+ * rendering/style/SVGRenderStyle.cpp:
+ (WebCore::SVGRenderStyle::paintTypesForPaintOrder):
+ * rendering/style/SVGRenderStyle.h:
+ * rendering/svg/RenderSVGShape.cpp:
+ (WebCore::RenderSVGShape::fillStrokeMarkers):
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::paint):
+ * svg/SVGToOTFFontConversion.cpp:
+ (WebCore::SVGToOTFFontConverter::appendLigatureGlyphs):
+ (WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
+
+2015-04-21 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Use ASSERT_WITH_SECURITY_IMPLICATION() for NoEventDispatchAssertion
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143971
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> transaction->schedulePutOperation(objectStoreMetadata, value, key, putMode, callbacks, indexIds, indexKeys);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBDatabaseBackend::setIndexKeys(int64_t transactionID, int64_t objectStoreID, PassRefPtr<IDBKey> prpPrimaryKey, const Vector<int64_t>& indexIDs, const Vector<IndexKeys>& indexKeys)
</del><ins>+void IDBDatabaseBackend::setIndexKeys(int64_t transactionID, int64_t objectStoreID, PassRefPtr<IDBKey> prpPrimaryKey, const Vector<int64_t, 1>& indexIDs, const Vector<IndexKeys, 1>& indexKeys)
</ins><span class="cx"> {
</span><span class="cx"> LOG(StorageAPI, "IDBDatabaseBackend::setIndexKeys");
</span><span class="cx"> ASSERT(prpPrimaryKey);
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBDatabaseBackend::setIndexesReady(int64_t transactionId, int64_t, const Vector<int64_t>& indexIds)
</del><ins>+void IDBDatabaseBackend::setIndexesReady(int64_t transactionId, int64_t, const Vector<int64_t, 1>& indexIds)
</ins><span class="cx"> {
</span><span class="cx"> LOG(StorageAPI, "IDBDatabaseBackend::setIndexesReady");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.h (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.h 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.h 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -108,8 +108,8 @@
</span><span class="cx">
</span><span class="cx"> void get(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, bool keyOnly, PassRefPtr<IDBCallbacks>);
</span><span class="cx"> void put(int64_t transactionId, int64_t objectStoreId, PassRefPtr<SharedBuffer> value, PassRefPtr<IDBKey>, PutMode, PassRefPtr<IDBCallbacks>, const Vector<int64_t>& indexIds, const Vector<IndexKeys>&);
</span><del>- void setIndexKeys(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBKey> prpPrimaryKey, const Vector<int64_t>& indexIds, const Vector<IndexKeys>&);
- void setIndexesReady(int64_t transactionId, int64_t objectStoreId, const Vector<int64_t>& indexIds);
</del><ins>+ void setIndexKeys(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBKey> prpPrimaryKey, const Vector<int64_t, 1>& indexIds, const Vector<IndexKeys, 1>&);
+ void setIndexesReady(int64_t transactionId, int64_t objectStoreId, const Vector<int64_t, 1>& indexIds);
</ins><span class="cx"> void openCursor(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, IndexedDB::CursorDirection, bool keyOnly, TaskType, PassRefPtr<IDBCallbacks>);
</span><span class="cx"> void count(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>);
</span><span class="cx"> void deleteRange(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBServerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBServerConnection.h (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBServerConnection.h 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBServerConnection.h 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> virtual void rollbackTransaction(int64_t transactionID, std::function<void()> completionCallback) = 0;
</span><span class="cx"> virtual bool rollbackTransactionSync(int64_t transactionID) = 0;
</span><span class="cx">
</span><del>- virtual void setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const IDBObjectStoreMetadata&, IDBKey& primaryKey, const Vector<int64_t>& indexIDs, const Vector<Vector<RefPtr<IDBKey>>>& indexKeys, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback) = 0;
</del><ins>+ virtual void setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const IDBObjectStoreMetadata&, IDBKey& primaryKey, const Vector<int64_t, 1>& indexIDs, const Vector<Vector<RefPtr<IDBKey>>, 1>& indexKeys, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void createObjectStore(IDBTransactionBackend&, const CreateObjectStoreOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback) = 0;
</span><span class="cx"> virtual void createIndex(IDBTransactionBackend&, const CreateIndexOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> void generateElementAttributeFunctionCallValueMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomicString& expectedValue, AttributeCaseSensitivity valueCaseSensitivity, JSC::FunctionPtr caseSensitiveTest, JSC::FunctionPtr caseInsensitiveTest);
</span><span class="cx"> void generateElementHasTagName(Assembler::JumpList& failureCases, const CSSSelector& tagMatchingSelector);
</span><span class="cx"> void generateElementHasId(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const AtomicString& idToMatch);
</span><del>- void generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*>& classNames);
</del><ins>+ void generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*, 8>& classNames);
</ins><span class="cx"> void generateElementIsLink(Assembler::JumpList& failureCases);
</span><span class="cx"> void generateElementIsNthChild(Assembler::JumpList& failureCases, const SelectorFragment&);
</span><span class="cx"> void generateElementIsNthChildOf(Assembler::JumpList& failureCases, const SelectorFragment&);
</span><span class="lines">@@ -1092,7 +1092,7 @@
</span><span class="cx"> static unsigned minimumRegisterRequirements(const SelectorFragment& selectorFragment)
</span><span class="cx"> {
</span><span class="cx"> unsigned minimum = minimumRequiredRegisterCount;
</span><del>- const Vector<AttributeMatchingInfo>& attributes = selectorFragment.attributes;
</del><ins>+ const auto& attributes = selectorFragment.attributes;
</ins><span class="cx">
</span><span class="cx"> // Attributes cause some register pressure.
</span><span class="cx"> unsigned attributeCount = attributes.size();
</span><span class="lines">@@ -3530,7 +3530,7 @@
</span><span class="cx"> failureCases.append(m_assembler.branchPtr(Assembler::NotEqual, Assembler::Address(elementDataAddress, ElementData::idForStyleResolutionMemoryOffset()), idToMatchRegister));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SelectorCodeGenerator::generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*>& classNames)
</del><ins>+void SelectorCodeGenerator::generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*, 8>& classNames)
</ins><span class="cx"> {
</span><span class="cx"> // Load m_classNames.
</span><span class="cx"> LocalRegister spaceSplitStringData(m_registerAllocator);
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitStackAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/StackAllocator.h (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/StackAllocator.h 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebCore/cssjit/StackAllocator.h 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -100,7 +100,8 @@
</span><span class="cx"> return stackReferences;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- StackReferenceVector push(const Vector<JSC::MacroAssembler::RegisterID>& registerIDs)
</del><ins>+ template<size_t inlineCapacity, typename OverflowHandler>
+ StackReferenceVector push(const Vector<JSC::MacroAssembler::RegisterID, inlineCapacity, OverflowHandler>& registerIDs)
</ins><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(!m_hasFunctionCallPadding);
</span><span class="cx">
</span><span class="lines">@@ -134,7 +135,8 @@
</span><span class="cx"> return StackReference(m_offsetFromTop);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void pop(const StackReferenceVector& stackReferences, const Vector<JSC::MacroAssembler::RegisterID>& registerIDs)
</del><ins>+ template<size_t inlineCapacity, typename OverflowHandler>
+ void pop(const StackReferenceVector& stackReferences, const Vector<JSC::MacroAssembler::RegisterID, inlineCapacity, OverflowHandler>& registerIDs)
</ins><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(!m_hasFunctionCallPadding);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> unsigned& varyingTrackIndex = (m_direction == ForColumns) ? m_rowIndex : m_columnIndex;
</span><span class="cx"> const unsigned endOfVaryingTrackIndex = (m_direction == ForColumns) ? m_grid.size() : m_grid[0].size();
</span><span class="cx"> for (; varyingTrackIndex < endOfVaryingTrackIndex; ++varyingTrackIndex) {
</span><del>- const Vector<RenderBox*>& children = m_grid[m_rowIndex][m_columnIndex];
</del><ins>+ const auto& children = m_grid[m_rowIndex][m_columnIndex];
</ins><span class="cx"> if (m_childIndex < children.size())
</span><span class="cx"> return children[m_childIndex++];
</span><span class="cx">
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> // This adds a O(N^2) behavior that shouldn't be a big deal as we expect spanning areas to be small.
</span><span class="cx"> for (unsigned row = m_rowIndex; row < maxRows; ++row) {
</span><span class="cx"> for (unsigned column = m_columnIndex; column < maxColumns; ++column) {
</span><del>- const Vector<RenderBox*>& children = m_grid[row][column];
</del><ins>+ auto& children = m_grid[row][column];
</ins><span class="cx"> if (!children.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleSVGRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> resources = other->resources;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<PaintType> SVGRenderStyle::paintTypesForPaintOrder() const
</del><ins>+Vector<PaintType, 3> SVGRenderStyle::paintTypesForPaintOrder() const
</ins><span class="cx"> {
</span><span class="cx"> Vector<PaintType, 3> paintOrder;
</span><span class="cx"> switch (this->paintOrder()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleSVGRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/SVGRenderStyle.h (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/SVGRenderStyle.h 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebCore/rendering/style/SVGRenderStyle.h 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx"> String markerEndResource() const { return inheritedResources->markerEnd; }
</span><span class="cx"> EMaskType maskType() const { return (EMaskType) svg_noninherited_flags.f.maskType; }
</span><span class="cx"> PaintOrder paintOrder() const { return (PaintOrder) svg_inherited_flags.paintOrder; }
</span><del>- Vector<PaintType> paintTypesForPaintOrder() const;
</del><ins>+ Vector<PaintType, 3> paintTypesForPaintOrder() const;
</ins><span class="cx">
</span><span class="cx"> const SVGPaint::SVGPaintType& visitedLinkFillPaintType() const { return fill->visitedLinkPaintType; }
</span><span class="cx"> const Color& visitedLinkFillPaintColor() const { return fill->visitedLinkPaintColor; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderSVGShape::fillStrokeMarkers(PaintInfo& childPaintInfo)
</span><span class="cx"> {
</span><del>- Vector<PaintType> paintOrder = style().svgStyle().paintTypesForPaintOrder();
</del><ins>+ auto paintOrder = style().svgStyle().paintTypesForPaintOrder();
</ins><span class="cx"> for (unsigned i = 0; i < paintOrder.size(); ++i) {
</span><span class="cx"> switch (paintOrder.at(i)) {
</span><span class="cx"> case PaintTypeFill:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> if (decorations & TextDecorationOverline)
</span><span class="cx"> paintDecoration(paintInfo.context, TextDecorationOverline, fragment);
</span><span class="cx">
</span><del>- Vector<PaintType> paintOrder = style.svgStyle().paintTypesForPaintOrder();
</del><ins>+ auto paintOrder = style.svgStyle().paintTypesForPaintOrder();
</ins><span class="cx"> for (unsigned i = 0; i < paintOrder.size(); ++i) {
</span><span class="cx"> switch (paintOrder.at(i)) {
</span><span class="cx"> case PaintTypeFill:
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGToOTFFontConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -1300,7 +1300,7 @@
</span><span class="cx"> for (auto codepoint : ligatureCodepoints) {
</span><span class="cx"> auto codepoints = codepointToString(codepoint);
</span><span class="cx"> if (!codepoints.isNull())
</span><del>- m_glyphs.append(GlyphData(Vector<char, 17>(m_emptyGlyphCharString), nullptr, m_unitsPerEm, m_unitsPerEm, FloatRect(), codepoints));
</del><ins>+ m_glyphs.append(GlyphData(Vector<char>(m_emptyGlyphCharString), nullptr, m_unitsPerEm, m_unitsPerEm, FloatRect(), codepoints));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1390,7 +1390,7 @@
</span><span class="cx"> if (m_missingGlyphElement)
</span><span class="cx"> processGlyphElement(*m_missingGlyphElement, nullptr, defaultHorizontalAdvance, defaultVerticalAdvance, String(), initialGlyph);
</span><span class="cx"> else
</span><del>- m_glyphs.append(GlyphData(Vector<char, 17>(m_emptyGlyphCharString), nullptr, m_unitsPerEm, m_unitsPerEm, FloatRect(), String()));
</del><ins>+ m_glyphs.append(GlyphData(Vector<char>(m_emptyGlyphCharString), nullptr, m_unitsPerEm, m_unitsPerEm, FloatRect(), String()));
</ins><span class="cx">
</span><span class="cx"> for (auto& glyphElement : childrenOfType<SVGGlyphElement>(m_fontElement)) {
</span><span class="cx"> auto& unicodeAttribute = glyphElement.fastGetAttribute(SVGNames::unicodeAttr);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-21 Chris Dumez <cdumez@apple.com>
+
+ Make Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&) constructor explicit
+ https://bugs.webkit.org/show_bug.cgi?id=143970
+
+ Reviewed by Darin Adler.
+
+ Make Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&)
+ constructor explicit as it copies the vector and it is easy to call it
+ by mistake.
+
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ (WebKit::WebIDBServerConnection::setIndexKeys):
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
+
</ins><span class="cx"> 2015-04-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Expose more bundle form client functions as WKWebProcessPlugInFormDelegatePrivate methods
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitNotificationProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationProvider.cpp (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationProvider.cpp 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationProvider.cpp 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -89,8 +89,8 @@
</span><span class="cx"> void WebKitNotificationProvider::notificationCloseCallback(WebKitNotification* notification, WebKitNotificationProvider* provider)
</span><span class="cx"> {
</span><span class="cx"> uint64_t notificationID = webkit_notification_get_id(notification);
</span><del>- Vector<RefPtr<API::Object>, 1> arrayIDs;
- arrayIDs.uncheckedAppend(API::UInt64::create(notificationID));
</del><ins>+ Vector<RefPtr<API::Object>> arrayIDs;
+ arrayIDs.append(API::UInt64::create(notificationID));
</ins><span class="cx"> provider->m_notificationManager->providerDidCloseNotifications(API::Array::create(WTF::move(arrayIDs)).get());
</span><span class="cx"> provider->m_notifications.remove(notificationID);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> return success;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const IDBObjectStoreMetadata&, IDBKey& primaryKey, const Vector<int64_t>& indexIDs, const Vector<Vector<RefPtr<IDBKey>>>& indexKeys, std::function<void (PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const IDBObjectStoreMetadata&, IDBKey& primaryKey, const Vector<int64_t, 1>& indexIDs, const Vector<Vector<RefPtr<WebCore::IDBKey>>, 1>& indexKeys, std::function<void (PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h (183064 => 183065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h 2015-04-21 16:16:21 UTC (rev 183064)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h 2015-04-21 16:18:22 UTC (rev 183065)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> virtual void rollbackTransaction(int64_t transactionID, std::function<void ()> completionCallback) override;
</span><span class="cx"> virtual bool rollbackTransactionSync(int64_t transactionID) override;
</span><span class="cx">
</span><del>- virtual void setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const WebCore::IDBObjectStoreMetadata&, WebCore::IDBKey& primaryKey, const Vector<int64_t>& indexIDs, const Vector<Vector<RefPtr<WebCore::IDBKey>>>& indexKeys, std::function<void (PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
</del><ins>+ virtual void setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const WebCore::IDBObjectStoreMetadata&, WebCore::IDBKey& primaryKey, const Vector<int64_t, 1>& indexIDs, const Vector<Vector<RefPtr<WebCore::IDBKey>>, 1>& indexKeys, std::function<void (PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
</ins><span class="cx">
</span><span class="cx"> virtual void createObjectStore(WebCore::IDBTransactionBackend&, const WebCore::CreateObjectStoreOperation&, std::function<void (PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
</span><span class="cx"> virtual void createIndex(WebCore::IDBTransactionBackend&, const WebCore::CreateIndexOperation&, std::function<void (PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
</span></span></pre>
</div>
</div>
</body>
</html>