Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (134435 => 134436)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-13 18:02:13 UTC (rev 134435)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-13 18:19:00 UTC (rev 134436)
@@ -1,3 +1,26 @@
+2012-11-13 Alec Flett <[email protected]>
+
+ IndexedDB: remove legacy string-based backend methods
+ https://bugs.webkit.org/show_bug.cgi?id=102004
+
+ Reviewed by Adam Barth.
+
+ This is the final stage in a refactor, preceded by
+ https://bugs.webkit.org/show_bug.cgi?id=100426
+
+ * public/WebIDBDatabase.h:
+ (WebKit::WebIDBDatabase::createObjectStore):
+ * public/WebIDBObjectStore.h:
+ (WebKit::WebIDBObjectStore::createIndex):
+ (WebKit::WebIDBObjectStore::index):
+ * public/WebIDBTransaction.h:
+ * src/IDBDatabaseBackendProxy.cpp:
+ * src/IDBDatabaseBackendProxy.h:
+ (IDBDatabaseBackendProxy):
+ * src/IDBTransactionBackendProxy.cpp:
+ * src/IDBTransactionBackendProxy.h:
+ (IDBTransactionBackendProxy):
+
2012-11-13 Dimitri Glazkov <[email protected]>
Unreviewed, rolling out r134391.
Modified: trunk/Source/WebKit/chromium/public/WebIDBDatabase.h (134435 => 134436)
--- trunk/Source/WebKit/chromium/public/WebIDBDatabase.h 2012-11-13 18:02:13 UTC (rev 134435)
+++ trunk/Source/WebKit/chromium/public/WebIDBDatabase.h 2012-11-13 18:19:00 UTC (rev 134436)
@@ -55,15 +55,9 @@
WEBKIT_ASSERT_NOT_REACHED();
return 0;
}
- virtual void deleteObjectStore(const WebString& name, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void deleteObjectStore(long long objectStoreId, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void setVersion(const WebString& version, WebIDBCallbacks* callbacks, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
// Transfers ownership of the WebIDBTransaction to the caller.
- virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, WebExceptionCode& ec)
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return 0;
- }
virtual WebIDBTransaction* transaction(const WebVector<long long>&, unsigned short mode)
{
WEBKIT_ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h (134435 => 134436)
--- trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h 2012-11-13 18:02:13 UTC (rev 134435)
+++ trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h 2012-11-13 18:19:00 UTC (rev 134436)
@@ -55,7 +55,6 @@
typedef WebVector<WebIDBKey> WebIndexKeys;
- virtual void putWithIndexKeys(const WebSerializedScriptValue&, const WebIDBKey&, PutMode, WebIDBCallbacks*, const WebIDBTransaction&, const WebVector<WebString>& indexNames, const WebVector<WebIndexKeys>&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void put(const WebSerializedScriptValue&, const WebIDBKey&, PutMode, WebIDBCallbacks*, const WebIDBTransaction&, const WebVector<long long>& indexIds, const WebVector<WebIndexKeys>&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void deleteFunction(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void clear(WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
@@ -69,22 +68,14 @@
WEBKIT_ASSERT_NOT_REACHED();
return 0;
}
- virtual void setIndexKeys(const WebIDBKey&, const WebVector<WebString>&, const WebVector<WebIndexKeys>&, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void setIndexKeys(const WebIDBKey&, const WebVector<long long>&, const WebVector<WebIndexKeys>&, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void setIndexesReady(const WebVector<WebString>&, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); };
virtual void setIndexesReady(const WebVector<long long>&, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); };
// Transfers ownership of the WebIDBIndex to the caller.
- virtual WebIDBIndex* index(const WebString& name, WebExceptionCode&)
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return 0;
- }
virtual WebIDBIndex* index(long long)
{
WEBKIT_ASSERT_NOT_REACHED();
return 0;
}
- virtual void deleteIndex(const WebString& name, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void deleteIndex(long long indexId, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void openCursor(const WebIDBKeyRange&, WebIDBCursor::Direction direction, WebIDBCallbacks*, WebIDBTransaction::TaskType, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void count(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
Modified: trunk/Source/WebKit/chromium/public/WebIDBTransaction.h (134435 => 134436)
--- trunk/Source/WebKit/chromium/public/WebIDBTransaction.h 2012-11-13 18:02:13 UTC (rev 134435)
+++ trunk/Source/WebKit/chromium/public/WebIDBTransaction.h 2012-11-13 18:19:00 UTC (rev 134436)
@@ -46,11 +46,6 @@
PreemptiveTask
};
- virtual WebIDBObjectStore* objectStore(const WebString& name, WebExceptionCode&)
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return 0;
- }
virtual WebIDBObjectStore* objectStore(long long, WebExceptionCode&)
{
WEBKIT_ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp (134435 => 134436)
--- trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp 2012-11-13 18:02:13 UTC (rev 134435)
+++ trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp 2012-11-13 18:19:00 UTC (rev 134436)
@@ -77,14 +77,6 @@
return IDBObjectStoreBackendProxy::create(objectStore.release());
}
-void IDBDatabaseBackendProxy::deleteObjectStore(const String& name, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
-{
- // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
- // all implementations of IDB interfaces are proxy objects.
- IDBTransactionBackendProxy* transactionProxy = static_cast<IDBTransactionBackendProxy*>(transaction);
- m_webIDBDatabase->deleteObjectStore(name, *transactionProxy->getWebIDBTransaction(), ec);
-}
-
void IDBDatabaseBackendProxy::deleteObjectStore(int64_t objectStoreId, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
{
// The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
Modified: trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h (134435 => 134436)
--- trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h 2012-11-13 18:02:13 UTC (rev 134435)
+++ trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h 2012-11-13 18:19:00 UTC (rev 134436)
@@ -45,7 +45,6 @@
virtual WebCore::IDBDatabaseMetadata metadata() const;
virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> createObjectStore(int64_t, const String& name, const WebCore::IDBKeyPath&, bool autoIncrement, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
- virtual void deleteObjectStore(const String& name, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
virtual void deleteObjectStore(int64_t, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
virtual void setVersion(const String& version, PassRefPtr<WebCore::IDBCallbacks>, PassRefPtr<WebCore::IDBDatabaseCallbacks>, WebCore::ExceptionCode&);
virtual PassRefPtr<WebCore::IDBTransactionBackendInterface> transaction(const Vector<int64_t>&, unsigned short mode);
Modified: trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.cpp (134435 => 134436)
--- trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.cpp 2012-11-13 18:02:13 UTC (rev 134435)
+++ trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.cpp 2012-11-13 18:19:00 UTC (rev 134436)
@@ -54,14 +54,6 @@
{
}
-PassRefPtr<IDBObjectStoreBackendInterface> IDBTransactionBackendProxy::objectStore(const String& name, ExceptionCode& ec)
-{
- OwnPtr<WebIDBObjectStore> objectStore = adoptPtr(m_webIDBTransaction->objectStore(name, ec));
- if (!objectStore)
- return 0;
- return IDBObjectStoreBackendProxy::create(objectStore.release());
-}
-
PassRefPtr<WebCore::IDBObjectStoreBackendInterface> IDBTransactionBackendProxy::objectStore(int64_t indexId, ExceptionCode& ec)
{
OwnPtr<WebIDBObjectStore> objectStore = adoptPtr(m_webIDBTransaction->objectStore(indexId, ec));
Modified: trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h (134435 => 134436)
--- trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h 2012-11-13 18:02:13 UTC (rev 134435)
+++ trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h 2012-11-13 18:19:00 UTC (rev 134436)
@@ -41,7 +41,6 @@
static PassRefPtr<IDBTransactionBackendInterface> create(PassOwnPtr<WebIDBTransaction>);
virtual ~IDBTransactionBackendProxy();
- virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> objectStore(const String& name, WebCore::ExceptionCode&);
virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> objectStore(int64_t, WebCore::ExceptionCode&);
virtual void commit();
virtual void abort();
