Title: [114981] trunk/Source
Revision
114981
Author
commit-qu...@webkit.org
Date
2012-04-23 18:50:07 -0700 (Mon, 23 Apr 2012)

Log Message

IndexedDB: remove IDB(Index|ObjectStore)BackendImpl::get/getKey for IDBKey
https://bugs.webkit.org/show_bug.cgi?id=84285

Patch by Alec Flett <alecfl...@chromium.org> on 2012-04-23
Reviewed by Dimitri Glazkov.

Source/WebCore:

No new tests required, this code is no longer called.

This is old code supporting IDBKey-based lookup, supplanted by
IDBKeyRange. Now that chromium IPC/proxy code has landed,
these functions can be removed.

* Modules/indexeddb/IDBIndexBackendInterface.h:
(IDBIndexBackendInterface):
* Modules/indexeddb/IDBObjectStoreBackendInterface.h:
(IDBObjectStoreBackendInterface):

Source/WebKit/chromium:

This is old code supporting IDBKey-based lookup, supplanted by
IDBKeyRange. Now that chromium IPC/proxy code has landed,
these functions can be removed.

* public/WebIDBIndex.h:
* public/WebIDBObjectStore.h:
* src/IDBIndexBackendProxy.cpp:
* src/IDBIndexBackendProxy.h:
(IDBIndexBackendProxy):
* src/IDBObjectStoreBackendProxy.cpp:
* src/IDBObjectStoreBackendProxy.h:
(IDBObjectStoreBackendProxy):
* src/WebIDBIndexImpl.cpp:
* src/WebIDBIndexImpl.h:
(WebIDBIndexImpl):
* src/WebIDBObjectStoreImpl.cpp:
* src/WebIDBObjectStoreImpl.h:
(WebIDBObjectStoreImpl):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (114980 => 114981)


--- trunk/Source/WebCore/ChangeLog	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebCore/ChangeLog	2012-04-24 01:50:07 UTC (rev 114981)
@@ -1,3 +1,21 @@
+2012-04-23  Alec Flett  <alecfl...@chromium.org>
+
+        IndexedDB: remove IDB(Index|ObjectStore)BackendImpl::get/getKey for IDBKey
+        https://bugs.webkit.org/show_bug.cgi?id=84285
+
+        Reviewed by Dimitri Glazkov.
+
+        No new tests required, this code is no longer called.
+
+        This is old code supporting IDBKey-based lookup, supplanted by
+        IDBKeyRange. Now that chromium IPC/proxy code has landed,
+        these functions can be removed.
+
+        * Modules/indexeddb/IDBIndexBackendInterface.h:
+        (IDBIndexBackendInterface):
+        * Modules/indexeddb/IDBObjectStoreBackendInterface.h:
+        (IDBObjectStoreBackendInterface):
+
 2012-04-22  Martin Robinson  <mrobin...@igalia.com>
 
         REGRESSION(113604): [Soup] Some pages that use synchronous XMLHttpRequests freeze the browser

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBIndexBackendInterface.h (114980 => 114981)


