Changeset 141332 in webkit

Timestamp:

Jan 30, 2013 3:30:39 PM (11 years ago)

Author:

alecflett@chromium.org

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/IDBDatabaseBackendImpl.cpp (modified) (3 diffs)
• Modules/indexeddb/IDBTransactionBackendImpl.cpp (modified) (2 diffs)
• Modules/indexeddb/IDBTransactionBackendImpl.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-30  Alec Flett  <alecflett@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.fraser@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp

@@ -871 +871 @@
     IDB_TRACE("IDBDatabaseBackendImpl::setIndexKeys");
     IDBTransactionBackendImpl* transaction = m_transactions.get(transactionId);
-    if (!transaction || transaction->isFinished())
+    if (!transaction)
         return;
     ASSERT(transaction->mode() == IDBTransaction::VERSION_CHANGE);
@@ -917 +917 @@
 
     IDBTransactionBackendImpl* transaction = m_transactions.get(transactionId);
-    if (!transaction || transaction->isFinished())
-        return;
-
-    if (!transaction->scheduleTask(IDBDatabaseBackendInterface::PreemptiveTask, SetIndexesReadyOperation::create(indexIds.size())))
-        ASSERT_NOT_REACHED();
+    if (!transaction)
+        return;
+
+    transaction->scheduleTask(IDBDatabaseBackendInterface::PreemptiveTask, SetIndexesReadyOperation::create(indexIds.size()));
 }
 
@@ -1269 +1268 @@
     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);

trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp

@@ -71 +71 @@
 }
 
-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)
@@ -88 +88 @@
     else if (m_state == Running && !m_taskTimer.isActive())
         m_taskTimer.startOneShot(0);
-
-    return true;
 }
 

trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h

@@ -67 +67 @@
     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*);