<!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>[203480] 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/203480">203480</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-07-20 16:28:33 -0700 (Wed, 20 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some "modernFoo"s from IndexedDB code.
https://bugs.webkit.org/show_bug.cgi?id=159985
Reviewed by Andy Estes.
No new tests (No known behavior change).
* Modules/indexeddb/IDBCursor.cpp:
(WebCore::IDBCursor::IDBCursor):
(WebCore::IDBCursor::~IDBCursor):
(WebCore::IDBCursor::sourcesDeleted):
(WebCore::IDBCursor::effectiveObjectStore):
(WebCore::IDBCursor::transaction):
(WebCore::IDBCursor::direction):
(WebCore::IDBCursor::update):
(WebCore::IDBCursor::advance):
(WebCore::IDBCursor::continueFunction):
(WebCore::IDBCursor::uncheckedIterateCursor):
(WebCore::IDBCursor::deleteFunction):
(WebCore::IDBCursor::setGetResult):
* Modules/indexeddb/IDBIndex.cpp:
(WebCore::IDBIndex::IDBIndex):
(WebCore::IDBIndex::~IDBIndex):
(WebCore::IDBIndex::hasPendingActivity):
(WebCore::IDBIndex::name):
(WebCore::IDBIndex::objectStore):
(WebCore::IDBIndex::keyPath):
(WebCore::IDBIndex::unique):
(WebCore::IDBIndex::multiEntry):
(WebCore::IDBIndex::openCursor):
(WebCore::IDBIndex::doCount):
(WebCore::IDBIndex::openKeyCursor):
(WebCore::IDBIndex::doGet):
(WebCore::IDBIndex::doGetKey):
(WebCore::IDBIndex::markAsDeleted):
* Modules/indexeddb/IDBIndex.h:
* Modules/indexeddb/IDBObjectStore.cpp:
(WebCore::IDBObjectStore::transaction):
(WebCore::IDBObjectStore::deleteFunction): Deleted.
(WebCore::IDBObjectStore::modernDelete): Deleted.
* Modules/indexeddb/IDBObjectStore.h:
* bindings/js/JSIDBIndexCustom.cpp:
(WebCore::JSIDBIndex::visitAdditionalChildren):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBCursorcpp">trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBIndexcpp">trunk/Source/WebCore/Modules/indexeddb/IDBIndex.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBIndexh">trunk/Source/WebCore/Modules/indexeddb/IDBIndex.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="#trunkSourceWebCorebindingsjsJSIDBIndexCustomcpp">trunk/Source/WebCore/bindings/js/JSIDBIndexCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203479 => 203480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-20 23:28:22 UTC (rev 203479)
+++ trunk/Source/WebCore/ChangeLog 2016-07-20 23:28:33 UTC (rev 203480)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+2016-07-20 Brady Eidson <beidson@apple.com>
+
+ Remove some "modernFoo"s from IndexedDB code.
+ https://bugs.webkit.org/show_bug.cgi?id=159985
+
+ Reviewed by Andy Estes.
+
+ No new tests (No known behavior change).
+
+ * Modules/indexeddb/IDBCursor.cpp:
+ (WebCore::IDBCursor::IDBCursor):
+ (WebCore::IDBCursor::~IDBCursor):
+ (WebCore::IDBCursor::sourcesDeleted):
+ (WebCore::IDBCursor::effectiveObjectStore):
+ (WebCore::IDBCursor::transaction):
+ (WebCore::IDBCursor::direction):
+ (WebCore::IDBCursor::update):
+ (WebCore::IDBCursor::advance):
+ (WebCore::IDBCursor::continueFunction):
+ (WebCore::IDBCursor::uncheckedIterateCursor):
+ (WebCore::IDBCursor::deleteFunction):
+ (WebCore::IDBCursor::setGetResult):
+
+ * Modules/indexeddb/IDBIndex.cpp:
+ (WebCore::IDBIndex::IDBIndex):
+ (WebCore::IDBIndex::~IDBIndex):
+ (WebCore::IDBIndex::hasPendingActivity):
+ (WebCore::IDBIndex::name):
+ (WebCore::IDBIndex::objectStore):
+ (WebCore::IDBIndex::keyPath):
+ (WebCore::IDBIndex::unique):
+ (WebCore::IDBIndex::multiEntry):
+ (WebCore::IDBIndex::openCursor):
+ (WebCore::IDBIndex::doCount):
+ (WebCore::IDBIndex::openKeyCursor):
+ (WebCore::IDBIndex::doGet):
+ (WebCore::IDBIndex::doGetKey):
+ (WebCore::IDBIndex::markAsDeleted):
+ * Modules/indexeddb/IDBIndex.h:
+
+ * Modules/indexeddb/IDBObjectStore.cpp:
+ (WebCore::IDBObjectStore::transaction):
+ (WebCore::IDBObjectStore::deleteFunction): Deleted.
+ (WebCore::IDBObjectStore::modernDelete): Deleted.
+ * Modules/indexeddb/IDBObjectStore.h:
+
+ * bindings/js/JSIDBIndexCustom.cpp:
+ (WebCore::JSIDBIndex::visitAdditionalChildren):
+
</ins><span class="cx"> 2016-07-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop using valueToStringWithNullCheck() in JSCSSStyleDeclaration::putDelegate()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp (203479 => 203480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp 2016-07-20 23:28:22 UTC (rev 203479)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp 2016-07-20 23:28:33 UTC (rev 203480)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> , m_info(info)
</span><span class="cx"> , m_objectStore(&objectStore)
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == effectiveObjectStore().modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == effectiveObjectStore().transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> suspendIfNeeded();
</span><span class="cx"> }
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> , m_info(info)
</span><span class="cx"> , m_index(&index)
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == effectiveObjectStore().modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == effectiveObjectStore().transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> suspendIfNeeded();
</span><span class="cx"> }
</span><span class="lines">@@ -134,18 +134,18 @@
</span><span class="cx">
</span><span class="cx"> IDBCursor::~IDBCursor()
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == effectiveObjectStore().modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == effectiveObjectStore().transaction().database().originThreadID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool IDBCursor::sourcesDeleted() const
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == effectiveObjectStore().modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == effectiveObjectStore().transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> if (m_objectStore)
</span><span class="cx"> return m_objectStore->isDeleted();
</span><span class="cx">
</span><span class="cx"> ASSERT(m_index);
</span><del>- return m_index->isDeleted() || m_index->modernObjectStore().isDeleted();
</del><ins>+ return m_index->isDeleted() || m_index->objectStore().isDeleted();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBObjectStore& IDBCursor::effectiveObjectStore() const
</span><span class="lines">@@ -154,18 +154,18 @@
</span><span class="cx"> return *m_objectStore;
</span><span class="cx">
</span><span class="cx"> ASSERT(m_index);
</span><del>- return m_index->modernObjectStore();
</del><ins>+ return m_index->objectStore();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBTransaction& IDBCursor::transaction() const
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == effectiveObjectStore().modernTransaction().database().originThreadID());
- return effectiveObjectStore().modernTransaction();
</del><ins>+ ASSERT(currentThread() == effectiveObjectStore().transaction().database().originThreadID());
+ return effectiveObjectStore().transaction();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& IDBCursor::direction() const
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == effectiveObjectStore().modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == effectiveObjectStore().transaction().database().originThreadID());
</ins><span class="cx"> return directionToString(m_info.cursorDirection());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> RefPtr<WebCore::IDBRequest> IDBCursor::update(ExecState& exec, JSValue value, ExceptionCodeWithMessage& ec)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBCursor::update");
</span><del>- ASSERT(currentThread() == effectiveObjectStore().modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == effectiveObjectStore().transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> if (sourcesDeleted()) {
</span><span class="cx"> ec.code = IDBDatabaseException::InvalidStateError;
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> void IDBCursor::advance(unsigned count, ExceptionCodeWithMessage& ec)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBCursor::advance");
</span><del>- ASSERT(currentThread() == effectiveObjectStore().modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == effectiveObjectStore().transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> if (!m_request) {
</span><span class="cx"> ec.code = IDBDatabaseException::InvalidStateError;
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> void IDBCursor::continueFunction(const IDBKeyData& key, ExceptionCodeWithMessage& ec)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBCursor::continueFunction (to key %s)", key.loggingString().utf8().data());
</span><del>- ASSERT(currentThread() == effectiveObjectStore().modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == effectiveObjectStore().transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> if (!m_request) {
</span><span class="cx"> ec.code = IDBDatabaseException::InvalidStateError;
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBCursor::uncheckedIterateCursor(const IDBKeyData& key, unsigned count)
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == effectiveObjectStore().modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == effectiveObjectStore().transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> ++m_outstandingRequestCount;
</span><span class="cx">
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> RefPtr<WebCore::IDBRequest> IDBCursor::deleteFunction(ExecState& execState, ExceptionCodeWithMessage& ec)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBCursor::deleteFunction");
</span><del>- ASSERT(currentThread() == effectiveObjectStore().modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == effectiveObjectStore().transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> if (sourcesDeleted()) {
</span><span class="cx"> ec.code = IDBDatabaseException::InvalidStateError;
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto request = effectiveObjectStore().modernDelete(execState, m_currentPrimaryKey.get(), ec);
</del><ins>+ auto request = effectiveObjectStore().deleteFunction(execState, m_currentPrimaryKey.get(), ec);
</ins><span class="cx"> if (ec.code)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx"> void IDBCursor::setGetResult(IDBRequest& request, const IDBGetResult& getResult)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBCursor::setGetResult - current key %s", getResult.keyData().loggingString().substring(0, 100).utf8().data());
</span><del>- ASSERT(currentThread() == effectiveObjectStore().modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == effectiveObjectStore().transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> auto* context = request.scriptExecutionContext();
</span><span class="cx"> if (!context)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBIndexcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBIndex.cpp (203479 => 203480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBIndex.cpp 2016-07-20 23:28:22 UTC (rev 203479)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBIndex.cpp 2016-07-20 23:28:33 UTC (rev 203480)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> , m_info(info)
</span><span class="cx"> , m_objectStore(objectStore)
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> suspendIfNeeded();
</span><span class="cx"> }
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> IDBIndex::~IDBIndex()
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* IDBIndex::activeDOMObjectName() const
</span><span class="lines">@@ -69,36 +69,36 @@
</span><span class="cx">
</span><span class="cx"> bool IDBIndex::hasPendingActivity() const
</span><span class="cx"> {
</span><del>- return !m_objectStore.modernTransaction().isFinished();
</del><ins>+ return !m_objectStore.transaction().isFinished();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& IDBIndex::name() const
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx"> return m_info.name();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<IDBObjectStore> IDBIndex::objectStore()
</del><ins>+IDBObjectStore& IDBIndex::objectStore()
</ins><span class="cx"> {
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
- return &m_objectStore;
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
+ return m_objectStore;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const IDBKeyPath& IDBIndex::keyPath() const
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx"> return m_info.keyPath();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool IDBIndex::unique() const
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx"> return m_info.unique();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool IDBIndex::multiEntry() const
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx"> return m_info.multiEntry();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> RefPtr<IDBRequest> IDBIndex::openCursor(ExecState& execState, IDBKeyRange* range, const String& directionString, ExceptionCodeWithMessage& ec)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBIndex::openCursor");
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> if (m_deleted || m_objectStore.isDeleted()) {
</span><span class="cx"> ec.code = IDBDatabaseException::InvalidStateError;
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!m_objectStore.modernTransaction().isActive()) {
</del><ins>+ if (!m_objectStore.transaction().isActive()) {
</ins><span class="cx"> ec.code = IDBDatabaseException::TransactionInactiveError;
</span><span class="cx"> ec.message = ASCIILiteral("Failed to execute 'openCursor' on 'IDBIndex': The transaction is inactive or finished.");
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -131,14 +131,14 @@
</span><span class="cx"> if (rangeData.upperKey.isNull())
</span><span class="cx"> rangeData.upperKey = IDBKeyData::maximum();
</span><span class="cx">
</span><del>- auto info = IDBCursorInfo::indexCursor(m_objectStore.modernTransaction(), m_objectStore.info().identifier(), m_info.identifier(), rangeData, direction, IndexedDB::CursorType::KeyAndValue);
- return m_objectStore.modernTransaction().requestOpenCursor(execState, *this, info);
</del><ins>+ auto info = IDBCursorInfo::indexCursor(m_objectStore.transaction(), m_objectStore.info().identifier(), m_info.identifier(), rangeData, direction, IndexedDB::CursorType::KeyAndValue);
+ return m_objectStore.transaction().requestOpenCursor(execState, *this, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBRequest> IDBIndex::openCursor(ExecState& execState, JSValue key, const String& direction, ExceptionCodeWithMessage& ec)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBIndex::openCursor");
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(execState, key, ec.code);
</span><span class="cx"> if (ec.code) {
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBRequest> IDBIndex::doCount(ExecState& execState, const IDBKeyRangeData& range, ExceptionCodeWithMessage& ec)
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> if (m_deleted || m_objectStore.isDeleted()) {
</span><span class="cx"> ec.code = IDBDatabaseException::InvalidStateError;
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto& transaction = m_objectStore.modernTransaction();
</del><ins>+ auto& transaction = m_objectStore.transaction();
</ins><span class="cx"> if (!transaction.isActive()) {
</span><span class="cx"> ec.code = IDBDatabaseException::TransactionInactiveError;
</span><span class="cx"> ec.message = ASCIILiteral("Failed to execute 'count' on 'IDBIndex': The transaction is inactive or finished.");
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> RefPtr<IDBRequest> IDBIndex::openKeyCursor(ExecState& execState, IDBKeyRange* range, const String& directionString, ExceptionCodeWithMessage& ec)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBIndex::openKeyCursor");
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> if (m_deleted || m_objectStore.isDeleted()) {
</span><span class="cx"> ec.code = IDBDatabaseException::InvalidStateError;
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!m_objectStore.modernTransaction().isActive()) {
</del><ins>+ if (!m_objectStore.transaction().isActive()) {
</ins><span class="cx"> ec.code = IDBDatabaseException::TransactionInactiveError;
</span><span class="cx"> ec.message = ASCIILiteral("Failed to execute 'openKeyCursor' on 'IDBIndex': The transaction is inactive or finished.");
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -218,8 +218,8 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto info = IDBCursorInfo::indexCursor(m_objectStore.modernTransaction(), m_objectStore.info().identifier(), m_info.identifier(), range, direction, IndexedDB::CursorType::KeyOnly);
- return m_objectStore.modernTransaction().requestOpenCursor(execState, *this, info);
</del><ins>+ auto info = IDBCursorInfo::indexCursor(m_objectStore.transaction(), m_objectStore.info().identifier(), m_info.identifier(), range, direction, IndexedDB::CursorType::KeyOnly);
+ return m_objectStore.transaction().requestOpenCursor(execState, *this, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBRequest> IDBIndex::openKeyCursor(ExecState& execState, JSValue key, const String& direction, ExceptionCodeWithMessage& ec)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBRequest> IDBIndex::doGet(ExecState& execState, const IDBKeyRangeData& range, ExceptionCodeWithMessage& ec)
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> if (m_deleted || m_objectStore.isDeleted()) {
</span><span class="cx"> ec.code = IDBDatabaseException::InvalidStateError;
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto& transaction = m_objectStore.modernTransaction();
</del><ins>+ auto& transaction = m_objectStore.transaction();
</ins><span class="cx"> if (!transaction.isActive()) {
</span><span class="cx"> ec.code = IDBDatabaseException::TransactionInactiveError;
</span><span class="cx"> ec.message = ASCIILiteral("Failed to execute 'get' on 'IDBIndex': The transaction is inactive or finished.");
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBRequest> IDBIndex::doGetKey(ExecState& execState, const IDBKeyRangeData& range, ExceptionCodeWithMessage& ec)
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> if (m_deleted || m_objectStore.isDeleted()) {
</span><span class="cx"> ec.code = IDBDatabaseException::InvalidStateError;
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto& transaction = m_objectStore.modernTransaction();
</del><ins>+ auto& transaction = m_objectStore.transaction();
</ins><span class="cx"> if (!transaction.isActive()) {
</span><span class="cx"> ec.code = IDBDatabaseException::TransactionInactiveError;
</span><span class="cx"> ec.message = ASCIILiteral("Failed to execute 'getKey' on 'IDBIndex': The transaction is inactive or finished.");
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBIndex::markAsDeleted()
</span><span class="cx"> {
</span><del>- ASSERT(currentThread() == m_objectStore.modernTransaction().database().originThreadID());
</del><ins>+ ASSERT(currentThread() == m_objectStore.transaction().database().originThreadID());
</ins><span class="cx">
</span><span class="cx"> ASSERT(!m_deleted);
</span><span class="cx"> m_deleted = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBIndexh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBIndex.h (203479 => 203480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBIndex.h 2016-07-20 23:28:22 UTC (rev 203479)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBIndex.h 2016-07-20 23:28:33 UTC (rev 203480)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> virtual ~IDBIndex();
</span><span class="cx">
</span><span class="cx"> const String& name() const;
</span><del>- RefPtr<IDBObjectStore> objectStore();
</del><ins>+ IDBObjectStore& objectStore();
</ins><span class="cx"> const IDBKeyPath& keyPath() const;
</span><span class="cx"> bool unique() const;
</span><span class="cx"> bool multiEntry() const;
</span><span class="lines">@@ -69,8 +69,6 @@
</span><span class="cx">
</span><span class="cx"> const IDBIndexInfo& info() const { return m_info; }
</span><span class="cx">
</span><del>- IDBObjectStore& modernObjectStore() { return m_objectStore; }
-
</del><span class="cx"> void markAsDeleted();
</span><span class="cx"> bool isDeleted() const { return m_deleted; }
</span><span class="cx">
</span><span class="lines">@@ -77,6 +75,8 @@
</span><span class="cx"> void ref();
</span><span class="cx"> void deref();
</span><span class="cx">
</span><ins>+ void* objectStoreAsOpaqueRoot() { return &m_objectStore; }
+
</ins><span class="cx"> private:
</span><span class="cx"> RefPtr<IDBRequest> doCount(JSC::ExecState&, const IDBKeyRangeData&, ExceptionCodeWithMessage&);
</span><span class="cx"> RefPtr<IDBRequest> doGet(JSC::ExecState&, const IDBKeyRangeData&, ExceptionCodeWithMessage&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (203479 => 203480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-07-20 23:28:22 UTC (rev 203479)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-07-20 23:28:33 UTC (rev 203480)
</span><span class="lines">@@ -112,10 +112,10 @@
</span><span class="cx"> return indexNames;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<IDBTransaction> IDBObjectStore::transaction()
</del><ins>+IDBTransaction& IDBObjectStore::transaction()
</ins><span class="cx"> {
</span><del>- ASSERT(currentThread() == m_transaction->database().originThreadID());\
- return &m_transaction.get();
</del><ins>+ ASSERT(currentThread() == m_transaction->database().originThreadID());
+ return m_transaction.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool IDBObjectStore::autoIncrement() const
</span><span class="lines">@@ -384,11 +384,6 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBRequest> IDBObjectStore::deleteFunction(ExecState& execState, JSValue key, ExceptionCodeWithMessage& ec)
</span><span class="cx"> {
</span><del>- return modernDelete(execState, key, ec);
-}
-
-RefPtr<IDBRequest> IDBObjectStore::modernDelete(ExecState& execState, JSValue key, ExceptionCodeWithMessage& ec)
-{
</del><span class="cx"> Ref<IDBKey> idbKey = scriptValueToIDBKey(execState, key);
</span><span class="cx"> if (!idbKey->isValid()) {
</span><span class="cx"> ec.code = IDBDatabaseException::DataError;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h (203479 => 203480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h 2016-07-20 23:28:22 UTC (rev 203479)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h 2016-07-20 23:28:33 UTC (rev 203480)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> const String& name() const;
</span><span class="cx"> const IDBKeyPath& keyPath() const;
</span><span class="cx"> RefPtr<DOMStringList> indexNames() const;
</span><del>- RefPtr<IDBTransaction> transaction();
</del><ins>+ IDBTransaction& transaction();
</ins><span class="cx"> bool autoIncrement() const;
</span><span class="cx">
</span><span class="cx"> struct IndexParameters {
</span><span class="lines">@@ -86,7 +86,6 @@
</span><span class="cx"> RefPtr<IDBRequest> count(JSC::ExecState&, JSC::JSValue key, ExceptionCodeWithMessage&);
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBRequest> putForCursorUpdate(JSC::ExecState&, JSC::JSValue, JSC::JSValue key, ExceptionCodeWithMessage&);
</span><del>- RefPtr<IDBRequest> modernDelete(JSC::ExecState&, JSC::JSValue key, ExceptionCodeWithMessage&);
</del><span class="cx">
</span><span class="cx"> void markAsDeleted();
</span><span class="cx"> bool isDeleted() const { return m_deleted; }
</span><span class="lines">@@ -93,9 +92,6 @@
</span><span class="cx">
</span><span class="cx"> const IDBObjectStoreInfo& info() const { return m_info; }
</span><span class="cx">
</span><del>- // FIXME: After removing LegacyIDB and folding abstract/implementation classes together, this will no longer be necessary.
- IDBTransaction& modernTransaction() { return m_transaction.get(); }
-
</del><span class="cx"> void rollbackInfoForVersionChangeAbort();
</span><span class="cx">
</span><span class="cx"> void visitReferencedIndexes(JSC::SlotVisitor&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSIDBIndexCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSIDBIndexCustom.cpp (203479 => 203480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSIDBIndexCustom.cpp 2016-07-20 23:28:22 UTC (rev 203479)
+++ trunk/Source/WebCore/bindings/js/JSIDBIndexCustom.cpp 2016-07-20 23:28:33 UTC (rev 203480)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> void JSIDBIndex::visitAdditionalChildren(SlotVisitor& visitor)
</span><span class="cx"> {
</span><del>- visitor.addOpaqueRoot(&static_cast<IDBIndex&>(wrapped()).modernObjectStore());
</del><ins>+ visitor.addOpaqueRoot(static_cast<IDBIndex&>(wrapped()).objectStoreAsOpaqueRoot());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>