--- trunk/Source/WebCore/Modules/indexeddb/IDBIndexBackendInterface.h	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBIndexBackendInterface.h	2012-04-24 01:50:07 UTC (rev 114981)
@@ -55,9 +55,7 @@
     virtual void count(PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
     virtual void openKeyCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
     virtual void get(PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
-    virtual void get(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
     virtual void getKey(PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
-    virtual void getKey(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
 };
 
 } // namespace WebCore

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendInterface.h (114980 => 114981)


--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendInterface.h	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendInterface.h	2012-04-24 01:50:07 UTC (rev 114981)
@@ -52,7 +52,6 @@
     virtual PassRefPtr<DOMStringList> indexNames() const = 0;
 
     virtual void get(PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
-    virtual void get(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
 
     enum PutMode {
         AddOrUpdate,

Modified: trunk/Source/WebKit/chromium/ChangeLog (114980 => 114981)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-04-24 01:50:07 UTC (rev 114981)
@@ -1,3 +1,29 @@
+2012-04-23  Alec Flett  <alecfl...@chromium.org>
+
+        IndexedDB: remove IDB(Index|ObjectStore)BackendImpl::get/getKey for IDBKey
+        https://bugs.webkit.org/show_bug.cgi?id=84285
+
+        Reviewed by Dimitri Glazkov.
+
+        This is old code supporting IDBKey-based lookup, supplanted by
+        IDBKeyRange. Now that chromium IPC/proxy code has landed,
+        these functions can be removed.
+
+        * public/WebIDBIndex.h:
+        * public/WebIDBObjectStore.h:
+        * src/IDBIndexBackendProxy.cpp:
+        * src/IDBIndexBackendProxy.h:
+        (IDBIndexBackendProxy):
+        * src/IDBObjectStoreBackendProxy.cpp:
+        * src/IDBObjectStoreBackendProxy.h:
+        (IDBObjectStoreBackendProxy):
+        * src/WebIDBIndexImpl.cpp:
+        * src/WebIDBIndexImpl.h:
+        (WebIDBIndexImpl):
+        * src/WebIDBObjectStoreImpl.cpp:
+        * src/WebIDBObjectStoreImpl.h:
+        (WebIDBObjectStoreImpl):
+
 2012-04-23  Eriq Augustine  <eaugu...@chromium.org>
 
         Return value from executed script in Chromium.

Modified: trunk/Source/WebKit/chromium/public/WebIDBIndex.h (114980 => 114981)


--- trunk/Source/WebKit/chromium/public/WebIDBIndex.h	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebKit/chromium/public/WebIDBIndex.h	2012-04-24 01:50:07 UTC (rev 114981)
@@ -77,9 +77,7 @@
     virtual void openKeyCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void count(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void getObject(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
-    virtual void getObject(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void getKey(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
-    virtual void getKey(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
 
 protected:
     WebIDBIndex() {}

Modified: trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h (114980 => 114981)


--- trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h	2012-04-24 01:50:07 UTC (rev 114981)
@@ -65,8 +65,6 @@
         return WebDOMStringList();
     }
 
-    virtual void get(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
-
     virtual void get(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
 
     enum PutMode {

Modified: trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.cpp (114980 => 114981)


--- trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.cpp	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.cpp	2012-04-24 01:50:07 UTC (rev 114981)
@@ -112,14 +112,6 @@
     m_webIDBIndex->getObject(keyRange, new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction(), ec);
 }
 
-void IDBIndexBackendProxy::get(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, 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_webIDBIndex->getObject(key, new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction(), ec);
-}
-
 void IDBIndexBackendProxy::getKey(PassRefPtr<IDBKeyRange> keyRange, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
 {
     // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
@@ -128,14 +120,6 @@
     m_webIDBIndex->getKey(keyRange, new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction(), ec);
 }
 
-void IDBIndexBackendProxy::getKey(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, 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_webIDBIndex->getKey(key, new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction(), ec);
-}
-
 } // namespace WebKit
 
 #endif // ENABLE(INDEXED_DATABASE)

Modified: trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.h (114980 => 114981)


--- trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.h	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.h	2012-04-24 01:50:07 UTC (rev 114981)
@@ -51,9 +51,7 @@
     virtual void openKeyCursor(PassRefPtr<WebCore::IDBKeyRange>, unsigned short direction, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
     virtual void count(PassRefPtr<WebCore::IDBKeyRange>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
     virtual void get(PassRefPtr<WebCore::IDBKeyRange>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
-    virtual void get(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
     virtual void getKey(PassRefPtr<WebCore::IDBKeyRange>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
-    virtual void getKey(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
 
 private:
     IDBIndexBackendProxy(PassOwnPtr<WebIDBIndex>);

Modified: trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp (114980 => 114981)


--- trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp	2012-04-24 01:50:07 UTC (rev 114981)
@@ -74,14 +74,6 @@
     return m_webIDBObjectStore->indexNames();
 }
 
-void IDBObjectStoreBackendProxy::get(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, 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_webIDBObjectStore->get(key, new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction(), ec);
-}
-
 void IDBObjectStoreBackendProxy::get(PassRefPtr<IDBKeyRange> keyRange, PassRefPtr<IDBCallbacks> callbacks, 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/IDBObjectStoreBackendProxy.h (114980 => 114981)


--- trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.h	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.h	2012-04-24 01:50:07 UTC (rev 114981)
@@ -46,7 +46,6 @@
     virtual String keyPath() const;
     virtual PassRefPtr<WebCore::DOMStringList> indexNames() const;
 
-    virtual void get(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
     virtual void get(PassRefPtr<WebCore::IDBKeyRange>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
     virtual void put(PassRefPtr<WebCore::SerializedScriptValue>, PassRefPtr<WebCore::IDBKey>, PutMode, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
     virtual void deleteFunction(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);

Modified: trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.cpp (114980 => 114981)


--- trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.cpp	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.cpp	2012-04-24 01:50:07 UTC (rev 114981)
@@ -88,21 +88,11 @@
     m_backend->count(keyRange, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
 }
 
-void WebIDBIndexImpl::getObject(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
-{
-    m_backend->get(key, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
-}
-
 void WebIDBIndexImpl::getObject(const WebIDBKeyRange& keyRange, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
 {
     m_backend->get(keyRange, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
 }
 
-void WebIDBIndexImpl::getKey(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
-{
-    m_backend->getKey(key, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
-}
-
 void WebIDBIndexImpl::getKey(const WebIDBKeyRange& keyRange, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
 {
     m_backend->getKey(keyRange, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);

Modified: trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.h (114980 => 114981)


--- trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.h	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.h	2012-04-24 01:50:07 UTC (rev 114981)
@@ -52,9 +52,7 @@
     virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&); 
     virtual void openKeyCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
     virtual void count(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
-    virtual void getObject(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
     virtual void getObject(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
-    virtual void getKey(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
     virtual void getKey(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
 
 private:

Modified: trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp (114980 => 114981)


--- trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp	2012-04-24 01:50:07 UTC (rev 114981)
@@ -67,11 +67,6 @@
     return m_objectStore->indexNames();
 }
 
-void WebIDBObjectStoreImpl::get(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
-{
-    m_objectStore->get(key, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
-}
-
 void WebIDBObjectStoreImpl::get(const WebIDBKeyRange& keyRange, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
 {
     m_objectStore->get(keyRange, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);

Modified: trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h (114980 => 114981)


--- trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h	2012-04-24 01:33:00 UTC (rev 114980)
+++ trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h	2012-04-24 01:50:07 UTC (rev 114981)
@@ -49,7 +49,6 @@
     WebString keyPathString() const;
     WebDOMStringList indexNames() const;
 
-    void get(const WebIDBKey& key, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
     void get(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
     void put(const WebSerializedScriptValue&, const WebIDBKey&, PutMode, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
     void deleteFunction(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to