<!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>[196025] 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/196025">196025</a></dd>

<dt>Author</dt> <dd>beidson@apple.com</dd>

<dt>Date</dt> <dd>2016-02-02 12:51:46 -0800 (Tue, 02 Feb 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Modern IDB: storage/indexeddb/cursor-continue-validity.html fails.

https://bugs.webkit.org/show_bug.cgi?id=153791

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (Existing test now unskipped).

There was a preexisting check in the SQLite cursor for remembering the current record and

refusing to refetch it.

This check was causing this bug, because we needed to refetch the current record.

Removing the check (and its associated flag) doesn't regress any other test, and fixes this one.

* Modules/indexeddb/server/SQLiteIDBCursor.cpp:

(WebCore::IDBServer::SQLiteIDBCursor::resetAndRebindStatement):

(WebCore::IDBServer::SQLiteIDBCursor::internalAdvanceOnce):

* Modules/indexeddb/server/SQLiteIDBCursor.h:

LayoutTests:

In addition to unskipping the test, I augmented it to print out more of what was going on.

The additional printed info is what helped me track down the bug, and will make it more

likely to catch any future regressions.

* platform/mac-wk1/TestExpectations:

* storage/indexeddb/cursor-continue-validity-expected.txt:

* storage/indexeddb/cursor-continue-validity-private-expected.txt:

* storage/indexeddb/resources/cursor-continue-validity.js:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>

<li><a href="#trunkLayoutTestsstorageindexeddbcursorcontinuevalidityexpectedtxt">trunk/LayoutTests/storage/indexeddb/cursor-continue-validity-expected.txt</a></li>

<li><a href="#trunkLayoutTestsstorageindexeddbcursorcontinuevalidityprivateexpectedtxt">trunk/LayoutTests/storage/indexeddb/cursor-continue-validity-private-expected.txt</a></li>

<li><a href="#trunkLayoutTestsstorageindexeddbresourcescursorcontinuevalidityjs">trunk/LayoutTests/storage/indexeddb/resources/cursor-continue-validity.js</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorcpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorh">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196024 => 196025)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2016-02-02 19:50:01 UTC (rev 196024)

+++ trunk/LayoutTests/ChangeLog        2016-02-02 20:51:46 UTC (rev 196025)

</span><span class="lines">@@ -1,3 +1,20 @@

</span><ins>+2016-02-02  Brady Eidson  &lt;beidson@apple.com&gt;

+

+        Modern IDB: storage/indexeddb/cursor-continue-validity.html fails.

+        https://bugs.webkit.org/show_bug.cgi?id=153791

+

+        Reviewed by Alex Christensen.

+

+        In addition to unskipping the test, I augmented it to print out more of what was going on.

+        

+        The additional printed info is what helped me track down the bug, and will make it more

+        likely to catch any future regressions.

+        

+        * platform/mac-wk1/TestExpectations:

+        * storage/indexeddb/cursor-continue-validity-expected.txt:

+        * storage/indexeddb/cursor-continue-validity-private-expected.txt:

+        * storage/indexeddb/resources/cursor-continue-validity.js:

+

</ins><span class="cx"> 2016-02-01  Dave Hyatt  &lt;hyatt@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Add a line grid pagination SPI to WebKit.

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (196024 => 196025)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2016-02-02 19:50:01 UTC (rev 196024)

+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2016-02-02 20:51:46 UTC (rev 196025)

</span><span class="lines">@@ -256,9 +256,6 @@

</span><span class="cx"> # Completes successfully after ~40 seconds in a debug build with logging

</span><span class="cx"> imported/w3c/indexeddb/idbindex-multientry-big.htm [ Failure ]

</span><span class="cx"> 

</span><del>-# Cursor iterates one less time than expected

-storage/indexeddb/cursor-continue-validity.html [ Failure ]

-

</del><span class="cx"> # Integer part of the test iterates 0, 1, 2, Inf, -1, -2, -Inf - Should be in order from -Inf to Inf.

</span><span class="cx"> storage/indexeddb/cursor-primary-key-order.html [ Failure ]

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkLayoutTestsstorageindexeddbcursorcontinuevalidityexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/cursor-continue-validity-expected.txt (196024 => 196025)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/storage/indexeddb/cursor-continue-validity-expected.txt        2016-02-02 19:50:01 UTC (rev 196024)

+++ trunk/LayoutTests/storage/indexeddb/cursor-continue-validity-expected.txt        2016-02-02 20:51:46 UTC (rev 196025)

</span><span class="lines">@@ -783,151 +783,433 @@

</span><span class="cx"> indexObject.openCursor(null, 'next')

</span><span class="cx"> self.continueValue = 0

</span><span class="cx"> cursor = event.target.result

</span><ins>+

+Index key is: 0

+Primary key is: 0

+Value.x is: 0

+Continue value: 1

</ins><span class="cx"> cursor.continue()

</span><span class="cx"> cursor = event.target.result

</span><ins>+

+Index key is: 1

+Primary key is: 1

+Value.x is: 1

+Continue value: 2

+New Index key for primary key 1 is 102

</ins><span class="cx"> cursor.update({ x: 100 + self.continueValue })

</span><span class="cx"> cursor.continue()

</span><span class="cx"> cursor = event.target.result

</span><ins>+

+Index key is: 2

+Primary key is: 2

+Value.x is: 2

+Continue value: 3

+Deleting primary key 2 which currently has Index key 2

</ins><span class="cx"> cursor.delete()

</span><span class="cx"> cursor.continue()

</span><span class="cx"> cursor = event.target.result

</span><ins>+

+Index key is: 3

+Primary key is: 3

+Value.x is: 3

+Continue value: 4

+New Index key for primary key 3 is 104

</ins><span class="cx"> cursor.update({ x: 100 + self.continueValue })

</span><span class="cx"> cursor.continue()

</span><span class="cx"> cursor = event.target.result

</span><ins>+

+Index key is: 4

+Primary key is: 4

+Value.x is: 4

+Continue value: 5

</ins><span class="cx"> cursor.continue()

</span><ins>+Expecting exception setting new Index key for primary key 4 to 105

</ins><span class="cx"> Expecting exception from cursor.update({ x: 100 + self.continueValue})