Diff
Modified: trunk/Source/WebCore/ChangeLog (140849 => 140850)
--- trunk/Source/WebCore/ChangeLog 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebCore/ChangeLog 2013-01-25 19:05:44 UTC (rev 140850)
@@ -1,3 +1,45 @@
+2013-01-25 Alec Flett <alecfl...@chromium.org>
+
+ IndexedDB: Move TaskType enum to IDBDatabaseBackendInterface
+ https://bugs.webkit.org/show_bug.cgi?id=107960
+
+ Reviewed by Tony Chang.
+
+ The IDBTransactionBackendInterface class is going away,
+ this is an easy search-and-replace patch to keep these
+ changes out of more complex patches.
+
+ No new tests, just part of a refactor.
+
+ * Modules/indexeddb/IDBCursorBackendImpl.cpp:
+ (WebCore::IDBCursorBackendImpl::IDBCursorBackendImpl):
+ * Modules/indexeddb/IDBCursorBackendImpl.h:
+ (WebCore::IDBCursorBackendImpl::create):
+ (IDBCursorBackendImpl):
+ * Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
+ (WebCore::IDBDatabaseBackendImpl::setIndexesReady):
+ (WebCore::OpenCursorOperation::perform):
+ * Modules/indexeddb/IDBObjectStore.cpp:
+ (WebCore::IDBObjectStore::createIndex):
+ (WebCore::IDBObjectStore::openCursor):
+ * Modules/indexeddb/IDBObjectStore.h:
+ (WebCore::IDBObjectStore::openCursor):
+ (IDBObjectStore):
+ * Modules/indexeddb/IDBOpenDBRequest.cpp:
+ (WebCore::IDBOpenDBRequest::IDBOpenDBRequest):
+ * Modules/indexeddb/IDBRequest.cpp:
+ (WebCore::IDBRequest::create):
+ (WebCore::IDBRequest::IDBRequest):
+ * Modules/indexeddb/IDBRequest.h:
+ (IDBRequest):
+ (WebCore::IDBRequest::taskType):
+ * Modules/indexeddb/IDBTransactionBackendImpl.cpp:
+ (WebCore::IDBTransactionBackendImpl::scheduleTask):
+ * Modules/indexeddb/IDBTransactionBackendImpl.h:
+ (WebCore::IDBTransactionBackendImpl::scheduleTask):
+ (IDBTransactionBackendImpl):
+ * Modules/indexeddb/IDBTransactionBackendInterface.h:
+
2013-01-25 Abhishek Arya <infe...@chromium.org>
Regression(r139836): Crash in WTF::equalIgnoringCase
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.cpp (140849 => 140850)
--- trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.cpp 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.cpp 2013-01-25 19:05:44 UTC (rev 140850)
@@ -101,7 +101,7 @@
RefPtr<IDBCallbacks> m_callbacks;
};
-IDBCursorBackendImpl::IDBCursorBackendImpl(PassRefPtr<IDBBackingStore::Cursor> cursor, CursorType cursorType, IDBTransactionBackendInterface::TaskType taskType, IDBTransactionBackendImpl* transaction, int64_t objectStoreId)
+IDBCursorBackendImpl::IDBCursorBackendImpl(PassRefPtr<IDBBackingStore::Cursor> cursor, CursorType cursorType, IDBDatabaseBackendInterface::TaskType taskType, IDBTransactionBackendImpl* transaction, int64_t objectStoreId)
: m_taskType(taskType)
, m_cursorType(cursorType)
, m_database(transaction->database())
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.h (140849 => 140850)
--- trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.h 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.h 2013-01-25 19:05:44 UTC (rev 140850)
@@ -47,9 +47,9 @@
public:
static PassRefPtr<IDBCursorBackendImpl> create(PassRefPtr<IDBBackingStore::Cursor> cursor, CursorType cursorType, IDBTransactionBackendImpl* transaction, int64_t objectStoreId)
{
- return adoptRef(new IDBCursorBackendImpl(cursor, cursorType, IDBTransactionBackendInterface::NormalTask, transaction, objectStoreId));
+ return adoptRef(new IDBCursorBackendImpl(cursor, cursorType, IDBDatabaseBackendInterface::NormalTask, transaction, objectStoreId));
}
- static PassRefPtr<IDBCursorBackendImpl> create(PassRefPtr<IDBBackingStore::Cursor> cursor, CursorType cursorType, IDBTransactionBackendInterface::TaskType taskType, IDBTransactionBackendImpl* transaction, int64_t objectStoreId)
+ static PassRefPtr<IDBCursorBackendImpl> create(PassRefPtr<IDBBackingStore::Cursor> cursor, CursorType cursorType, IDBDatabaseBackendInterface::TaskType taskType, IDBTransactionBackendImpl* transaction, int64_t objectStoreId)
{
return adoptRef(new IDBCursorBackendImpl(cursor, cursorType, taskType, transaction, objectStoreId));
}
@@ -69,13 +69,13 @@
void close();
private:
- IDBCursorBackendImpl(PassRefPtr<IDBBackingStore::Cursor>, CursorType, IDBTransactionBackendInterface::TaskType, IDBTransactionBackendImpl*, int64_t objectStoreId);
+ IDBCursorBackendImpl(PassRefPtr<IDBBackingStore::Cursor>, CursorType, IDBDatabaseBackendInterface::TaskType, IDBTransactionBackendImpl*, int64_t objectStoreId);
class CursorIterationOperation;
class CursorAdvanceOperation;
class CursorPrefetchIterationOperation;
- IDBTransactionBackendInterface::TaskType m_taskType;
+ IDBDatabaseBackendInterface::TaskType m_taskType;
CursorType m_cursorType;
const RefPtr<IDBDatabaseBackendImpl> m_database;
const RefPtr<IDBTransactionBackendImpl> m_transaction;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp (140849 => 140850)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp 2013-01-25 19:05:44 UTC (rev 140850)
@@ -914,7 +914,7 @@
if (transaction->isFinished())
return;
- if (!transaction->scheduleTask(IDBTransactionBackendInterface::PreemptiveTask, SetIndexesReadyOperation::create(indexIds.size())))
+ if (!transaction->scheduleTask(IDBDatabaseBackendInterface::PreemptiveTask, SetIndexesReadyOperation::create(indexIds.size())))
ASSERT_NOT_REACHED();
}
@@ -963,7 +963,7 @@
return;
}
- IDBTransactionBackendInterface::TaskType taskType(static_cast<IDBTransactionBackendInterface::TaskType>(m_taskType));
+ IDBDatabaseBackendInterface::TaskType taskType(static_cast<IDBDatabaseBackendInterface::TaskType>(m_taskType));
RefPtr<IDBCursorBackendImpl> cursor = IDBCursorBackendImpl::create(backingStoreCursor.get(), m_cursorType, taskType, transaction, m_objectStoreId);
m_callbacks->onSuccess(cursor, cursor->key(), cursor->primaryKey(), cursor->value());
}
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (140849 => 140850)
--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2013-01-25 19:05:44 UTC (rev 140850)
@@ -415,7 +415,7 @@
if (ec)
return 0;
- RefPtr<IDBRequest> indexRequest = openCursor(context, static_cast<IDBKeyRange*>(0), IDBCursor::directionNext(), IDBTransactionBackendInterface::PreemptiveTask, ec);
+ RefPtr<IDBRequest> indexRequest = openCursor(context, static_cast<IDBKeyRange*>(0), IDBCursor::directionNext(), IDBDatabaseBackendInterface::PreemptiveTask, ec);
ASSERT(!ec);
if (ec)
return 0;
@@ -491,7 +491,7 @@
}
}
-PassRefPtr<IDBRequest> IDBObjectStore::openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> range, const String& directionString, IDBTransactionBackendInterface::TaskType taskType, ExceptionCode& ec)
+PassRefPtr<IDBRequest> IDBObjectStore::openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> range, const String& directionString, IDBDatabaseBackendInterface::TaskType taskType, ExceptionCode& ec)
{
IDB_TRACE("IDBObjectStore::openCursor");
if (m_deleted) {
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h (140849 => 140850)
--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h 2013-01-25 19:05:44 UTC (rev 140850)
@@ -70,8 +70,8 @@
PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, ExceptionCode& ec) { return openCursor(context, static_cast<IDBKeyRange*>(0), ec); }
PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec) { return openCursor(context, keyRange, IDBCursor::directionNext(), ec); }
PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, const ScriptValue& key, ExceptionCode& ec) { return openCursor(context, key, IDBCursor::directionNext(), ec); }
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> range, const String& direction, ExceptionCode& ec) { return openCursor(context, range, direction, IDBTransactionBackendInterface::NormalTask, ec); }
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, const String& direction, IDBTransactionBackendInterface::TaskType, ExceptionCode&);
+ PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> range, const String& direction, ExceptionCode& ec) { return openCursor(context, range, direction, IDBDatabaseBackendInterface::NormalTask, ec); }
+ PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, const String& direction, IDBDatabaseBackendInterface::TaskType, ExceptionCode&);
PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const ScriptValue& key, const String& direction, ExceptionCode&);
PassRefPtr<IDBRequest> get(ScriptExecutionContext*, const ScriptValue& key, ExceptionCode&);
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp (140849 => 140850)
--- trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp 2013-01-25 19:05:44 UTC (rev 140850)
@@ -45,7 +45,7 @@
}
IDBOpenDBRequest::IDBOpenDBRequest(ScriptExecutionContext* context, PassRefPtr<IDBDatabaseCallbacksImpl> callbacks, int64_t transactionId, int64_t version)
- : IDBRequest(context, IDBAny::createNull(), IDBTransactionBackendInterface::NormalTask, 0)
+ : IDBRequest(context, IDBAny::createNull(), IDBDatabaseBackendInterface::NormalTask, 0)
, m_databaseCallbacks(callbacks)
, m_transactionId(transactionId)
, m_version(version)
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp (140849 => 140850)
--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2013-01-25 19:05:44 UTC (rev 140850)
@@ -47,7 +47,7 @@
PassRefPtr<IDBRequest> IDBRequest::create(ScriptExecutionContext* context, PassRefPtr<IDBAny> source, IDBTransaction* transaction)
{
- RefPtr<IDBRequest> request(adoptRef(new IDBRequest(context, source, IDBTransactionBackendInterface::NormalTask, transaction)));
+ RefPtr<IDBRequest> request(adoptRef(new IDBRequest(context, source, IDBDatabaseBackendInterface::NormalTask, transaction)));
request->suspendIfNeeded();
// Requests associated with IDBFactory (open/deleteDatabase/getDatabaseNames) are not associated with transactions.
if (transaction)
@@ -55,7 +55,7 @@
return request.release();
}
-PassRefPtr<IDBRequest> IDBRequest::create(ScriptExecutionContext* context, PassRefPtr<IDBAny> source, IDBTransactionBackendInterface::TaskType taskType, IDBTransaction* transaction)
+PassRefPtr<IDBRequest> IDBRequest::create(ScriptExecutionContext* context, PassRefPtr<IDBAny> source, IDBDatabaseBackendInterface::TaskType taskType, IDBTransaction* transaction)
{
RefPtr<IDBRequest> request(adoptRef(new IDBRequest(context, source, taskType, transaction)));
request->suspendIfNeeded();
@@ -65,7 +65,7 @@
return request.release();
}
-IDBRequest::IDBRequest(ScriptExecutionContext* context, PassRefPtr<IDBAny> source, IDBTransactionBackendInterface::TaskType taskType, IDBTransaction* transaction)
+IDBRequest::IDBRequest(ScriptExecutionContext* context, PassRefPtr<IDBAny> source, IDBDatabaseBackendInterface::TaskType taskType, IDBTransaction* transaction)
: ActiveDOMObject(context, this)
, m_result(0)
, m_errorCode(0)
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h (140849 => 140850)
--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2013-01-25 19:05:44 UTC (rev 140850)
@@ -57,7 +57,7 @@
class IDBRequest : public ScriptWrappable, public IDBCallbacks, public EventTarget, public ActiveDOMObject {
public:
static PassRefPtr<IDBRequest> create(ScriptExecutionContext*, PassRefPtr<IDBAny> source, IDBTransaction*);
- static PassRefPtr<IDBRequest> create(ScriptExecutionContext*, PassRefPtr<IDBAny> source, IDBTransactionBackendInterface::TaskType, IDBTransaction*);
+ static PassRefPtr<IDBRequest> create(ScriptExecutionContext*, PassRefPtr<IDBAny> source, IDBDatabaseBackendInterface::TaskType, IDBTransaction*);
virtual ~IDBRequest();
PassRefPtr<IDBAny> result(ExceptionCode&) const;
@@ -115,12 +115,12 @@
using RefCounted<IDBCallbacks>::ref;
using RefCounted<IDBCallbacks>::deref;
- IDBTransactionBackendInterface::TaskType taskType() { return m_taskType; }
+ IDBDatabaseBackendInterface::TaskType taskType() { return m_taskType; }
DOMRequestState* requestState() { return &m_requestState; }
protected:
- IDBRequest(ScriptExecutionContext*, PassRefPtr<IDBAny> source, IDBTransactionBackendInterface::TaskType, IDBTransaction*);
+ IDBRequest(ScriptExecutionContext*, PassRefPtr<IDBAny> source, IDBDatabaseBackendInterface::TaskType, IDBTransaction*);
void enqueueEvent(PassRefPtr<Event>);
virtual bool shouldEnqueueEvent() const;
void onSuccessInternal(const ScriptValue&);
@@ -145,7 +145,7 @@
void setResultCursor(PassRefPtr<IDBCursor>, PassRefPtr<IDBKey>, PassRefPtr<IDBKey> primaryKey, const ScriptValue&);
RefPtr<IDBAny> m_source;
- const IDBTransactionBackendInterface::TaskType m_taskType;
+ const IDBDatabaseBackendInterface::TaskType m_taskType;
bool m_hasPendingActivity;
Vector<RefPtr<Event> > m_enqueuedEvents;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp (140849 => 140850)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp 2013-01-25 19:05:44 UTC (rev 140850)
@@ -70,12 +70,12 @@
ASSERT(m_state == Finished);
}
-bool IDBTransactionBackendImpl::scheduleTask(TaskType type, PassOwnPtr<Operation> task, PassOwnPtr<Operation> abortTask)
+bool IDBTransactionBackendImpl::scheduleTask(IDBDatabaseBackendInterface::TaskType type, PassOwnPtr<Operation> task, PassOwnPtr<Operation> abortTask)
{
if (m_state == Finished)
return false;
- if (type == NormalTask)
+ if (type == IDBDatabaseBackendInterface::NormalTask)
m_taskQueue.append(task);
else
m_preemptiveTaskQueue.append(task);
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h (140849 => 140850)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h 2013-01-25 19:05:44 UTC (rev 140850)
@@ -67,8 +67,8 @@
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(NormalTask, task, abortTask); }
- bool scheduleTask(TaskType, PassOwnPtr<Operation>, PassOwnPtr<Operation> abortTask = nullptr);
+ 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 registerOpenCursor(IDBCursorBackendImpl*);
void unregisterOpenCursor(IDBCursorBackendImpl*);
void addPreemptiveEvent() { m_pendingPreemptiveEvents++; }
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h (140849 => 140850)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h 2013-01-25 19:05:44 UTC (rev 140850)
@@ -46,12 +46,6 @@
class IDBTransactionBackendInterface : public RefCounted<IDBTransactionBackendInterface> {
public:
virtual ~IDBTransactionBackendInterface() { }
-
- enum TaskType {
- NormalTask = 0,
- PreemptiveTask
- };
-
virtual void commit() = 0;
virtual void abort() = 0;
virtual void setCallbacks(IDBTransactionCallbacks*) = 0;
Modified: trunk/Source/WebKit/chromium/ChangeLog (140849 => 140850)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-25 19:05:44 UTC (rev 140850)
@@ -1,3 +1,14 @@
+2013-01-25 Alec Flett <alecfl...@chromium.org>
+
+ IndexedDB: Move TaskType enum to IDBDatabaseBackendInterface
+ https://bugs.webkit.org/show_bug.cgi?id=107960
+
+ Reviewed by Tony Chang.
+
+ Update asserts to reflect new enum location.
+
+ * src/AssertMatchingEnums.cpp:
+
2013-01-25 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r140774.
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (140849 => 140850)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-01-25 19:00:37 UTC (rev 140849)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-01-25 19:05:44 UTC (rev 140850)
@@ -501,8 +501,8 @@
COMPILE_ASSERT_MATCHING_ENUM(WebIDBCursor::Prev, IDBCursor::PREV);
COMPILE_ASSERT_MATCHING_ENUM(WebIDBCursor::PrevNoDuplicate, IDBCursor::PREV_NO_DUPLICATE);
-COMPILE_ASSERT_MATCHING_ENUM(WebIDBTransaction::PreemptiveTask, IDBTransactionBackendInterface::PreemptiveTask);
-COMPILE_ASSERT_MATCHING_ENUM(WebIDBTransaction::NormalTask, IDBTransactionBackendInterface::NormalTask);
+COMPILE_ASSERT_MATCHING_ENUM(WebIDBTransaction::PreemptiveTask, IDBDatabaseBackendInterface::PreemptiveTask);
+COMPILE_ASSERT_MATCHING_ENUM(WebIDBTransaction::NormalTask, IDBDatabaseBackendInterface::NormalTask);
#endif
#if ENABLE(FILE_SYSTEM)
