Changeset 141438 in webkit

Timestamp:

Jan 31, 2013 10:39:24 AM (11 years ago)

Author:

alecflett@chromium.org

Message:

IndexedDB: Remove WebKit API for old onSuccess/onUpgradeNeeded
​https://bugs.webkit.org/show_bug.cgi?id=108399

Reviewed by Dimitri Glazkov.

Cleanup now that chromium proxies the new signatures through.

• src/IDBCallbacksProxy.cpp:

(WebKit::IDBCallbacksProxy::onSuccess):
(WebKit::IDBCallbacksProxy::onUpgradeNeeded):

• src/IDBCallbacksProxy.h:

(IDBCallbacksProxy):

• src/WebIDBCallbacksImpl.cpp:
• src/WebIDBCallbacksImpl.h:

(WebIDBCallbacksImpl):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/IDBCallbacksProxy.cpp (modified) (2 diffs)
• src/IDBCallbacksProxy.h (modified) (2 diffs)
• src/WebIDBCallbacksImpl.cpp (modified) (2 diffs)
• src/WebIDBCallbacksImpl.h (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-31  Alec Flett  <alecflett@chromium.org>
+
+        IndexedDB: Remove WebKit API for old onSuccess/onUpgradeNeeded
+        https://bugs.webkit.org/show_bug.cgi?id=108399
+
+        Reviewed by Dimitri Glazkov.
+
+        Cleanup now that chromium proxies the new signatures through.
+
+        * src/IDBCallbacksProxy.cpp:
+        (WebKit::IDBCallbacksProxy::onSuccess):
+        (WebKit::IDBCallbacksProxy::onUpgradeNeeded):
+        * src/IDBCallbacksProxy.h:
+        (IDBCallbacksProxy):
+        * src/WebIDBCallbacksImpl.cpp:
+        * src/WebIDBCallbacksImpl.h:
+        (WebIDBCallbacksImpl):
+
 2013-01-31  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp

@@ -85 +85 @@
 }
 
-void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> backend)
+void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> backend, const IDBDatabaseMetadata& metadata)
 {
     ASSERT(m_databaseCallbacks.get());
     m_didComplete = true;
     WebIDBDatabaseImpl* impl = m_didCreateProxy ? 0 : new WebIDBDatabaseImpl(backend, m_databaseCallbacks.release());
-    m_callbacks->onSuccess(impl);
-}
-
-void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> backend, const IDBDatabaseMetadata&)
-{
-    ASSERT(m_databaseCallbacks.get());
-    m_didComplete = true;
-    WebIDBDatabaseImpl* impl = m_didCreateProxy ? 0 : new WebIDBDatabaseImpl(backend, m_databaseCallbacks.release());
-    m_callbacks->onSuccess(impl);
+    m_callbacks->onSuccess(impl, metadata);
 }
 
@@ -166 +158 @@
 }
 
-void IDBCallbacksProxy::onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBTransactionBackendInterface> transaction, PassRefPtr<IDBDatabaseBackendInterface> database)
-{
-    ASSERT(m_databaseCallbacks);
-    ASSERT(!transaction);
-    m_didCreateProxy = true;
-    m_callbacks->onUpgradeNeeded(oldVersion, 0, new WebIDBDatabaseImpl(database, m_databaseCallbacks));
-}
-
-void IDBCallbacksProxy::onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface> database, const IDBDatabaseMetadata&)
+void IDBCallbacksProxy::onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface> database, const IDBDatabaseMetadata& metadata)
 {
     ASSERT(m_databaseCallbacks);
     m_didCreateProxy = true;
-    m_callbacks->onUpgradeNeeded(oldVersion, 0, new WebIDBDatabaseImpl(database, m_databaseCallbacks));
+    m_callbacks->onUpgradeNeeded(oldVersion, new WebIDBDatabaseImpl(database, m_databaseCallbacks), metadata);
 }
 

trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.h

@@ -50 +50 @@
     virtual void onSuccess(PassRefPtr<WebCore::DOMStringList>);
     virtual void onSuccess(PassRefPtr<WebCore::IDBCursorBackendInterface>, PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBKey> primaryKey, PassRefPtr<WebCore::SerializedScriptValue>);
-    virtual void onSuccess(PassRefPtr<WebCore::IDBDatabaseBackendInterface>);
     virtual void onSuccess(PassRefPtr<WebCore::IDBDatabaseBackendInterface>, const WebCore::IDBDatabaseMetadata&);
     virtual void onSuccess(PassRefPtr<WebCore::IDBKey>);
@@ -60 +59 @@
     virtual void onSuccessWithPrefetch(const Vector<RefPtr<WebCore::IDBKey> >& keys, const Vector<RefPtr<WebCore::IDBKey> >& primaryKeys, const Vector<RefPtr<WebCore::SerializedScriptValue> >& values);
     virtual void onBlocked(int64_t existingVersion);
-    virtual void onUpgradeNeeded(int64_t oldVersion, PassRefPtr<WebCore::IDBTransactionBackendInterface>, PassRefPtr<WebCore::IDBDatabaseBackendInterface>);
     virtual void onUpgradeNeeded(int64_t oldVersion, PassRefPtr<WebCore::IDBDatabaseBackendInterface>, const WebCore::IDBDatabaseMetadata&);
 

trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp

@@ -72 +72 @@
 }
 
-void WebIDBCallbacksImpl::onSuccess(WebIDBDatabase* webKitInstance)
-{
-    if (m_databaseProxy) {
-        IDBDatabaseMetadata metadata = m_databaseProxy->metadata();
-        m_callbacks->onSuccess(m_databaseProxy.release(), metadata);
-        return;
-    }
-    RefPtr<IDBDatabaseBackendInterface> localDatabaseProxy = IDBDatabaseBackendProxy::create(adoptPtr(webKitInstance));
-    IDBDatabaseMetadata metadata = localDatabaseProxy->metadata();
-    m_callbacks->onSuccess(localDatabaseProxy.release(), metadata);
-}
-
 void WebIDBCallbacksImpl::onSuccess(WebIDBDatabase* webKitInstance, const WebIDBMetadata& metadata)
 {
@@ -129 +117 @@
 }
 
-void WebIDBCallbacksImpl::onUpgradeNeeded(long long oldVersion, WebIDBTransaction*, WebIDBDatabase* database)
-{
-    m_databaseProxy = IDBDatabaseBackendProxy::create(adoptPtr(database));
-    m_callbacks->onUpgradeNeeded(oldVersion, m_databaseProxy, m_databaseProxy->metadata());
-}
-
 void WebIDBCallbacksImpl::onUpgradeNeeded(long long oldVersion, WebIDBDatabase* database, const WebIDBMetadata& metadata)
 {

trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.h

@@ -50 +50 @@
     virtual void onSuccess(const WebDOMStringList&);
     virtual void onSuccess(WebIDBCursor*, const WebIDBKey&, const WebIDBKey& primaryKey, const WebSerializedScriptValue&);
-    virtual void onSuccess(WebIDBDatabase*);
     virtual void onSuccess(WebIDBDatabase*, const WebIDBMetadata&);
     virtual void onSuccess(const WebIDBKey&);
@@ -59 +58 @@
     virtual void onSuccess();
     virtual void onBlocked(long long oldVersion);
-    virtual void onUpgradeNeeded(long long oldVersion, WebIDBTransaction*, WebIDBDatabase*);
     virtual void onUpgradeNeeded(long long oldVersion, WebIDBDatabase*, const WebIDBMetadata&);