<!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>[207806] 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/207806">207806</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-24 22:16:00 -0700 (Mon, 24 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>IDBDatabase.createObjectStore() should take a IDBObjectStoreParameters dictionary in parameter
https://bugs.webkit.org/show_bug.cgi?id=163916
Reviewed by Darin Adler.
Source/WebCore:
IDBDatabase.createObjectStore() should take a IDBObjectStoreParameters dictionary in parameter:
- https://www.w3.org/TR/IndexedDB/#idl-def-IDBDatabase
- https://www.w3.org/TR/IndexedDB/#idl-def-IDBObjectStoreParameters
Align our IDL with the specification.
No new tests, no expected Web-exposed behavior change.
* Modules/indexeddb/IDBDatabase.cpp:
(WebCore::IDBDatabase::createObjectStore):
* Modules/indexeddb/IDBDatabase.h:
* Modules/indexeddb/IDBDatabase.idl:
* Modules/indexeddb/IDBKeyPath.cpp:
(WebCore::IDBKeyPath::IDBKeyPath):
* Modules/indexeddb/IDBKeyPath.h:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/IDBBindingUtilities.cpp:
(WebCore::idbKeyPathFromValue): Deleted.
* bindings/js/IDBBindingUtilities.h:
* bindings/js/JSIDBDatabaseCustom.cpp: Removed.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateParametersCheck):
(GenerateConstructorDefinition):
* dom/MessageEvent.cpp:
(WebCore::MessageEvent::MessageEvent):
(WebCore::MessageEvent::create):
* dom/MessageEvent.h:
* testing/TypeConversions.h:
(WebCore::TypeConversions::setTypeConversionsDictionary):
LayoutTests:
Rebaseline existing tests now that the exception messages differ slightly.
* storage/indexeddb/create-object-store-options-expected.txt:
* storage/indexeddb/create-object-store-options-private-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbcreateobjectstoreoptionsexpectedtxt">trunk/LayoutTests/storage/indexeddb/create-object-store-options-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbcreateobjectstoreoptionsprivateexpectedtxt">trunk/LayoutTests/storage/indexeddb/create-object-store-options-private-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<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="#trunkSourceWebCoreModulesindexeddbIDBDatabaseh">trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabaseidl">trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.idl</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="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp">trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsIDBBindingUtilitiesh">trunk/Source/WebCore/bindings/js/IDBBindingUtilities.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestEventConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMessageEventcpp">trunk/Source/WebCore/dom/MessageEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMessageEventh">trunk/Source/WebCore/dom/MessageEvent.h</a></li>
<li><a href="#trunkSourceWebCoretestingTypeConversionsh">trunk/Source/WebCore/testing/TypeConversions.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSIDBDatabaseCustomcpp">trunk/Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/LayoutTests/ChangeLog 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-24 Chris Dumez <cdumez@apple.com>
+
+ IDBDatabase.createObjectStore() should take a IDBObjectStoreParameters dictionary in parameter
+ https://bugs.webkit.org/show_bug.cgi?id=163916
+
+ Reviewed by Darin Adler.
+
+ Rebaseline existing tests now that the exception messages differ slightly.
+
+ * storage/indexeddb/create-object-store-options-expected.txt:
+ * storage/indexeddb/create-object-store-options-private-expected.txt:
+
</ins><span class="cx"> 2016-10-24 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser should match old URL::parse with %2E in path
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbcreateobjectstoreoptionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/create-object-store-options-expected.txt (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/create-object-store-options-expected.txt 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/LayoutTests/storage/indexeddb/create-object-store-options-expected.txt 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -15,10 +15,10 @@
</span><span class="cx"> trans.objectStore('a').put({'a': 0})
</span><span class="cx"> Expecting TypeError exception from db.createObjectStore('d', 'bar');
</span><span class="cx"> PASS Exception was thrown.
</span><del>-PASS db.createObjectStore('d', 'bar'); threw TypeError: Not an object.
</del><ins>+PASS db.createObjectStore('d', 'bar'); threw TypeError: Type error
</ins><span class="cx"> Expecting TypeError exception from db.createObjectStore('e', false);
</span><span class="cx"> PASS Exception was thrown.
</span><del>-PASS db.createObjectStore('e', false); threw TypeError: Not an object.
</del><ins>+PASS db.createObjectStore('e', false); threw TypeError: Type error
</ins><span class="cx"> trans.objectStore('b').put({'a': 0}, 0)
</span><span class="cx"> trans.objectStore('a').get(0)
</span><span class="cx"> PASS event.target.result.a is {a: 0}
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbcreateobjectstoreoptionsprivateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/create-object-store-options-private-expected.txt (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/create-object-store-options-private-expected.txt 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/LayoutTests/storage/indexeddb/create-object-store-options-private-expected.txt 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -15,10 +15,10 @@
</span><span class="cx"> trans.objectStore('a').put({'a': 0})
</span><span class="cx"> Expecting TypeError exception from db.createObjectStore('d', 'bar');
</span><span class="cx"> PASS Exception was thrown.
</span><del>-PASS db.createObjectStore('d', 'bar'); threw TypeError: Not an object.
</del><ins>+PASS db.createObjectStore('d', 'bar'); threw TypeError: Type error
</ins><span class="cx"> Expecting TypeError exception from db.createObjectStore('e', false);
</span><span class="cx"> PASS Exception was thrown.
</span><del>-PASS db.createObjectStore('e', false); threw TypeError: Not an object.
</del><ins>+PASS db.createObjectStore('e', false); threw TypeError: Type error
</ins><span class="cx"> trans.objectStore('b').put({'a': 0}, 0)
</span><span class="cx"> trans.objectStore('a').get(0)
</span><span class="cx"> PASS event.target.result.a is {a: 0}
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -1146,7 +1146,6 @@
</span><span class="cx"> bindings/js/JSHistoryCustom.cpp
</span><span class="cx"> bindings/js/JSIDBCursorCustom.cpp
</span><span class="cx"> bindings/js/JSIDBCursorWithValueCustom.cpp
</span><del>- bindings/js/JSIDBDatabaseCustom.cpp
</del><span class="cx"> bindings/js/JSIDBIndexCustom.cpp
</span><span class="cx"> bindings/js/JSIDBObjectStoreCustom.cpp
</span><span class="cx"> bindings/js/JSIDBRequestCustom.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/ChangeLog 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-10-24 Chris Dumez <cdumez@apple.com>
+
+ IDBDatabase.createObjectStore() should take a IDBObjectStoreParameters dictionary in parameter
+ https://bugs.webkit.org/show_bug.cgi?id=163916
+
+ Reviewed by Darin Adler.
+
+ IDBDatabase.createObjectStore() should take a IDBObjectStoreParameters dictionary in parameter:
+ - https://www.w3.org/TR/IndexedDB/#idl-def-IDBDatabase
+ - https://www.w3.org/TR/IndexedDB/#idl-def-IDBObjectStoreParameters
+
+ Align our IDL with the specification.
+
+ No new tests, no expected Web-exposed behavior change.
+
+ * Modules/indexeddb/IDBDatabase.cpp:
+ (WebCore::IDBDatabase::createObjectStore):
+ * Modules/indexeddb/IDBDatabase.h:
+ * Modules/indexeddb/IDBDatabase.idl:
+ * Modules/indexeddb/IDBKeyPath.cpp:
+ (WebCore::IDBKeyPath::IDBKeyPath):
+ * Modules/indexeddb/IDBKeyPath.h:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/IDBBindingUtilities.cpp:
+ (WebCore::idbKeyPathFromValue): Deleted.
+ * bindings/js/IDBBindingUtilities.h:
+ * bindings/js/JSIDBDatabaseCustom.cpp: Removed.
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateParametersCheck):
+ (GenerateConstructorDefinition):
+ * dom/MessageEvent.cpp:
+ (WebCore::MessageEvent::MessageEvent):
+ (WebCore::MessageEvent::create):
+ * dom/MessageEvent.h:
+ * testing/TypeConversions.h:
+ (WebCore::TypeConversions::setTypeConversionsDictionary):
+
</ins><span class="cx"> 2016-10-24 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser should match old URL::parse with %2E in path
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -130,14 +130,8 @@
</span><span class="cx"> m_versionChangeTransaction->renameIndex(index, newName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<IDBObjectStore>> IDBDatabase::createObjectStore(const String&, const Dictionary&)
</del><ins>+ExceptionOr<Ref<IDBObjectStore>> IDBDatabase::createObjectStore(const String& name, ObjectStoreParameters&& parameters)
</ins><span class="cx"> {
</span><del>- ASSERT_NOT_REACHED();
- return Exception { IDBDatabaseException::InvalidStateError };
-}
-
-ExceptionOr<Ref<IDBObjectStore>> IDBDatabase::createObjectStore(const String& name, const IDBKeyPath& keyPath, bool autoIncrement)
-{
</del><span class="cx"> LOG(IndexedDB, "IDBDatabase::createObjectStore - (%s %s)", m_info.name().utf8().data(), name.utf8().data());
</span><span class="cx">
</span><span class="cx"> ASSERT(currentThread() == originThreadID());
</span><span class="lines">@@ -152,14 +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><ins>+ IDBKeyPath keyPath(WTFMove(parameters.keyPath));
</ins><span class="cx"> if (!keyPath.isNull() && !keyPath.isValid())
</span><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 (autoIncrement && ((keyPath.type() == IDBKeyPath::Type::String && keyPath.string().isEmpty()) || keyPath.type() == IDBKeyPath::Type::Array))
</del><ins>+ if (parameters.autoIncrement && ((keyPath.type() == IDBKeyPath::Type::String && keyPath.string().isEmpty()) || keyPath.type() == IDBKeyPath::Type::Array))
</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, autoIncrement);
</del><ins>+ auto info = m_info.createNewObjectStore(name, 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="trunkSourceWebCoreModulesindexeddbIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "IDBConnectionProxy.h"
</span><span class="cx"> #include "IDBConnectionToServer.h"
</span><span class="cx"> #include "IDBDatabaseInfo.h"
</span><ins>+#include "IDBKeyPath.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -55,8 +56,13 @@
</span><span class="cx"> uint64_t version() const;
</span><span class="cx"> RefPtr<DOMStringList> objectStoreNames() const;
</span><span class="cx">
</span><del>- ExceptionOr<Ref<IDBObjectStore>> createObjectStore(const String& name, const Dictionary&);
- ExceptionOr<Ref<IDBObjectStore>> createObjectStore(const String& name, const IDBKeyPath&, bool autoIncrement);
</del><ins>+ struct ObjectStoreParameters {
+ Optional<IDBKeyPathVariant> keyPath;
+ bool autoIncrement;
+ };
+
+ ExceptionOr<Ref<IDBObjectStore>> createObjectStore(const String& name, ObjectStoreParameters&&);
+
</ins><span class="cx"> ExceptionOr<Ref<IDBTransaction>> transaction(const Vector<String>&, const String& mode);
</span><span class="cx"> ExceptionOr<Ref<IDBTransaction>> transaction(const String&, const String& mode);
</span><span class="cx"> ExceptionOr<void> deleteObjectStore(const String& name);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.idl (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.idl 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.idl 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> readonly attribute unsigned long long version;
</span><span class="cx"> readonly attribute DOMStringList objectStoreNames;
</span><span class="cx">
</span><del>- [Custom, MayThrowException] IDBObjectStore createObjectStore(DOMString name, optional Dictionary options);
</del><ins>+ [MayThrowException] IDBObjectStore createObjectStore(DOMString name, optional IDBObjectStoreParameters parameters);
</ins><span class="cx"> [MayThrowException] void deleteObjectStore(DOMString name);
</span><span class="cx"> [MayThrowException] IDBTransaction transaction(DOMString storeName, optional DOMString mode = "readonly");
</span><span class="cx"> [MayThrowException] IDBTransaction transaction(sequence<DOMString> storeNames, optional DOMString mode = "readonly");
</span><span class="lines">@@ -47,3 +47,8 @@
</span><span class="cx"> attribute EventHandler onerror;
</span><span class="cx"> attribute EventHandler onversionchange;
</span><span class="cx"> };
</span><ins>+
+dictionary IDBObjectStoreParameters {
+ (DOMString or sequence<DOMString>)? keyPath = null;
+ boolean autoIncrement = false;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -208,6 +208,20 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+IDBKeyPath::IDBKeyPath(Optional<IDBKeyPathVariant>&& variant)
+{
+ if (!variant)
+ return;
+
+ if (WTF::holds_alternative<String>(*variant)) {
+ m_type = Type::String;
+ m_string = WTFMove(WTF::get<String>(*variant));
+ } else {
+ m_type = Type::Array;
+ m_array = WTFMove(WTF::get<Vector<String>>(*variant));
+ }
+}
+
</ins><span class="cx"> bool IDBKeyPath::isValid() const
</span><span class="cx"> {
</span><span class="cx"> switch (m_type) {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -27,11 +27,14 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><ins>+#include <wtf/Variant.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+using IDBKeyPathVariant = WTF::Variant<String, Vector<String>>;
+
</ins><span class="cx"> class KeyedDecoder;
</span><span class="cx"> class KeyedEncoder;
</span><span class="cx">
</span><span class="lines">@@ -44,11 +47,13 @@
</span><span class="cx">
</span><span class="cx"> void IDBParseKeyPath(const String&, Vector<String>&, IDBKeyPathParseError&);
</span><span class="cx">
</span><ins>+// FIXME: We should be able to replace IDBKeyPath with IDBKeyPathVariant.
</ins><span class="cx"> class IDBKeyPath {
</span><span class="cx"> public:
</span><span class="cx"> IDBKeyPath() { }
</span><span class="cx"> WEBCORE_EXPORT IDBKeyPath(const String&);
</span><span class="cx"> WEBCORE_EXPORT IDBKeyPath(const Vector<String>& array);
</span><ins>+ WEBCORE_EXPORT IDBKeyPath(Optional<IDBKeyPathVariant>&&);
</ins><span class="cx">
</span><span class="cx"> enum class Type { Null, String, Array };
</span><span class="cx"> Type type() const { return m_type; }
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -1547,9 +1547,9 @@
</span><span class="cx"> 415071581685067300C3C7B3 /* SelectorFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 415071561685067300C3C7B3 /* SelectorFilter.h */; };
</span><span class="cx"> 4150F9F112B6E0E70008C860 /* SliderThumbElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4150F9EF12B6E0E70008C860 /* SliderThumbElement.h */; };
</span><span class="cx"> 4150F9F212B6E0E70008C860 /* SliderThumbElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4150F9F012B6E0E70008C860 /* SliderThumbElement.cpp */; };
</span><ins>+ 415670471DBE1533009AC3BB /* PeerConnectionStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 415670461DBE1524009AC3BB /* PeerConnectionStates.h */; };
</ins><span class="cx"> 4157AF8012F1FB0400A8C6F5 /* MediaControlsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */; };
</span><span class="cx"> 4157AF8112F1FB0400A8C6F5 /* MediaControlsApple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4157AF7F12F1FB0400A8C6F5 /* MediaControlsApple.cpp */; };
</span><del>- 415670471DBE1533009AC3BB /* PeerConnectionStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 415670461DBE1524009AC3BB /* PeerConnectionStates.h */; };
</del><span class="cx"> 41614A781DA6423B004AD06F /* HTTPHeaderValues.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41614A761DA64236004AD06F /* HTTPHeaderValues.cpp */; };
</span><span class="cx"> 41614A791DA64241004AD06F /* HTTPHeaderValues.h in Headers */ = {isa = PBXBuildFile; fileRef = 41614A771DA64236004AD06F /* HTTPHeaderValues.h */; };
</span><span class="cx"> 4162A450101145AE00DFF3ED /* DedicatedWorkerGlobalScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4162A44D101145AE00DFF3ED /* DedicatedWorkerGlobalScope.cpp */; };
</span><span class="lines">@@ -2001,7 +2001,6 @@
</span><span class="cx"> 511EF2C917F0FD3500E4FA16 /* JSIDBRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EF2B317F0FC4800E4FA16 /* JSIDBRequest.cpp */; };
</span><span class="cx"> 511EF2CA17F0FD3500E4FA16 /* JSIDBTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EF2B417F0FC4800E4FA16 /* JSIDBTransaction.cpp */; };
</span><span class="cx"> 511EF2CB17F0FD3500E4FA16 /* JSIDBVersionChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 269239911505E1AA009E57FC /* JSIDBVersionChangeEvent.cpp */; };
</span><del>- 511EF2D017F0FDF100E4FA16 /* JSIDBDatabaseCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EF2CD17F0FDF100E4FA16 /* JSIDBDatabaseCustom.cpp */; };
</del><span class="cx"> 511EF2D117F0FDF100E4FA16 /* JSIDBObjectStoreCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EF2CE17F0FDF100E4FA16 /* JSIDBObjectStoreCustom.cpp */; };
</span><span class="cx"> 5126E6BB0A2E3B12005C29FA /* IconDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5126E6B90A2E3B12005C29FA /* IconDatabase.cpp */; };
</span><span class="cx"> 5126E6BC0A2E3B12005C29FA /* IconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 5126E6BA0A2E3B12005C29FA /* IconDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -8546,9 +8545,9 @@
</span><span class="cx"> 415071561685067300C3C7B3 /* SelectorFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectorFilter.h; sourceTree = "<group>"; };
</span><span class="cx"> 4150F9EF12B6E0E70008C860 /* SliderThumbElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SliderThumbElement.h; sourceTree = "<group>"; };
</span><span class="cx"> 4150F9F012B6E0E70008C860 /* SliderThumbElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SliderThumbElement.cpp; sourceTree = "<group>"; };
</span><ins>+ 415670461DBE1524009AC3BB /* PeerConnectionStates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeerConnectionStates.h; sourceTree = "<group>"; };
</ins><span class="cx"> 4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControlsApple.h; sourceTree = "<group>"; };
</span><span class="cx"> 4157AF7F12F1FB0400A8C6F5 /* MediaControlsApple.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaControlsApple.cpp; sourceTree = "<group>"; };
</span><del>- 415670461DBE1524009AC3BB /* PeerConnectionStates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeerConnectionStates.h; sourceTree = "<group>"; };
</del><span class="cx"> 41614A761DA64236004AD06F /* HTTPHeaderValues.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTTPHeaderValues.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 41614A771DA64236004AD06F /* HTTPHeaderValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPHeaderValues.h; sourceTree = "<group>"; };
</span><span class="cx"> 4162A44D101145AE00DFF3ED /* DedicatedWorkerGlobalScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DedicatedWorkerGlobalScope.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -9071,7 +9070,6 @@
</span><span class="cx"> 511EF2B217F0FC4800E4FA16 /* JSIDBOpenDBRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSIDBOpenDBRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 511EF2B317F0FC4800E4FA16 /* JSIDBRequest.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBRequest.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 511EF2B417F0FC4800E4FA16 /* JSIDBTransaction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBTransaction.cpp; sourceTree = "<group>"; };
</span><del>- 511EF2CD17F0FDF100E4FA16 /* JSIDBDatabaseCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBDatabaseCustom.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 511EF2CE17F0FDF100E4FA16 /* JSIDBObjectStoreCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBObjectStoreCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 511FAEA91BDC989A00B4AFE4 /* ThreadSafeDataBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadSafeDataBuffer.h; sourceTree = "<group>"; };
</span><span class="cx"> 5123AF161890A4CA0031CDC9 /* IDBKeyRangeData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBKeyRangeData.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -21621,7 +21619,6 @@
</span><span class="cx"> D6F7960C166FFECE0076DD18 /* JSHTMLTemplateElementCustom.cpp */,
</span><span class="cx"> 512BDB4C1C46B0FF006494DF /* JSIDBCursorCustom.cpp */,
</span><span class="cx"> 5141298D1C5FD7E90059E714 /* JSIDBCursorWithValueCustom.cpp */,
</span><del>- 511EF2CD17F0FDF100E4FA16 /* JSIDBDatabaseCustom.cpp */,
</del><span class="cx"> 5141299A1C6C166D0059E714 /* JSIDBIndexCustom.cpp */,
</span><span class="cx"> 511EF2CE17F0FDF100E4FA16 /* JSIDBObjectStoreCustom.cpp */,
</span><span class="cx"> 934F31B41CC0737200DB43DC /* JSIDBRequestCustom.cpp */,
</span><span class="lines">@@ -29386,7 +29383,6 @@
</span><span class="cx"> 511EF2C217F0FD3500E4FA16 /* JSIDBCursorWithValue.cpp in Sources */,
</span><span class="cx"> 5141298E1C5FD83A0059E714 /* JSIDBCursorWithValueCustom.cpp in Sources */,
</span><span class="cx"> 511EF2C317F0FD3500E4FA16 /* JSIDBDatabase.cpp in Sources */,
</span><del>- 511EF2D017F0FDF100E4FA16 /* JSIDBDatabaseCustom.cpp in Sources */,
</del><span class="cx"> 511EF2C417F0FD3500E4FA16 /* JSIDBFactory.cpp in Sources */,
</span><span class="cx"> 511EF2C517F0FD3500E4FA16 /* JSIDBIndex.cpp in Sources */,
</span><span class="cx"> 5141299B1C6C16740059E714 /* JSIDBIndexCustom.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -176,16 +176,6 @@
</span><span class="cx"> return IDBKey::createInvalid();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IDBKeyPath idbKeyPathFromValue(ExecState& exec, JSValue keyPathValue)
-{
- IDBKeyPath keyPath;
- if (isJSArray(keyPathValue))
- keyPath = IDBKeyPath(convert<IDLSequence<IDLDOMString>>(exec, keyPathValue));
- else
- keyPath = IDBKeyPath(keyPathValue.toWTFString(&exec));
- return keyPath;
-}
-
</del><span class="cx"> static JSValue getNthValueOnKeyPath(ExecState& exec, JSValue rootValue, const Vector<String>& keyPathElements, size_t index)
</span><span class="cx"> {
</span><span class="cx"> JSValue currentValue(rootValue);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsIDBBindingUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/IDBBindingUtilities.h (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/IDBBindingUtilities.h 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/bindings/js/IDBBindingUtilities.h 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> class JSDOMGlobalObject;
</span><span class="cx"> class ThreadSafeDataBuffer;
</span><span class="cx">
</span><del>-IDBKeyPath idbKeyPathFromValue(JSC::ExecState&, JSC::JSValue);
</del><span class="cx"> JSC::JSValue toJS(JSC::ExecState&, JSDOMGlobalObject&, const IDBKeyPath&);
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBKey> maybeCreateIDBKeyFromScriptValueAndKeyPath(JSC::ExecState&, const JSC::JSValue&, const IDBKeyPath&);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSIDBDatabaseCustomcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -1,84 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Michael Pruett <michael@68k.org>
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(INDEXED_DATABASE)
-
-#include "JSIDBDatabase.h"
-
-#include "IDBBindingUtilities.h"
-#include "IDBDatabase.h"
-#include "IDBKeyPath.h"
-#include "IDBObjectStore.h"
-#include "JSDOMBinding.h"
-#include "JSDOMStringList.h"
-#include "JSIDBObjectStore.h"
-#include <runtime/Error.h>
-#include <runtime/JSString.h>
-
-using namespace JSC;
-
-namespace WebCore {
-
-JSValue JSIDBDatabase::createObjectStore(ExecState& state)
-{
- VM& vm = state.vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
-
- if (state.argumentCount() < 1)
- return throwException(&state, scope, createNotEnoughArgumentsError(&state));
-
- String name = state.argument(0).toString(&state)->value(&state);
- RETURN_IF_EXCEPTION(scope, JSValue());
-
- JSValue optionsValue = state.argument(1);
- if (!optionsValue.isUndefinedOrNull() && !optionsValue.isObject())
- return throwTypeError(&state, scope, ASCIILiteral("Not an object."));
-
- IDBKeyPath keyPath;
- bool autoIncrement = false;
- if (!optionsValue.isUndefinedOrNull()) {
- JSValue keyPathValue = optionsValue.get(&state, Identifier::fromString(&state, "keyPath"));
- RETURN_IF_EXCEPTION(scope, JSValue());
-
- if (!keyPathValue.isUndefinedOrNull()) {
- keyPath = idbKeyPathFromValue(state, keyPathValue);
- RETURN_IF_EXCEPTION(scope, JSValue());
- }
-
- autoIncrement = optionsValue.get(&state, Identifier::fromString(&state, "autoIncrement")).toBoolean(&state);
- RETURN_IF_EXCEPTION(scope, JSValue());
- }
-
- return toJS(state, *globalObject(), scope, wrapped().createObjectStore(name, keyPath, autoIncrement));
-}
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -4428,7 +4428,7 @@
</span><span class="cx"> if ($codeGenerator->IsTypedArrayType($type) and $parameter->type ne "ArrayBuffer") {
</span><span class="cx"> $value = $shouldPassByReference ? "$name.releaseNonNull()" : "WTFMove($name)";
</span><span class="cx"> } elsif ($codeGenerator->IsDictionaryType($type)) {
</span><del>- $value = "${name}";
</del><ins>+ $value = "WTFMove($name)";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5866,8 +5866,6 @@
</span><span class="cx"> last if $index eq $paramIndex;
</span><span class="cx"> if (ShouldPassWrapperByReference($parameter, $interface)) {
</span><span class="cx"> push(@constructorArgList, "*" . $parameter->name);
</span><del>- } elsif ($codeGenerator->IsDictionaryType($parameter->type)) {
- push(@constructorArgList, $parameter->name);
</del><span class="cx"> } else {
</span><span class="cx"> push(@constructorArgList, "WTFMove(" . $parameter->name . ")");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestEventConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> auto eventInitDict = convert<IDLDictionary<TestEventConstructor::Init>>(*state, state->argument(1));
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- auto object = TestEventConstructor::create(WTFMove(type), eventInitDict);
</del><ins>+ auto object = TestEventConstructor::create(WTFMove(type), WTFMove(eventInitDict));
</ins><span class="cx"> return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -8177,7 +8177,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto init = convert<IDLDictionary<TestObj::Dictionary>>(*state, state->uncheckedArgument(0));
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- impl.attachShadowRoot(init);
</del><ins>+ impl.attachShadowRoot(WTFMove(init));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -8197,7 +8197,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto dict = convert<IDLDictionary<DictionaryImplName>>(*state, state->uncheckedArgument(0));
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- impl.operationWithExternalDictionaryParameter(dict);
</del><ins>+ impl.operationWithExternalDictionaryParameter(WTFMove(dict));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomMessageEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MessageEvent.cpp (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MessageEvent.cpp 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/dom/MessageEvent.cpp 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline MessageEvent::MessageEvent(ExecState& state, const AtomicString& type, Init& initializer, IsTrusted isTrusted)
</del><ins>+inline MessageEvent::MessageEvent(ExecState& state, const AtomicString& type, Init&& initializer, IsTrusted isTrusted)
</ins><span class="cx"> : Event(type, initializer, isTrusted)
</span><span class="cx"> , m_dataType(DataTypeScriptValue)
</span><span class="cx"> , m_dataAsScriptValue(state.vm(), initializer.data)
</span><span class="lines">@@ -126,9 +126,9 @@
</span><span class="cx"> return adoptRef(*new MessageEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<MessageEvent> MessageEvent::create(ExecState& state, const AtomicString& type, Init& initializer, IsTrusted isTrusted)
</del><ins>+Ref<MessageEvent> MessageEvent::create(ExecState& state, const AtomicString& type, Init&& initializer, IsTrusted isTrusted)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new MessageEvent(state, type, initializer, isTrusted));
</del><ins>+ return adoptRef(*new MessageEvent(state, type, WTFMove(initializer), isTrusted));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MessageEvent::~MessageEvent()
</span></span></pre></div>
<a id="trunkSourceWebCoredomMessageEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MessageEvent.h (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MessageEvent.h 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/dom/MessageEvent.h 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> Optional<MessageEventSource> source;
</span><span class="cx"> Vector<RefPtr<MessagePort>> ports;
</span><span class="cx"> };
</span><del>- static Ref<MessageEvent> create(JSC::ExecState&, const AtomicString& type, Init&, IsTrusted = IsTrusted::No);
</del><ins>+ static Ref<MessageEvent> create(JSC::ExecState&, const AtomicString& type, Init&&, IsTrusted = IsTrusted::No);
</ins><span class="cx">
</span><span class="cx"> virtual ~MessageEvent();
</span><span class="cx">
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MessageEvent();
</span><del>- MessageEvent(JSC::ExecState&, const AtomicString&, Init&, IsTrusted);
</del><ins>+ MessageEvent(JSC::ExecState&, const AtomicString&, Init&&, IsTrusted);
</ins><span class="cx"> MessageEvent(RefPtr<SerializedScriptValue>&& data, const String& origin, const String& lastEventId, Optional<MessageEventSource>&&, Vector<RefPtr<MessagePort>>&&);
</span><span class="cx"> MessageEvent(const AtomicString& type, RefPtr<SerializedScriptValue>&& data, const String& origin, const String& lastEventId);
</span><span class="cx"> MessageEvent(const String& data, const String& origin);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingTypeConversionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/TypeConversions.h (207805 => 207806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/TypeConversions.h 2016-10-25 04:40:23 UTC (rev 207805)
+++ trunk/Source/WebCore/testing/TypeConversions.h 2016-10-25 05:16:00 UTC (rev 207806)
</span><span class="lines">@@ -104,12 +104,12 @@
</span><span class="cx"> const TestUnion& testUnion() const { return m_union; }
</span><span class="cx"> void setTestUnion(const TestUnion& value) { m_union = value; }
</span><span class="cx">
</span><del>- void setTypeConversionsDictionary(Dictionary& dictionary)
</del><ins>+ void setTypeConversionsDictionary(Dictionary&& dictionary)
</ins><span class="cx"> {
</span><span class="cx"> m_typeConversionsDictionaryLongValue = dictionary.longValue;
</span><del>- m_typeConversionsDictionaryStringValue = dictionary.stringValue;
- m_typeConversionsDictionarySequenceValue = dictionary.sequenceValue;
- m_typeConversionsDictionaryUnionValue = dictionary.unionValue;
</del><ins>+ m_typeConversionsDictionaryStringValue = WTFMove(dictionary.stringValue);
+ m_typeConversionsDictionarySequenceValue = WTFMove(dictionary.sequenceValue);
+ m_typeConversionsDictionaryUnionValue = WTFMove(dictionary.unionValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int typeConversionsDictionaryLongValue() { return m_typeConversionsDictionaryLongValue; }
</span></span></pre>
</div>
</div>
</body>
</html>