<!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>[207832] trunk/Source/WebCore</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/207832">207832</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-25 12:17:38 -0700 (Tue, 25 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>IDBObjectStore.createIndex() should take a union in parameter
https://bugs.webkit.org/show_bug.cgi?id=163935
Reviewed by Darin Adler.
IDBObjectStore.createIndex() should take a union in parameter:
- https://www.w3.org/TR/IndexedDB/#idl-def-IDBObjectStore
No new tests, no expected Web-exposed behavior change.
* Modules/indexeddb/IDBDatabase.cpp:
(WebCore::IDBDatabase::createObjectStore):
* Modules/indexeddb/IDBKeyPath.cpp:
(WebCore::isIDBKeyPathValid):
(WebCore::IDBKeyPath::isValid): Deleted.
* Modules/indexeddb/IDBKeyPath.h:
(WebCore::IDBKeyPath::isNull):
* Modules/indexeddb/IDBObjectStore.cpp:
(WebCore::IDBObjectStore::createIndex):
* Modules/indexeddb/IDBObjectStore.h:
* Modules/indexeddb/IDBObjectStore.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyPathh">trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp">trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBObjectStoreh">trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBObjectStoreidl">trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207831 => 207832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-25 19:14:55 UTC (rev 207831)
+++ trunk/Source/WebCore/ChangeLog 2016-10-25 19:17:38 UTC (rev 207832)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-10-25 Chris Dumez <cdumez@apple.com>
+
+ IDBObjectStore.createIndex() should take a union in parameter
+ https://bugs.webkit.org/show_bug.cgi?id=163935
+
+ Reviewed by Darin Adler.
+
+ IDBObjectStore.createIndex() should take a union in parameter:
+ - https://www.w3.org/TR/IndexedDB/#idl-def-IDBObjectStore
+
+ No new tests, no expected Web-exposed behavior change.
+
+ * Modules/indexeddb/IDBDatabase.cpp:
+ (WebCore::IDBDatabase::createObjectStore):
+ * Modules/indexeddb/IDBKeyPath.cpp:
+ (WebCore::isIDBKeyPathValid):
+ (WebCore::IDBKeyPath::isValid): Deleted.
+ * Modules/indexeddb/IDBKeyPath.h:
+ (WebCore::IDBKeyPath::isNull):
+ * Modules/indexeddb/IDBObjectStore.cpp:
+ (WebCore::IDBObjectStore::createIndex):
+ * Modules/indexeddb/IDBObjectStore.h:
+ * Modules/indexeddb/IDBObjectStore.idl:
+
</ins><span class="cx"> 2016-10-24 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebIDL] Move more types over to the new JSConverter based toJS functions
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (207831 => 207832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-10-25 19:14:55 UTC (rev 207831)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-10-25 19:17:38 UTC (rev 207832)
</span><span class="lines">@@ -146,15 +146,15 @@
</span><span class="cx"> if (m_info.hasObjectStore(name))
</span><span class="cx"> return Exception { IDBDatabaseException::ConstraintError, ASCIILiteral("Failed to execute 'createObjectStore' on 'IDBDatabase': An object store with the specified name already exists.") };
</span><span class="cx">
</span><del>- IDBKeyPath keyPath(WTFMove(parameters.keyPath));
- if (!keyPath.isNull() && !keyPath.isValid())
</del><ins>+ auto& keyPath = parameters.keyPath;
+ if (keyPath && !isIDBKeyPathValid(keyPath.value()))
</ins><span class="cx"> return Exception { IDBDatabaseException::SyntaxError, ASCIILiteral("Failed to execute 'createObjectStore' on 'IDBDatabase': The keyPath option is not a valid key path.") };
</span><span class="cx">
</span><del>- if (parameters.autoIncrement && ((keyPath.type() == IDBKeyPath::Type::String && keyPath.string().isEmpty()) || keyPath.type() == IDBKeyPath::Type::Array))
</del><ins>+ if (keyPath && parameters.autoIncrement && ((WTF::holds_alternative<String>(keyPath.value()) && WTF::get<String>(keyPath.value()).isEmpty()) || WTF::holds_alternative<Vector<String>>(keyPath.value())))
</ins><span class="cx"> return Exception { IDBDatabaseException::InvalidAccessError, ASCIILiteral("Failed to execute 'createObjectStore' on 'IDBDatabase': The autoIncrement option was set but the keyPath option was empty or an array.") };
</span><span class="cx">
</span><span class="cx"> // Install the new ObjectStore into the connection's metadata.
</span><del>- auto info = m_info.createNewObjectStore(name, keyPath, parameters.autoIncrement);
</del><ins>+ auto info = m_info.createNewObjectStore(name, WTFMove(keyPath), parameters.autoIncrement);
</ins><span class="cx">
</span><span class="cx"> // Create the actual IDBObjectStore from the transaction, which also schedules the operation server side.
</span><span class="cx"> return m_versionChangeTransaction->createObjectStore(info);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp (207831 => 207832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2016-10-25 19:14:55 UTC (rev 207831)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2016-10-25 19:17:38 UTC (rev 207832)
</span><span class="lines">@@ -222,24 +222,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool IDBKeyPath::isValid() const
</del><ins>+bool isIDBKeyPathValid(const IDBKeyPathVariant& keyPath)
</ins><span class="cx"> {
</span><del>- switch (m_type) {
- case Type::Null:
- return false;
- case Type::String:
- return IDBIsValidKeyPath(m_string);
- case Type::Array:
- if (m_array.isEmpty())
</del><ins>+ auto visitor = WTF::makeVisitor([](const String& string) {
+ return IDBIsValidKeyPath(string);
+ }, [](const Vector<String>& vector) {
+ if (vector.isEmpty())
</ins><span class="cx"> return false;
</span><del>- for (auto& key : m_array) {
</del><ins>+ for (auto& key : vector) {
</ins><span class="cx"> if (!IDBIsValidKeyPath(key))
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><del>- }
- ASSERT_NOT_REACHED();
- return false;
</del><ins>+ });
+ return WTF::visit(visitor, keyPath);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool IDBKeyPath::operator==(const IDBKeyPath& other) const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h (207831 => 207832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h 2016-10-25 19:14:55 UTC (rev 207831)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h 2016-10-25 19:17:38 UTC (rev 207832)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> using IDBKeyPathVariant = WTF::Variant<String, Vector<String>>;
</span><ins>+bool isIDBKeyPathValid(const IDBKeyPathVariant&);
</ins><span class="cx">
</span><span class="cx"> class KeyedDecoder;
</span><span class="cx"> class KeyedEncoder;
</span><span class="lines">@@ -71,7 +72,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isNull() const { return m_type == Type::Null; }
</span><del>- bool isValid() const;
</del><span class="cx"> bool operator==(const IDBKeyPath& other) const;
</span><span class="cx">
</span><span class="cx"> IDBKeyPath isolatedCopy() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (207831 => 207832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-10-25 19:14:55 UTC (rev 207831)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-10-25 19:17:38 UTC (rev 207832)
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> return m_transaction->requestClearObjectStore(execState, *this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<IDBIndex>> IDBObjectStore::createIndex(ExecState&, const String& name, const IDBKeyPath& keyPath, const IndexParameters& parameters)
</del><ins>+ExceptionOr<Ref<IDBIndex>> IDBObjectStore::createIndex(ExecState&, const String& name, IDBKeyPathVariant&& keyPath, const IndexParameters& parameters)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBObjectStore::createIndex %s", name.utf8().data());
</span><span class="cx"> ASSERT(currentThread() == m_transaction->database().originThreadID());
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> if (!m_transaction->isActive())
</span><span class="cx"> return Exception { IDBDatabaseException::TransactionInactiveError };
</span><span class="cx">
</span><del>- if (!keyPath.isValid())
</del><ins>+ if (!isIDBKeyPathValid(keyPath))
</ins><span class="cx"> return Exception { IDBDatabaseException::SyntaxError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': The keyPath argument contains an invalid key path.") };
</span><span class="cx">
</span><span class="cx"> if (name.isNull())
</span><span class="lines">@@ -394,11 +394,11 @@
</span><span class="cx"> if (m_info.hasIndex(name))
</span><span class="cx"> return Exception { IDBDatabaseException::ConstraintError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': An index with the specified name already exists.") };
</span><span class="cx">
</span><del>- if (keyPath.type() == IDBKeyPath::Type::Array && parameters.multiEntry)
</del><ins>+ if (parameters.multiEntry && WTF::holds_alternative<Vector<String>>(keyPath))
</ins><span class="cx"> return Exception { IDBDatabaseException::InvalidAccessError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': The keyPath argument was an array and the multiEntry option is true.") };
</span><span class="cx">
</span><span class="cx"> // Install the new Index into the ObjectStore's info.
</span><del>- IDBIndexInfo info = m_info.createNewIndex(name, keyPath, parameters.unique, parameters.multiEntry);
</del><ins>+ IDBIndexInfo info = m_info.createNewIndex(name, Optional<IDBKeyPathVariant>(WTFMove(keyPath)), parameters.unique, parameters.multiEntry);
</ins><span class="cx"> m_transaction->database().didCreateIndexInfo(info);
</span><span class="cx">
</span><span class="cx"> // Create the actual IDBObjectStore from the transaction, which also schedules the operation server side.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h (207831 => 207832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h 2016-10-25 19:14:55 UTC (rev 207831)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h 2016-10-25 19:17:38 UTC (rev 207832)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "ExceptionOr.h"
</span><ins>+#include "IDBKeyPath.h"
</ins><span class="cx"> #include "IDBObjectStoreInfo.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx">
</span><span class="lines">@@ -80,7 +81,7 @@
</span><span class="cx"> ExceptionOr<Ref<IDBRequest>> deleteFunction(JSC::ExecState&, IDBKeyRange*);
</span><span class="cx"> ExceptionOr<Ref<IDBRequest>> deleteFunction(JSC::ExecState&, JSC::JSValue key);
</span><span class="cx"> ExceptionOr<Ref<IDBRequest>> clear(JSC::ExecState&);
</span><del>- ExceptionOr<Ref<IDBIndex>> createIndex(JSC::ExecState&, const String& name, const IDBKeyPath&, const IndexParameters&);
</del><ins>+ ExceptionOr<Ref<IDBIndex>> createIndex(JSC::ExecState&, const String& name, IDBKeyPathVariant&&, const IndexParameters&);
</ins><span class="cx"> ExceptionOr<Ref<IDBIndex>> index(const String& name);
</span><span class="cx"> ExceptionOr<void> deleteIndex(const String& name);
</span><span class="cx"> ExceptionOr<Ref<IDBRequest>> count(JSC::ExecState&, IDBKeyRange*);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStoreidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl (207831 => 207832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl 2016-10-25 19:14:55 UTC (rev 207831)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl 2016-10-25 19:17:38 UTC (rev 207832)
</span><span class="lines">@@ -45,8 +45,7 @@
</span><span class="cx"> [CallWith=ScriptState, MayThrowException] IDBRequest clear();
</span><span class="cx"> [CallWith=ScriptState, MayThrowException] IDBRequest openCursor(optional IDBKeyRange? range = null, optional DOMString direction = "next");
</span><span class="cx"> [CallWith=ScriptState, MayThrowException] IDBRequest openCursor(any key, optional DOMString direction = "next");
</span><del>- [CallWith=ScriptState, MayThrowException] IDBIndex createIndex(DOMString name, sequence<DOMString> keyPath, optional IDBIndexParameters options);
- [CallWith=ScriptState, MayThrowException] IDBIndex createIndex(DOMString name, DOMString keyPath, optional IDBIndexParameters options);
</del><ins>+ [CallWith=ScriptState, MayThrowException] IDBIndex createIndex(DOMString name, (DOMString or sequence<DOMString>) keyPath, optional IDBIndexParameters options);
</ins><span class="cx"> [MayThrowException] IDBIndex index(DOMString name);
</span><span class="cx"> [MayThrowException] void deleteIndex(DOMString name);
</span><span class="cx"> [CallWith=ScriptState, MayThrowException] IDBRequest count(optional IDBKeyRange? range = null);
</span></span></pre>
</div>
</div>
</body>
</html>