<!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>[200202] 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/200202">200202</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-04-28 11:47:20 -0700 (Thu, 28 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Reimplement Web Inspector code that was tied to Legacy IDB.
https://bugs.webkit.org/show_bug.cgi?id=154686
Reviewed by Alex Christensen.
No new tests (Inspector folks will have to write them if they're possible).
* inspector/InspectorIndexedDBAgent.cpp: Reimplement missing functionality mostly with code that was
removed in http://trac.webkit.org/changeset/197131/trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200201 => 200202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-28 18:41:50 UTC (rev 200201)
+++ trunk/Source/WebCore/ChangeLog 2016-04-28 18:47:20 UTC (rev 200202)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-04-28 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Reimplement Web Inspector code that was tied to Legacy IDB.
+ https://bugs.webkit.org/show_bug.cgi?id=154686
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Inspector folks will have to write them if they're possible).
+
+ * inspector/InspectorIndexedDBAgent.cpp: Reimplement missing functionality mostly with code that was
+ removed in http://trac.webkit.org/changeset/197131/trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
+
</ins><span class="cx"> 2016-04-28 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the Apple Internal OS X build
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (200201 => 200202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2016-04-28 18:41:50 UTC (rev 200201)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2016-04-28 18:47:20 UTC (rev 200202)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> : m_context(context) { }
</span><span class="cx"> virtual ~ExecutableWithDatabase() { };
</span><span class="cx"> void start(IDBFactory*, SecurityOrigin*, const String& databaseName);
</span><del>- virtual void execute() = 0;
</del><ins>+ virtual void execute(IDBDatabase&) = 0;
</ins><span class="cx"> virtual RequestCallback& requestCallback() = 0;
</span><span class="cx"> ScriptExecutionContext* context() { return m_context; };
</span><span class="cx"> private:
</span><span class="lines">@@ -135,9 +135,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME (webkit.org/b/154686) - Reimplement this.
- m_executableWithDatabase->requestCallback().sendFailure("Modern IDB is not supported yet");
- return;
</del><ins>+ m_executableWithDatabase->execute(*databaseResult);
+ databaseResult->close();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -165,6 +164,67 @@
</span><span class="cx"> idbOpenDBRequest->addEventListener(eventNames().successEvent, WTFMove(callback), false);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+static RefPtr<KeyPath> keyPathFromIDBKeyPath(const IDBKeyPath& idbKeyPath)
+{
+ RefPtr<KeyPath> keyPath;
+ switch (idbKeyPath.type()) {
+ case IndexedDB::KeyPathType::Null:
+ keyPath = KeyPath::create()
+ .setType(KeyPath::Type::Null)
+ .release();
+ break;
+ case IndexedDB::KeyPathType::String:
+ keyPath = KeyPath::create()
+ .setType(KeyPath::Type::String)
+ .release();
+ keyPath->setString(idbKeyPath.string());
+
+ break;
+ case IndexedDB::KeyPathType::Array: {
+ auto array = Inspector::Protocol::Array<String>::create();
+ for (auto& string : idbKeyPath.array())
+ array->addItem(string);
+ keyPath = KeyPath::create()
+ .setType(KeyPath::Type::Array)
+ .release();
+ keyPath->setArray(WTFMove(array));
+ break;
+ }
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ return keyPath;
+}
+
+static RefPtr<IDBTransaction> transactionForDatabase(ScriptExecutionContext* scriptExecutionContext, IDBDatabase* idbDatabase, const String& objectStoreName, const String& mode = IDBTransaction::modeReadOnly())
+{
+ ExceptionCodeWithMessage ec;
+ RefPtr<IDBTransaction> idbTransaction = idbDatabase->transaction(scriptExecutionContext, objectStoreName, mode, ec);
+ if (ec.code)
+ return nullptr;
+ return idbTransaction;
+}
+
+static RefPtr<IDBObjectStore> objectStoreForTransaction(IDBTransaction* idbTransaction, const String& objectStoreName)
+{
+ ExceptionCodeWithMessage ec;
+ RefPtr<IDBObjectStore> idbObjectStore = idbTransaction->objectStore(objectStoreName, ec);
+ if (ec.code)
+ return nullptr;
+ return idbObjectStore;
+}
+
+static RefPtr<IDBIndex> indexForObjectStore(IDBObjectStore* idbObjectStore, const String& indexName)
+{
+ ExceptionCodeWithMessage ec;
+ RefPtr<IDBIndex> idbIndex = idbObjectStore->index(indexName, ec);
+ if (ec.code)
+ return nullptr;
+ return idbIndex;
+}
+
</ins><span class="cx"> class DatabaseLoader : public ExecutableWithDatabase {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<DatabaseLoader> create(ScriptExecutionContext* context, Ref<RequestDatabaseCallback>&& requestCallback)
</span><span class="lines">@@ -174,12 +234,48 @@
</span><span class="cx">
</span><span class="cx"> virtual ~DatabaseLoader() { }
</span><span class="cx">
</span><del>- void execute() override
</del><ins>+ void execute(IDBDatabase& database) override
</ins><span class="cx"> {
</span><span class="cx"> if (!requestCallback().isActive())
</span><span class="cx"> return;
</span><ins>+
+ auto& databaseInfo = database.info();
+ auto objectStores = Inspector::Protocol::Array<Inspector::Protocol::IndexedDB::ObjectStore>::create();
+ auto objectStoreNames = databaseInfo.objectStoreNames();
+ for (auto& name : objectStoreNames) {
+ auto* objectStoreInfo = databaseInfo.infoForExistingObjectStore(name);
+ if (!objectStoreInfo)
+ continue;
</ins><span class="cx">
</span><del>- // FIXME (webkit.org/b/154686) - Reimplement this.
</del><ins>+ auto indexes = Inspector::Protocol::Array<Inspector::Protocol::IndexedDB::ObjectStoreIndex>::create();
+
+ for (auto& indexInfo : objectStoreInfo->indexMap().values()) {
+ Ref<ObjectStoreIndex> objectStoreIndex = ObjectStoreIndex::create()
+ .setName(indexInfo.name())
+ .setKeyPath(keyPathFromIDBKeyPath(indexInfo.keyPath()))
+ .setUnique(indexInfo.unique())
+ .setMultiEntry(indexInfo.multiEntry())
+ .release();
+ indexes->addItem(WTFMove(objectStoreIndex));
+ }
+
+ Ref<ObjectStore> objectStore = ObjectStore::create()
+ .setName(objectStoreInfo->name())
+ .setKeyPath(keyPathFromIDBKeyPath(objectStoreInfo->keyPath()))
+ .setAutoIncrement(objectStoreInfo->autoIncrement())
+ .setIndexes(WTFMove(indexes))
+ .release();
+
+ objectStores->addItem(WTFMove(objectStore));
+ }
+
+ Ref<DatabaseWithObjectStores> result = DatabaseWithObjectStores::create()
+ .setName(databaseInfo.name())
+ .setVersion(databaseInfo.version())
+ .setObjectStores(WTFMove(objectStores))
+ .release();
+
+ m_requestCallback->sendSuccess(WTFMove(result));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RequestCallback& requestCallback() override { return m_requestCallback.get(); }
</span><span class="lines">@@ -372,12 +468,42 @@
</span><span class="cx">
</span><span class="cx"> virtual ~DataLoader() { }
</span><span class="cx">
</span><del>- void execute() override
</del><ins>+ void execute(IDBDatabase& database) override
</ins><span class="cx"> {
</span><span class="cx"> if (!requestCallback().isActive())
</span><span class="cx"> return;
</span><ins>+ RefPtr<IDBTransaction> idbTransaction = transactionForDatabase(context(), &database, m_objectStoreName);
+ if (!idbTransaction) {
+ m_requestCallback->sendFailure("Could not get transaction");
+ return;
+ }
+ RefPtr<IDBObjectStore> idbObjectStore = objectStoreForTransaction(idbTransaction.get(), m_objectStoreName);
+ if (!idbObjectStore) {
+ m_requestCallback->sendFailure("Could not get object store");
+ return;
+ }
</ins><span class="cx">
</span><del>- // FIXME (webkit.org/b/154686) - Reimplement this.
</del><ins>+ Ref<OpenCursorCallback> openCursorCallback = OpenCursorCallback::create(m_injectedScript, m_requestCallback.copyRef(), 0, m_pageSize);
+
+ ExceptionCodeWithMessage ec;
+ RefPtr<IDBRequest> idbRequest;
+ if (!m_indexName.isEmpty()) {
+ RefPtr<IDBIndex> idbIndex = indexForObjectStore(idbObjectStore.get(), m_indexName);
+ if (!idbIndex) {
+ m_requestCallback->sendFailure("Could not get index");
+ return;
+ }
+
+ idbRequest = idbIndex->openCursor(*context(), m_idbKeyRange.get(), IDBCursor::directionNext(), ec);
+ } else
+ idbRequest = idbObjectStore->openCursor(*context(), m_idbKeyRange.get(), IDBCursor::directionNext(), ec);
+
+ if (!idbRequest) {
+ m_requestCallback->sendFailure("Could not open cursor to populate database data");
+ return;
+ }
+
+ idbRequest->addEventListener(eventNames().successEvent, WTFMove(openCursorCallback), false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RequestCallback& requestCallback() override { return m_requestCallback.get(); }
</span><span class="lines">@@ -560,7 +686,6 @@
</span><span class="cx"> Ref<ClearObjectStoreCallback> m_requestCallback;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-
</del><span class="cx"> class ClearObjectStore : public ExecutableWithDatabase {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<ClearObjectStore> create(ScriptExecutionContext* context, const String& objectStoreName, Ref<ClearObjectStoreCallback>&& requestCallback)
</span><span class="lines">@@ -575,12 +700,30 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void execute() override
</del><ins>+ void execute(IDBDatabase& database) override
</ins><span class="cx"> {
</span><span class="cx"> if (!requestCallback().isActive())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // FIXME (webkit.org/b/154686) - Reimplement this.
</del><ins>+ RefPtr<IDBTransaction> idbTransaction = transactionForDatabase(context(), &database, m_objectStoreName);
+ if (!idbTransaction) {
+ m_requestCallback->sendFailure("Could not get transaction");
+ return;
+ }
+ RefPtr<IDBObjectStore> idbObjectStore = objectStoreForTransaction(idbTransaction.get(), m_objectStoreName);
+ if (!idbObjectStore) {
+ m_requestCallback->sendFailure("Could not get object store");
+ return;
+ }
+
+ ExceptionCodeWithMessage ec;
+ RefPtr<IDBRequest> idbRequest = idbObjectStore->clear(*context(), ec);
+ ASSERT(!ec.code);
+ if (ec.code) {
+ m_requestCallback->sendFailure(String::format("Could not clear object store '%s': %d", m_objectStoreName.utf8().data(), ec.code));
+ return;
+ }
+ idbTransaction->addEventListener(eventNames().completeEvent, ClearObjectStoreListener::create(m_requestCallback.copyRef()), false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RequestCallback& requestCallback() override { return m_requestCallback.get(); }
</span></span></pre>
</div>
</div>
</body>
</html>