<!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>[238112] 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/238112">238112</a></dd>
<dt>Author</dt> <dd>sihui_liu@apple.com</dd>
<dt>Date</dt> <dd>2018-11-12 15:34:29 -0800 (Mon, 12 Nov 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>imported/w3c/web-platform-tests/IndexedDB/keygenerator-explicit.html crashing on iOS device
https://bugs.webkit.org/show_bug.cgi?id=191500

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

* web-platform-tests/IndexedDB/keygenerator-explicit-expected.txt:

Source/WebCore:

When double value is bigger than maximum unsigned int, converting double to unsigned int has
different behaviors on macOS and iOS. On macOS, the result would be 0 while on iOS it would be
maximum unsigned int.

Covered by existing test.

* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
(WebCore::IDBServer::SQLiteIDBBackingStore::generateKeyNumber):
(WebCore::IDBServer::SQLiteIDBBackingStore::maybeUpdateKeyGeneratorNumber):

LayoutTests:

The test should not crash now.

* platform/ios-device/TestExpectations:</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="#trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBkeygeneratorexplicitexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/keygenerator-explicit-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiosdeviceTestExpectations">trunk/LayoutTests/platform/ios-device/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (238111 => 238112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2018-11-12 23:18:44 UTC (rev 238111)
+++ trunk/LayoutTests/ChangeLog 2018-11-12 23:34:29 UTC (rev 238112)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2018-11-12  Sihui Liu  <sihui_liu@apple.com>
+
+        imported/w3c/web-platform-tests/IndexedDB/keygenerator-explicit.html crashing on iOS device
+        https://bugs.webkit.org/show_bug.cgi?id=191500
+
+        Reviewed by Dean Jackson.
+
+        The test should not crash now.
+
+        * platform/ios-device/TestExpectations:
+
</ins><span class="cx"> 2018-11-12  Tim Horton  <timothy_horton@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Make it possible to edit images inline
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (238111 => 238112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2018-11-12 23:18:44 UTC (rev 238111)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2018-11-12 23:34:29 UTC (rev 238112)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2018-11-12  Sihui Liu  <sihui_liu@apple.com>
+
+        imported/w3c/web-platform-tests/IndexedDB/keygenerator-explicit.html crashing on iOS device
+        https://bugs.webkit.org/show_bug.cgi?id=191500
+
+        Reviewed by Dean Jackson.
+
+        * web-platform-tests/IndexedDB/keygenerator-explicit-expected.txt:
+
</ins><span class="cx"> 2018-11-12  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Support setting stream ids when adding a transceiver
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBkeygeneratorexplicitexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/keygenerator-explicit-expected.txt (238111 => 238112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/keygenerator-explicit-expected.txt   2018-11-12 23:18:44 UTC (rev 238111)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/keygenerator-explicit-expected.txt      2018-11-12 23:34:29 UTC (rev 238112)
</span><span class="lines">@@ -2,12 +2,12 @@
</span><span class="cx"> PASS Key generator vs. explicit key 53 bits 
</span><span class="cx"> PASS Key generator vs. explicit key greater than 53 bits, less than 64 bits 
</span><span class="cx"> PASS Key generator vs. explicit key greater than 53 bits, less than 64 bits (negative) 
</span><del>-FAIL Key generator vs. explicit key 63 bits assert_unreached: put should succeed Reached unreachable code
</del><ins>+PASS Key generator vs. explicit key 63 bits 
</ins><span class="cx"> PASS Key generator vs. explicit key 63 bits (negative) 
</span><del>-FAIL Key generator vs. explicit key 64 bits assert_unreached: put should fail Reached unreachable code
</del><ins>+PASS Key generator vs. explicit key 64 bits 
</ins><span class="cx"> PASS Key generator vs. explicit key 64 bits (negative) 
</span><del>-FAIL Key generator vs. explicit key greater than 64 bits, but still finite assert_unreached: put should fail Reached unreachable code
</del><ins>+PASS Key generator vs. explicit key greater than 64 bits, but still finite 
</ins><span class="cx"> PASS Key generator vs. explicit key greater than 64 bits, but still finite (negative) 
</span><del>-FAIL Key generator vs. explicit key equal to Infinity assert_unreached: put should fail Reached unreachable code
</del><ins>+PASS Key generator vs. explicit key equal to Infinity 
</ins><span class="cx"> PASS Key generator vs. explicit key equal to -Infinity 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiosdeviceTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-device/TestExpectations (238111 => 238112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-device/TestExpectations   2018-11-12 23:18:44 UTC (rev 238111)
+++ trunk/LayoutTests/platform/ios-device/TestExpectations      2018-11-12 23:34:29 UTC (rev 238112)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> imported/blink/storage/indexeddb/blob-delete-objectstore-db.html [ Failure ]
</span><span class="cx"> imported/blink/storage/indexeddb/blob-valid-after-deletion.html [ Failure ]
</span><span class="cx"> imported/blink/storage/indexeddb/blob-valid-before-commit.html [ Failure ]
</span><del>-imported/w3c/web-platform-tests/IndexedDB/keygenerator-explicit.html [ Failure ]
</del><span class="cx"> imported/w3c/web-platform-tests/IndexedDB/keypath-special-identifiers.htm [ Failure ]
</span><span class="cx"> imported/w3c/web-platform-tests/cssom-view/Screen-pixelDepth-Screen-colorDepth001.html [ Failure ]
</span><span class="cx"> imported/w3c/web-platform-tests/cssom-view/scrolling-quirks-vs-nonquirks.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (238111 => 238112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-11-12 23:18:44 UTC (rev 238111)
+++ trunk/Source/WebCore/ChangeLog      2018-11-12 23:34:29 UTC (rev 238112)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2018-11-12  Sihui Liu  <sihui_liu@apple.com>
+
+        imported/w3c/web-platform-tests/IndexedDB/keygenerator-explicit.html crashing on iOS device
+        https://bugs.webkit.org/show_bug.cgi?id=191500
+
+        Reviewed by Dean Jackson.
+
+        When double value is bigger than maximum unsigned int, converting double to unsigned int has
+        different behaviors on macOS and iOS. On macOS, the result would be 0 while on iOS it would be
+        maximum unsigned int.
+
+        Covered by existing test.
+
+        * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+        (WebCore::IDBServer::SQLiteIDBBackingStore::generateKeyNumber):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::maybeUpdateKeyGeneratorNumber):
+
</ins><span class="cx"> 2018-11-12  Basuke Suzuki  <basuke.suzuki@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [Curl] Add API Test for Curl cookie backend.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (238111 => 238112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp  2018-11-12 23:18:44 UTC (rev 238111)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp     2018-11-12 23:34:29 UTC (rev 238112)
</span><span class="lines">@@ -63,6 +63,9 @@
</span><span class="cx"> // Current version of the metadata schema being used in the metadata database.
</span><span class="cx"> static const int currentMetadataVersion = 1;
</span><span class="cx"> 
</span><ins>+// The IndexedDatabase spec defines the max key generator value as 2^53.
+static const uint64_t maxGeneratorValue = 0x20000000000000;
+
</ins><span class="cx"> static int idbKeyCollate(int aLength, const void* aBuffer, int bLength, const void* bBuffer)
</span><span class="cx"> {
</span><span class="cx">     IDBKeyData a, b;
</span><span class="lines">@@ -2399,9 +2402,6 @@
</span><span class="cx">     ASSERT(m_sqliteDB);
</span><span class="cx">     ASSERT(m_sqliteDB->isOpen());
</span><span class="cx"> 
</span><del>-    // The IndexedDatabase spec defines the max key generator value as 2^53;
-    static uint64_t maxGeneratorValue = 0x20000000000000;
-
</del><span class="cx">     auto* transaction = m_transactions.get(transactionIdentifier);
</span><span class="cx">     if (!transaction || !transaction->inProgress()) {
</span><span class="cx">         LOG_ERROR("Attempt to generate key in database without an in-progress transaction");
</span><span class="lines">@@ -2470,13 +2470,7 @@
</span><span class="cx">     if (newKeyNumber <= currentValue)
</span><span class="cx">         return IDBError { };
</span><span class="cx"> 
</span><del>-    uint64_t newKeyInteger(newKeyNumber);
-    if (newKeyInteger <= uint64_t(newKeyNumber))
-        ++newKeyInteger;
-
-    ASSERT(newKeyInteger > uint64_t(newKeyNumber));
-
-    return uncheckedSetKeyGeneratorValue(objectStoreID, newKeyInteger - 1);
</del><ins>+    return uncheckedSetKeyGeneratorValue(objectStoreID, std::min(newKeyNumber, (double)maxGeneratorValue));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> IDBError SQLiteIDBBackingStore::openCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBCursorInfo& info, IDBGetResult& result)
</span></span></pre>
</div>
</div>

</body>
</html>