Diff
Modified: trunk/Source/WebCore/ChangeLog (136422 => 136423)
--- trunk/Source/WebCore/ChangeLog 2012-12-03 19:17:32 UTC (rev 136422)
+++ trunk/Source/WebCore/ChangeLog 2012-12-03 19:36:47 UTC (rev 136423)
@@ -1,3 +1,17 @@
+2012-12-03 Alec Flett <[email protected]>
+
+ IndexedDB: remove IDBDatabaseBackendInterface::transaction()
+ https://bugs.webkit.org/show_bug.cgi?id=102733
+
+ Reviewed by Darin Fisher.
+
+ Part 3 of a refactor, remove the old transaction() method.
+
+ No new tests as this is just post-refactor cleanup.
+
+ * Modules/indexeddb/IDBDatabaseBackendInterface.h:
+ (IDBDatabaseBackendInterface):
+
2012-12-03 Andrey Adaikin <[email protected]>
Web Inspector: [Canvas] show replay screenshot of the last call's canvas
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp (136422 => 136423)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp 2012-12-03 19:17:32 UTC (rev 136422)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp 2012-12-03 19:36:47 UTC (rev 136423)
@@ -380,12 +380,6 @@
}
}
-// FIXME: Remove this as part of https://bugs.webkit.org/show_bug.cgi?id=102733.
-PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendImpl::transaction(const Vector<int64_t>& objectStoreIds, unsigned short mode)
-{
- return createTransaction(0, objectStoreIds, mode);
-}
-
PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendImpl::createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, unsigned short mode)
{
RefPtr<IDBTransactionBackendImpl> transaction = IDBTransactionBackendImpl::create(transactionId, objectStoreIds, mode, this);
@@ -441,7 +435,8 @@
}
Vector<int64_t> objectStoreIds;
- RefPtr<IDBTransactionBackendInterface> transactionInterface = transaction(objectStoreIds, IDBTransaction::VERSION_CHANGE);
+ // FIXME: The transactionId needs to be piped in through IDBDatabaseBackendInterface::open().
+ RefPtr<IDBTransactionBackendInterface> transactionInterface = createTransaction(0, objectStoreIds, IDBTransaction::VERSION_CHANGE);
RefPtr<IDBTransactionBackendImpl> transaction = IDBTransactionBackendImpl::from(transactionInterface.get());
if (!transaction->scheduleTask(VersionChangeOperation::create(this, requestedVersion, callbacks, databaseCallbacks, transaction), VersionChangeAbortOperation::create(this, m_metadata.version, m_metadata.intVersion))) {
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h (136422 => 136423)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h 2012-12-03 19:17:32 UTC (rev 136422)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h 2012-12-03 19:36:47 UTC (rev 136423)
@@ -63,8 +63,6 @@
virtual IDBDatabaseMetadata metadata() const;
virtual PassRefPtr<IDBObjectStoreBackendInterface> createObjectStore(int64_t id, const String& name, const IDBKeyPath&, bool autoIncrement, IDBTransactionBackendInterface*, ExceptionCode&);
virtual void deleteObjectStore(int64_t, IDBTransactionBackendInterface*, ExceptionCode&);
- // FIXME: Remove this as part of https://bugs.webkit.org/show_bug.cgi?id=102733.
- virtual PassRefPtr<IDBTransactionBackendInterface> transaction(const Vector<int64_t>&, unsigned short);
virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, unsigned short mode);
virtual void close(PassRefPtr<IDBDatabaseCallbacks>);
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendInterface.h (136422 => 136423)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendInterface.h 2012-12-03 19:17:32 UTC (rev 136422)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendInterface.h 2012-12-03 19:36:47 UTC (rev 136423)
@@ -55,8 +55,6 @@
virtual PassRefPtr<IDBObjectStoreBackendInterface> createObjectStore(int64_t, const String& name, const IDBKeyPath&, bool autoIncrement, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
virtual void deleteObjectStore(int64_t, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
- // FIXME: Remove this as part of https://bugs.webkit.org/show_bug.cgi?id=102733.
- virtual PassRefPtr<IDBTransactionBackendInterface> transaction(const Vector<int64_t>& objectStoreIds, unsigned short mode) = 0;
virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, unsigned short mode) = 0;
virtual void close(PassRefPtr<IDBDatabaseCallbacks>) = 0;
};
Modified: trunk/Source/WebKit/chromium/ChangeLog (136422 => 136423)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-03 19:17:32 UTC (rev 136422)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-03 19:36:47 UTC (rev 136423)
@@ -1,3 +1,22 @@
+2012-12-03 Alec Flett <[email protected]>
+
+ IndexedDB: remove IDBDatabaseBackendInterface::transaction()
+ https://bugs.webkit.org/show_bug.cgi?id=102733
+
+ Reviewed by Darin Fisher.
+
+ Part 3 of a refactor - just remove the proxy code for the now
+ defunct transaction method.
+
+ * public/WebIDBDatabase.h:
+ * src/IDBDatabaseBackendProxy.cpp:
+ * src/IDBDatabaseBackendProxy.h:
+ (IDBDatabaseBackendProxy):
+ * src/WebIDBDatabaseImpl.cpp:
+ * src/WebIDBDatabaseImpl.h:
+ (WebIDBDatabaseImpl):
+ * tests/IDBDatabaseBackendTest.cpp:
+
2012-12-03 Sami Kyostila <[email protected]>
[chromium] Tell WebInputHandlerClient when end of input is reached for current vsync period
Modified: trunk/Source/WebKit/chromium/public/WebIDBDatabase.h (136422 => 136423)
--- trunk/Source/WebKit/chromium/public/WebIDBDatabase.h 2012-12-03 19:17:32 UTC (rev 136422)
+++ trunk/Source/WebKit/chromium/public/WebIDBDatabase.h 2012-12-03 19:36:47 UTC (rev 136423)
@@ -56,14 +56,6 @@
return 0;
}
virtual void deleteObjectStore(long long objectStoreId, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); }
- // FIXME: Remove this as part of https://bugs.webkit.org/show_bug.cgi?id=102733.
- // Transfers ownership of the WebIDBTransaction to the caller.
- virtual WebIDBTransaction* transaction(const WebVector<long long>&, unsigned short mode)
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return 0;
- }
- // Transfers ownership of the WebIDBTransaction to the caller.
virtual WebIDBTransaction* createTransaction(long long id, const WebVector<long long>&, unsigned short mode) { WEBKIT_ASSERT_NOT_REACHED(); return 0; }
virtual void close() { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void forceClose() { WEBKIT_ASSERT_NOT_REACHED(); }
Modified: trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp (136422 => 136423)
--- trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp 2012-12-03 19:17:32 UTC (rev 136422)
+++ trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp 2012-12-03 19:36:47 UTC (rev 136423)
@@ -85,16 +85,6 @@
m_webIDBDatabase->deleteObjectStore(objectStoreId, *transactionProxy->getWebIDBTransaction(), ec);
}
-// FIXME: Remove this as part of https://bugs.webkit.org/show_bug.cgi?id=102733.
-PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendProxy::transaction(const Vector<int64_t>& objectStoreIds, unsigned short mode)
-{
- OwnPtr<WebIDBTransaction> transaction = adoptPtr(m_webIDBDatabase->transaction(objectStoreIds, mode));
- if (!transaction)
- return 0;
-
- return IDBTransactionBackendProxy::create(transaction.release());
-}
-
PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendProxy::createTransaction(int64_t id, const Vector<int64_t>& objectStoreIds, unsigned short mode)
{
OwnPtr<WebIDBTransaction> transaction = adoptPtr(m_webIDBDatabase->createTransaction(id, objectStoreIds, mode));
Modified: trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h (136422 => 136423)
--- trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h 2012-12-03 19:17:32 UTC (rev 136422)
+++ trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h 2012-12-03 19:36:47 UTC (rev 136423)
@@ -46,8 +46,6 @@
virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> createObjectStore(int64_t, const String& name, const WebCore::IDBKeyPath&, bool autoIncrement, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
virtual void deleteObjectStore(int64_t, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
- // FIXME: Remove this as part of https://bugs.webkit.org/show_bug.cgi?id=102733.
- virtual PassRefPtr<WebCore::IDBTransactionBackendInterface> transaction(const Vector<int64_t>&, unsigned short mode);
virtual PassRefPtr<WebCore::IDBTransactionBackendInterface> createTransaction(int64_t, const Vector<int64_t>&, unsigned short mode);
virtual void close(PassRefPtr<WebCore::IDBDatabaseCallbacks>);
Modified: trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp (136422 => 136423)
--- trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp 2012-12-03 19:17:32 UTC (rev 136422)
+++ trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp 2012-12-03 19:36:47 UTC (rev 136423)
@@ -86,17 +86,6 @@
return new WebIDBTransactionImpl(transaction);
}
-WebIDBTransaction* WebIDBDatabaseImpl::transaction(const WebVector<long long>& objectStoreIds, unsigned short mode)
-{
- Vector<int64_t> objectStoreIdList(objectStoreIds.size());
- for (size_t i = 0; i < objectStoreIds.size(); ++i)
- objectStoreIdList[i] = objectStoreIds[i];
- RefPtr<IDBTransactionBackendInterface> transaction = m_databaseBackend->transaction(objectStoreIdList, mode);
- if (!transaction)
- return 0;
- return new WebIDBTransactionImpl(transaction);
-}
-
void WebIDBDatabaseImpl::close()
{
// Use the callbacks passed in to the constructor so that the backend in
Modified: trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h (136422 => 136423)
--- trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h 2012-12-03 19:17:32 UTC (rev 136422)
+++ trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h 2012-12-03 19:36:47 UTC (rev 136423)
@@ -54,8 +54,6 @@
virtual WebIDBObjectStore* createObjectStore(long long, const WebString& name, const WebIDBKeyPath&, bool autoIncrement, const WebIDBTransaction&, WebExceptionCode&);
virtual void deleteObjectStore(long long objectStoreId, const WebIDBTransaction&, WebExceptionCode&);
- // FIXME: Remove this as part of https://bugs.webkit.org/show_bug.cgi?id=102733.
- virtual WebIDBTransaction* transaction(const WebVector<long long>& names, unsigned short mode);
virtual WebIDBTransaction* createTransaction(long long id, const WebVector<long long>&, unsigned short mode);
virtual void forceClose();
virtual void close();
Modified: trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp (136422 => 136423)
--- trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp 2012-12-03 19:17:32 UTC (rev 136422)
+++ trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp 2012-12-03 19:36:47 UTC (rev 136423)
@@ -152,8 +152,6 @@
virtual PassRefPtr<IDBObjectStoreBackendInterface> createObjectStore(int64_t, const String& name, const IDBKeyPath&, bool autoIncrement, IDBTransactionBackendInterface*, ExceptionCode&) { return 0; }
virtual void deleteObjectStore(const String& name, IDBTransactionBackendInterface*, ExceptionCode&) { }
virtual void deleteObjectStore(int64_t, IDBTransactionBackendInterface*, ExceptionCode&) { }
- // FIXME: Remove this as part of https://bugs.webkit.org/show_bug.cgi?id=102733.
- virtual PassRefPtr<IDBTransactionBackendInterface> transaction(const Vector<int64_t>&, unsigned short mode) { return 0; }
virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t, const Vector<int64_t>&, unsigned short mode) { return 0; }
virtual void close(PassRefPtr<IDBDatabaseCallbacks>)