Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (141437 => 141438)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-31 18:38:46 UTC (rev 141437)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-31 18:39:24 UTC (rev 141438)
@@ -1,3 +1,21 @@
+2013-01-31 Alec Flett <[email protected]>
+
+ 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 <[email protected]>
[chromium] Remove dead transitional code from WebViewImpl
Modified: trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp (141437 => 141438)
--- trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp 2013-01-31 18:38:46 UTC (rev 141437)
+++ trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp 2013-01-31 18:39:24 UTC (rev 141438)
@@ -84,22 +84,14 @@
m_callbacks->onSuccess(new WebIDBCursorImpl(idbCursorBackend), key, primaryKey, value);
}
-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);
+ m_callbacks->onSuccess(impl, metadata);
}
-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);
-}
-
void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBKey> idbKey)
{
m_didComplete = true;
@@ -165,21 +157,13 @@
m_callbacks->onBlocked(existingVersion);
}
-void IDBCallbacksProxy::onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBTransactionBackendInterface> transaction, PassRefPtr<IDBDatabaseBackendInterface> database)
+void IDBCallbacksProxy::onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface> database, const IDBDatabaseMetadata& metadata)
{
ASSERT(m_databaseCallbacks);
- ASSERT(!transaction);
m_didCreateProxy = true;
- m_callbacks->onUpgradeNeeded(oldVersion, 0, new WebIDBDatabaseImpl(database, m_databaseCallbacks));
+ m_callbacks->onUpgradeNeeded(oldVersion, new WebIDBDatabaseImpl(database, m_databaseCallbacks), metadata);
}
-void IDBCallbacksProxy::onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface> database, const IDBDatabaseMetadata&)
-{
- ASSERT(m_databaseCallbacks);
- m_didCreateProxy = true;
- m_callbacks->onUpgradeNeeded(oldVersion, 0, new WebIDBDatabaseImpl(database, m_databaseCallbacks));
-}
-
void IDBCallbacksProxy::setDatabaseCallbacks(PassRefPtr<IDBDatabaseCallbacksProxy> databaseCallbacks)
{
ASSERT(!m_databaseCallbacks);
Modified: trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.h (141437 => 141438)
--- trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.h 2013-01-31 18:38:46 UTC (rev 141437)
+++ trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.h 2013-01-31 18:39:24 UTC (rev 141438)
@@ -49,7 +49,6 @@
virtual void onError(PassRefPtr<WebCore::IDBDatabaseError>);
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>);
virtual void onSuccess(PassRefPtr<WebCore::SerializedScriptValue>);
@@ -59,7 +58,6 @@
virtual void onSuccess(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBKey> primaryKey, PassRefPtr<WebCore::SerializedScriptValue>);
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&);
void setDatabaseCallbacks(PassRefPtr<IDBDatabaseCallbacksProxy>);
Modified: trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp (141437 => 141438)
--- trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp 2013-01-31 18:38:46 UTC (rev 141437)
+++ trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp 2013-01-31 18:39:24 UTC (rev 141438)
@@ -71,18 +71,6 @@
m_callbacks->onSuccess(IDBCursorBackendProxy::create(adoptPtr(cursor)), key, primaryKey, value);
}
-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)
{
if (m_databaseProxy) {
@@ -128,12 +116,6 @@
m_callbacks->onBlocked(oldVersion);
}
-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)
{
m_databaseProxy = IDBDatabaseBackendProxy::create(adoptPtr(database));
Modified: trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.h (141437 => 141438)
--- trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.h 2013-01-31 18:38:46 UTC (rev 141437)
+++ trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.h 2013-01-31 18:39:24 UTC (rev 141438)
@@ -49,7 +49,6 @@
virtual void onError(const WebIDBDatabaseError&);
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&);
virtual void onSuccess(const WebSerializedScriptValue&);
@@ -58,7 +57,6 @@
virtual void onSuccess(long long);
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&);
private:
