<!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>[194864] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194864">194864</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-11 13:37:35 -0800 (Mon, 11 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>LayoutTests/imported/w3c:
Modern IDB: IDBBindingUtilities chokes on unicode strings for get/set.
https://bugs.webkit.org/show_bug.cgi?id=152921
Reviewed by Alex Christensen.
* indexeddb/keygenerator-overflow-expected.txt:
Source/WebCore:
Modern IDB: storage/indexeddb/key-generator.html fails.
https://bugs.webkit.org/show_bug.cgi?id=152981
Reviewed by Alex Christensen.
No new tests (One failing test now passes, and one test's results get a progression).
* Modules/indexeddb/server/IDBBackingStore.h:
* Modules/indexeddb/server/MemoryIDBBackingStore.cpp:
(WebCore::IDBServer::MemoryIDBBackingStore::generateKeyNumber): Throw an error if the current
value is already over 2^53.
(WebCore::IDBServer::MemoryIDBBackingStore::revertGeneratedKeyNumber):
(WebCore::IDBServer::MemoryIDBBackingStore::maybeUpdateKeyGeneratorNumber): Handle double -> uint64_t
conversions properly when calculating the next key.
* Modules/indexeddb/server/MemoryIDBBackingStore.h:
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::ScopeGuard::ScopeGuard): Add this utility class to call a function
any time it goes out of scope.
(WebCore::IDBServer::ScopeGuard::~ScopeGuard):
(WebCore::IDBServer::ScopeGuard::enable):
(WebCore::IDBServer::ScopeGuard::disable):
(WebCore::IDBServer::UniqueIDBDatabase::performPutOrAdd): Revert the key generator value if
the put/add operation ends in error.
LayoutTests:
Modern IDB: storage/indexeddb/key-generator.html fails.
https://bugs.webkit.org/show_bug.cgi?id=152981
Reviewed by Alex Christensen.
* platform/mac-wk1/TestExpectations:
* platform/wk2/imported/w3c/indexeddb/keygenerator-overflow-expected.txt: Copied from LayoutTests/imported/w3c/indexeddb/keygenerator-overflow-expected.txt.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cindexeddbkeygeneratoroverflowexpectedtxt">trunk/LayoutTests/imported/w3c/indexeddb/keygenerator-overflow-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBBackingStoreh">trunk/Source/WebCore/Modules/indexeddb/server/IDBBackingStore.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryIDBBackingStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryIDBBackingStoreh">trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformwk2importedw3cindexeddbkeygeneratoroverflowexpectedtxt">trunk/LayoutTests/platform/wk2/imported/w3c/indexeddb/keygenerator-overflow-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194863 => 194864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-11 21:31:04 UTC (rev 194863)
+++ trunk/LayoutTests/ChangeLog 2016-01-11 21:37:35 UTC (rev 194864)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-01-11 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: storage/indexeddb/key-generator.html fails.
+ https://bugs.webkit.org/show_bug.cgi?id=152981
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations:
+ * platform/wk2/imported/w3c/indexeddb/keygenerator-overflow-expected.txt: Copied from LayoutTests/imported/w3c/indexeddb/keygenerator-overflow-expected.txt.
+
+2016-01-11 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: storage/indexeddb/lazy-index-population.html fails.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152976
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (194863 => 194864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-01-11 21:31:04 UTC (rev 194863)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-01-11 21:37:35 UTC (rev 194864)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-01-11 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: IDBBindingUtilities chokes on unicode strings for get/set.
+ https://bugs.webkit.org/show_bug.cgi?id=152921
+
+ Reviewed by Alex Christensen.
+
+ * indexeddb/keygenerator-overflow-expected.txt:
+
</ins><span class="cx"> 2016-01-08 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: IDBBindingUtilities chokes on unicode strings for get/set.
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cindexeddbkeygeneratoroverflowexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/indexeddb/keygenerator-overflow-expected.txt (194863 => 194864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/indexeddb/keygenerator-overflow-expected.txt 2016-01-11 21:31:04 UTC (rev 194863)
+++ trunk/LayoutTests/imported/w3c/indexeddb/keygenerator-overflow-expected.txt 2016-01-11 21:37:35 UTC (rev 194864)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><span class="cx">
</span><del>-FAIL Keygenerator overflow assert_unreached: When "current number" overflows, error event is expected Reached unreachable code
</del><ins>+PASS Keygenerator overflow
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (194863 => 194864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-11 21:31:04 UTC (rev 194863)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-11 21:37:35 UTC (rev 194864)
</span><span class="lines">@@ -76,9 +76,6 @@
</span><span class="cx"> imported/w3c/indexeddb/idbindex_openCursor2.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbindex_openKeyCursor3.htm [ Failure ]
</span><span class="cx">
</span><del>-# Modern IDB doesn't properly handle 2^53 as a key generator value
-storage/indexeddb/key-generator.html [ Skip ]
-
</del><span class="cx"> # Crashes with GuardMalloc or ASan
</span><span class="cx"> storage/indexeddb/index-multientry.html [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2importedw3cindexeddbkeygeneratoroverflowexpectedtxtfromrev194863trunkLayoutTestsimportedw3cindexeddbkeygeneratoroverflowexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/wk2/imported/w3c/indexeddb/keygenerator-overflow-expected.txt (from rev 194863, trunk/LayoutTests/imported/w3c/indexeddb/keygenerator-overflow-expected.txt) (0 => 194864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/imported/w3c/indexeddb/keygenerator-overflow-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/wk2/imported/w3c/indexeddb/keygenerator-overflow-expected.txt 2016-01-11 21:37:35 UTC (rev 194864)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+FAIL Keygenerator overflow assert_unreached: When "current number" overflows, error event is expected Reached unreachable code
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194863 => 194864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-11 21:31:04 UTC (rev 194863)
+++ trunk/Source/WebCore/ChangeLog 2016-01-11 21:37:35 UTC (rev 194864)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2016-01-11 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: storage/indexeddb/key-generator.html fails.
+ https://bugs.webkit.org/show_bug.cgi?id=152981
+
+ Reviewed by Alex Christensen.
+
+ No new tests (One failing test now passes, and one test's results get a progression).
+
+ * Modules/indexeddb/server/IDBBackingStore.h:
+
+ * Modules/indexeddb/server/MemoryIDBBackingStore.cpp:
+ (WebCore::IDBServer::MemoryIDBBackingStore::generateKeyNumber): Throw an error if the current
+ value is already over 2^53.
+ (WebCore::IDBServer::MemoryIDBBackingStore::revertGeneratedKeyNumber):
+ (WebCore::IDBServer::MemoryIDBBackingStore::maybeUpdateKeyGeneratorNumber): Handle double -> uint64_t
+ conversions properly when calculating the next key.
+ * Modules/indexeddb/server/MemoryIDBBackingStore.h:
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::ScopeGuard::ScopeGuard): Add this utility class to call a function
+ any time it goes out of scope.
+ (WebCore::IDBServer::ScopeGuard::~ScopeGuard):
+ (WebCore::IDBServer::ScopeGuard::enable):
+ (WebCore::IDBServer::ScopeGuard::disable):
+ (WebCore::IDBServer::UniqueIDBDatabase::performPutOrAdd): Revert the key generator value if
+ the put/add operation ends in error.
+
+2016-01-11 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: storage/indexeddb/lazy-index-population.html fails.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152976
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBBackingStore.h (194863 => 194864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBBackingStore.h 2016-01-11 21:31:04 UTC (rev 194863)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBBackingStore.h 2016-01-11 21:37:35 UTC (rev 194864)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> virtual IDBError getIndexRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, IndexedDB::IndexRecordType, const IDBKeyRangeData&, IDBGetResult& outValue) = 0;
</span><span class="cx"> virtual IDBError getCount(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const IDBKeyRangeData&, uint64_t& outCount) = 0;
</span><span class="cx"> virtual IDBError generateKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t& keyNumber) = 0;
</span><ins>+ virtual IDBError revertGeneratedKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t keyNumber) = 0;
</ins><span class="cx"> virtual IDBError maybeUpdateKeyGeneratorNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, double newKeyNumber) = 0;
</span><span class="cx"> virtual IDBError openCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBCursorInfo&, IDBGetResult& outResult) = 0;
</span><span class="cx"> virtual IDBError iterateCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBResourceIdentifier& cursorIdentifier, const IDBKeyData&, uint32_t count, IDBGetResult& outResult) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp (194863 => 194864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp 2016-01-11 21:31:04 UTC (rev 194863)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp 2016-01-11 21:37:35 UTC (rev 194864)
</span><span class="lines">@@ -38,6 +38,9 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace IDBServer {
</span><span class="cx">
</span><ins>+// The IndexedDB spec states the value you can get from the key generator is 2^53
+static uint64_t maxGeneratedKeyValue = 0x20000000000000;
+
</ins><span class="cx"> std::unique_ptr<MemoryIDBBackingStore> MemoryIDBBackingStore::create(const IDBDatabaseIdentifier& identifier)
</span><span class="cx"> {
</span><span class="cx"> return std::make_unique<MemoryIDBBackingStore>(identifier);
</span><span class="lines">@@ -343,11 +346,29 @@
</span><span class="cx"> RELEASE_ASSERT(objectStore);
</span><span class="cx">
</span><span class="cx"> keyNumber = objectStore->currentKeyGeneratorValue();
</span><ins>+ if (keyNumber > maxGeneratedKeyValue)
+ return { IDBDatabaseException::ConstraintError, "Cannot generate new key value over 2^53 for object store operation" };
+
</ins><span class="cx"> objectStore->setKeyGeneratorValue(keyNumber + 1);
</span><span class="cx">
</span><span class="cx"> return IDBError();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+IDBError MemoryIDBBackingStore::revertGeneratedKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t keyNumber)
+{
+ LOG(IndexedDB, "MemoryIDBBackingStore::revertGeneratedKeyNumber");
+ ASSERT(objectStoreIdentifier);
+ ASSERT_UNUSED(transactionIdentifier, m_transactions.contains(transactionIdentifier));
+ ASSERT_UNUSED(transactionIdentifier, m_transactions.get(transactionIdentifier)->isWriting());
+
+ MemoryObjectStore* objectStore = m_objectStoresByIdentifier.get(objectStoreIdentifier);
+ RELEASE_ASSERT(objectStore);
+
+ objectStore->setKeyGeneratorValue(keyNumber);
+
+ return { };
+}
+
</ins><span class="cx"> IDBError MemoryIDBBackingStore::maybeUpdateKeyGeneratorNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, double newKeyNumber)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "MemoryIDBBackingStore::maybeUpdateKeyGeneratorNumber");
</span><span class="lines">@@ -362,10 +383,10 @@
</span><span class="cx"> return { };
</span><span class="cx">
</span><span class="cx"> uint64_t newKeyInteger(newKeyNumber);
</span><del>- if (newKeyInteger <= newKeyNumber)
</del><ins>+ if (newKeyInteger <= uint64_t(newKeyNumber))
</ins><span class="cx"> ++newKeyInteger;
</span><span class="cx">
</span><del>- ASSERT(newKeyInteger > newKeyNumber);
</del><ins>+ ASSERT(newKeyInteger > uint64_t(newKeyNumber));
</ins><span class="cx">
</span><span class="cx"> objectStore->setKeyGeneratorValue(newKeyInteger);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryIDBBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.h (194863 => 194864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.h 2016-01-11 21:31:04 UTC (rev 194863)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.h 2016-01-11 21:37:35 UTC (rev 194864)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> virtual IDBError getIndexRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, IndexedDB::IndexRecordType, const IDBKeyRangeData&, IDBGetResult& outValue) override final;
</span><span class="cx"> virtual IDBError getCount(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const IDBKeyRangeData&, uint64_t& outCount) override final;
</span><span class="cx"> virtual IDBError generateKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t& keyNumber) override final;
</span><ins>+ virtual IDBError revertGeneratedKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t keyNumber) override final;
</ins><span class="cx"> virtual IDBError maybeUpdateKeyGeneratorNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, double newKeyNumber) override final;
</span><span class="cx"> virtual IDBError openCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBCursorInfo&, IDBGetResult& outResult) override final;
</span><span class="cx"> virtual IDBError iterateCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBResourceIdentifier& cursorIdentifier, const IDBKeyData&, uint32_t count, IDBGetResult& outResult) override final;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (194863 => 194864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-01-11 21:31:04 UTC (rev 194863)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-01-11 21:37:35 UTC (rev 194864)
</span><span class="lines">@@ -653,6 +653,37 @@
</span><span class="cx"> return *globalObject.get()->globalExec();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class ScopeGuard {
+public:
+ ScopeGuard()
+ {
+ }
+
+ ScopeGuard(std::function<void()> function)
+ : m_function(WTFMove(function))
+ {
+ }
+
+ ~ScopeGuard()
+ {
+ if (m_function)
+ m_function();
+ }
+
+ void enable(std::function<void()> function)
+ {
+ m_function = WTFMove(function);
+ }
+
+ void disable()
+ {
+ m_function = nullptr;
+ }
+
+private:
+ std::function<void()> m_function { nullptr };
+};
+
</ins><span class="cx"> void UniqueIDBDatabase::performPutOrAdd(uint64_t callbackIdentifier, const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData& keyData, const ThreadSafeDataBuffer& originalRecordValue, IndexedDB::ObjectStoreOverwriteMode overwriteMode)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><span class="lines">@@ -672,6 +703,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool usedKeyIsGenerated = false;
</span><ins>+ ScopeGuard generatedKeyResetter;
</ins><span class="cx"> if (objectStoreInfo->autoIncrement() && !keyData.isValid()) {
</span><span class="cx"> uint64_t keyNumber;
</span><span class="cx"> error = m_backingStore->generateKeyNumber(transactionIdentifier, objectStoreIdentifier, keyNumber);
</span><span class="lines">@@ -682,6 +714,9 @@
</span><span class="cx">
</span><span class="cx"> usedKey.setNumberValue(keyNumber);
</span><span class="cx"> usedKeyIsGenerated = true;
</span><ins>+ generatedKeyResetter.enable([this, transactionIdentifier, objectStoreIdentifier, keyNumber]() {
+ m_backingStore->revertGeneratedKeyNumber(transactionIdentifier, objectStoreIdentifier, keyNumber);
+ });
</ins><span class="cx"> } else
</span><span class="cx"> usedKey = keyData;
</span><span class="cx">
</span><span class="lines">@@ -743,6 +778,7 @@
</span><span class="cx"> if (overwriteMode != IndexedDB::ObjectStoreOverwriteMode::OverwriteForCursor && objectStoreInfo->autoIncrement() && keyData.type() == IndexedDB::KeyType::Number)
</span><span class="cx"> error = m_backingStore->maybeUpdateKeyGeneratorNumber(transactionIdentifier, objectStoreIdentifier, keyData.number());
</span><span class="cx">
</span><ins>+ generatedKeyResetter.disable();
</ins><span class="cx"> m_server.postDatabaseTaskReply(createCrossThreadTask(*this, &UniqueIDBDatabase::didPerformPutOrAdd, callbackIdentifier, error, usedKey));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>