Diff
Modified: trunk/Source/WebCore/ChangeLog (141331 => 141332)
--- trunk/Source/WebCore/ChangeLog 2013-01-30 23:27:05 UTC (rev 141331)
+++ trunk/Source/WebCore/ChangeLog 2013-01-30 23:30:39 UTC (rev 141332)
@@ -1,3 +1,24 @@
+2013-01-30 Alec Flett <alecfl...@chromium.org>
+
+ IndexedDB: clean up scheduleTask return type
+ https://bugs.webkit.org/show_bug.cgi?id=108361
+
+ Reviewed by Tony Chang.
+
+ This is just a code simplification now that the
+ synchronous consumers of scheduleTask are gone.
+
+ No new tests: pure refactor.
+
+ * Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
+ (WebCore::IDBDatabaseBackendImpl::setIndexesReady):
+ (WebCore::IDBDatabaseBackendImpl::runIntVersionChangeTransaction):
+ * Modules/indexeddb/IDBTransactionBackendImpl.cpp:
+ (WebCore::IDBTransactionBackendImpl::scheduleTask):
+ * Modules/indexeddb/IDBTransactionBackendImpl.h:
+ (WebCore::IDBTransactionBackendImpl::scheduleTask):
+ (IDBTransactionBackendImpl):
+
2013-01-30 Simon Fraser <simon.fra...@apple.com>
Elements that dynamically become fixed sometimes jump to the top left on scrolling
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp (141331 => 141332)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp 2013-01-30 23:27:05 UTC (rev 141331)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp 2013-01-30 23:30:39 UTC (rev 141332)
@@ -870,7 +870,7 @@
{
IDB_TRACE("IDBDatabaseBackendImpl::setIndexKeys");
IDBTransactionBackendImpl* transaction = m_transactions.get(transactionId);
- if (!transaction || transaction->isFinished())
+ if (!transaction)
return;
ASSERT(transaction->mode() == IDBTransaction::VERSION_CHANGE);
@@ -916,11 +916,10 @@
IDB_TRACE("IDBObjectStoreBackendImpl::setIndexesReady");
IDBTransactionBackendImpl* transaction = m_transactions.get(transactionId);
- if (!transaction || transaction->isFinished())
+ if (!transaction)
return;
- if (!transaction->scheduleTask(IDBDatabaseBackendInterface::PreemptiveTask, SetIndexesReadyOperation::create(indexIds.size())))
- ASSERT_NOT_REACHED();
+ transaction->scheduleTask(IDBDatabaseBackendInterface::PreemptiveTask, SetIndexesReadyOperation::create(indexIds.size()));
}
void SetIndexesReadyOperation::perform(IDBTransactionBackendImpl* transaction)
@@ -1268,9 +1267,8 @@
createTransaction(transactionId, databaseCallbacks, objectStoreIds, IDBTransaction::VERSION_CHANGE);
RefPtr<IDBTransactionBackendImpl> transaction = m_transactions.get(transactionId);
- if (!transaction->scheduleTask(VersionChangeOperation::create(this, transactionId, requestedVersion, callbacks, databaseCallbacks), VersionChangeAbortOperation::create(this, m_metadata.version, m_metadata.intVersion))) {
- ASSERT_NOT_REACHED();
- }
+ transaction->scheduleTask(VersionChangeOperation::create(this, transactionId, requestedVersion, callbacks, databaseCallbacks), VersionChangeAbortOperation::create(this, m_metadata.version, m_metadata.intVersion));
+
ASSERT(!m_pendingSecondHalfOpen);
m_databaseCallbacksSet.add(databaseCallbacks);
}
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp (141331 => 141332)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp 2013-01-30 23:27:05 UTC (rev 141331)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp 2013-01-30 23:30:39 UTC (rev 141332)
@@ -70,10 +70,10 @@
ASSERT(m_state == Finished);
}
-bool IDBTransactionBackendImpl::scheduleTask(IDBDatabaseBackendInterface::TaskType type, PassOwnPtr<Operation> task, PassOwnPtr<Operation> abortTask)
+void IDBTransactionBackendImpl::scheduleTask(IDBDatabaseBackendInterface::TaskType type, PassOwnPtr<Operation> task, PassOwnPtr<Operation> abortTask)
{
if (m_state == Finished)
- return false;
+ return;
if (type == IDBDatabaseBackendInterface::NormalTask)
m_taskQueue.append(task);
@@ -87,8 +87,6 @@
start();
else if (m_state == Running && !m_taskTimer.isActive())
m_taskTimer.startOneShot(0);
-
- return true;
}
void IDBTransactionBackendImpl::abort()
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h (141331 => 141332)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h 2013-01-30 23:27:05 UTC (rev 141331)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h 2013-01-30 23:30:39 UTC (rev 141332)
@@ -66,9 +66,8 @@
void run();
IDBTransaction::Mode mode() const { return m_mode; }
const HashSet<int64_t>& scope() const { return m_objectStoreIds; }
- bool isFinished() const { return m_state == Finished; }
- bool scheduleTask(PassOwnPtr<Operation> task, PassOwnPtr<Operation> abortTask = nullptr) { return scheduleTask(IDBDatabaseBackendInterface::NormalTask, task, abortTask); }
- bool scheduleTask(IDBDatabaseBackendInterface::TaskType, PassOwnPtr<Operation>, PassOwnPtr<Operation> abortTask = nullptr);
+ void scheduleTask(PassOwnPtr<Operation> task, PassOwnPtr<Operation> abortTask = nullptr) { scheduleTask(IDBDatabaseBackendInterface::NormalTask, task, abortTask); }
+ void scheduleTask(IDBDatabaseBackendInterface::TaskType, PassOwnPtr<Operation>, PassOwnPtr<Operation> abortTask = nullptr);
void registerOpenCursor(IDBCursorBackendImpl*);
void unregisterOpenCursor(IDBCursorBackendImpl*);
void addPreemptiveEvent() { m_pendingPreemptiveEvents++; }
