<!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>[192686] 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/192686">192686</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-11-20 10:55:11 -0800 (Fri, 20 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Get IDBRequest.readyState right.
https://bugs.webkit.org/show_bug.cgi?id=151484
Reviewed by Alex Christensen.
Source/WebCore:
Test: storage/indexeddb/modern/request-readystate.html
* Modules/indexeddb/client/IDBRequestImpl.cpp:
(WebCore::IDBClient::IDBRequest::readyState):
LayoutTests:
* storage/indexeddb/modern/request-readystate-expected.txt: Added.
* storage/indexeddb/modern/request-readystate.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBRequestImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernrequestreadystateexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/request-readystate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernrequestreadystatehtml">trunk/LayoutTests/storage/indexeddb/modern/request-readystate.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192685 => 192686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-20 15:17:36 UTC (rev 192685)
+++ trunk/LayoutTests/ChangeLog 2015-11-20 18:55:11 UTC (rev 192686)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-11-20 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Get IDBRequest.readyState right.
+ https://bugs.webkit.org/show_bug.cgi?id=151484
+
+ Reviewed by Alex Christensen.
+
+ * storage/indexeddb/modern/request-readystate-expected.txt: Added.
+ * storage/indexeddb/modern/request-readystate.html: Added.
+
</ins><span class="cx"> 2015-11-20 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Changing some imported/w3c/web-platform-tests/html/semantics expectations from Timeout/Failure to Pass
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernrequestreadystateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/request-readystate-expected.txt (0 => 192686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/request-readystate-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/request-readystate-expected.txt 2015-11-20 18:55:11 UTC (rev 192686)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This test makes sure that IDBRequest.readyState returns expected values.
+After calling indexedDB.open(), create request readyState is: pending
+Initial upgrade needed: Old version - 0 New version - 1
+Create request readyState is: done
+After calling openCursor, request readyState is: pending
+After successful opening of the cursor, request readyState is: done
+After calling continue(), request readyState is: pending
+After continue() completed, request readyState is: done
+Initial upgrade versionchange transaction complete
+Done
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernrequestreadystatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/request-readystate.html (0 => 192686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/request-readystate.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/request-readystate.html 2015-11-20 18:55:11 UTC (rev 192686)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+This test makes sure that IDBRequest.readyState returns expected values.<br>
+<div id="logger"></div>
+<script>
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ log("Done");
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+function log(message)
+{
+ document.getElementById("logger").innerHTML += message + "<br>";
+}
+
+var createRequest = window.indexedDB.open("RequestReadyStateDatabase", 1);
+log("After calling indexedDB.open(), create request readyState is: " + createRequest.readyState);
+
+createRequest.onupgradeneeded = function(event) {
+ log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+ log("Create request readyState is: " + createRequest.readyState);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+
+ for (var i = 0; i < 2; ++i)
+ objectStore.put("Record " + i, i);
+
+ var request = objectStore.openCursor();
+ log("After calling openCursor, request readyState is: " + request.readyState);
+ request.onsuccess = function() {
+ log("After successful opening of the cursor, request readyState is: " + request.readyState);
+
+ request.onsuccess = function() {
+ log("After continue() completed, request readyState is: " + request.readyState);
+ }
+
+ request.result.continue();
+ log("After calling continue(), request readyState is: " + request.readyState);
+ }
+
+ versionTransaction.onabort = function(event) {
+ log("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ log("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ log("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192685 => 192686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-20 15:17:36 UTC (rev 192685)
+++ trunk/Source/WebCore/ChangeLog 2015-11-20 18:55:11 UTC (rev 192686)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-20 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Get IDBRequest.readyState right.
+ https://bugs.webkit.org/show_bug.cgi?id=151484
+
+ Reviewed by Alex Christensen.
+
+ Test: storage/indexeddb/modern/request-readystate.html
+
+ * Modules/indexeddb/client/IDBRequestImpl.cpp:
+ (WebCore::IDBClient::IDBRequest::readyState):
+
</ins><span class="cx"> 2015-11-20 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Use HTTPHeaderName as much as possible in XMLHttpRequest
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp (192685 => 192686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp 2015-11-20 15:17:36 UTC (rev 192685)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp 2015-11-20 18:55:11 UTC (rev 192686)
</span><span class="lines">@@ -150,8 +150,17 @@
</span><span class="cx">
</span><span class="cx"> const String& IDBRequest::readyState() const
</span><span class="cx"> {
</span><del>- static WTF::NeverDestroyed<String> readyState;
- return readyState;
</del><ins>+ static WTF::NeverDestroyed<String> pendingString("pending");
+ static WTF::NeverDestroyed<String> doneString("done");
+
+ switch (m_readyState) {
+ case IDBRequestReadyState::Pending:
+ return pendingString;
+ case IDBRequestReadyState::Done:
+ return doneString;
+ default:
+ RELEASE_ASSERT_NOT_REACHED();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t IDBRequest::sourceObjectStoreIdentifier() const
</span></span></pre>
</div>
</div>
</body>
</html>