Title: [141058] trunk/Source
Revision
141058
Author
[email protected]
Date
2013-01-28 22:55:27 -0800 (Mon, 28 Jan 2013)

Log Message

Unreviewed, rolling out r141049.
http://trac.webkit.org/changeset/141049
https://bugs.webkit.org/show_bug.cgi?id=108151

Caused some indexed tests to crash. (Requested by keishi on
#webkit).

Patch by Sheriff Bot <[email protected]> on 2013-01-28

Source/WebCore:

* Modules/indexeddb/IDBCallbacks.h:
(WebCore::IDBCallbacks::onUpgradeNeeded):
(WebCore::IDBCallbacks::onSuccess):
* Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
(WebCore::IDBDatabaseBackendImpl::VersionChangeOperation::perform):
(WebCore::IDBDatabaseBackendImpl::processPendingCalls):
(WebCore::IDBDatabaseBackendImpl::openConnection):
* Modules/indexeddb/IDBOpenDBRequest.cpp:
(WebCore::IDBOpenDBRequest::onUpgradeNeeded):
(WebCore::IDBOpenDBRequest::onSuccess):
* Modules/indexeddb/IDBOpenDBRequest.h:
(IDBOpenDBRequest):

Source/WebKit/chromium:

* public/WebIDBCallbacks.h:
(WebKit):
* src/IDBCallbacksProxy.cpp:
(WebKit::IDBCallbacksProxy::onUpgradeNeeded):
* src/IDBCallbacksProxy.h:
(IDBCallbacksProxy):
* src/WebIDBCallbacksImpl.cpp:
(WebKit::WebIDBCallbacksImpl::onSuccess):
(WebKit::WebIDBCallbacksImpl::onUpgradeNeeded):
* src/WebIDBCallbacksImpl.h:
(WebIDBCallbacksImpl):
* tests/IDBAbortOnCorruptTest.cpp:
(WebCore::MockIDBCallbacks::onSuccess):
* tests/IDBDatabaseBackendTest.cpp:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (141057 => 141058)


--- trunk/Source/WebCore/ChangeLog	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebCore/ChangeLog	2013-01-29 06:55:27 UTC (rev 141058)
@@ -1,3 +1,25 @@
+2013-01-28  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r141049.
+        http://trac.webkit.org/changeset/141049
+        https://bugs.webkit.org/show_bug.cgi?id=108151
+
+        Caused some indexed tests to crash. (Requested by keishi on
+        #webkit).
+
+        * Modules/indexeddb/IDBCallbacks.h:
+        (WebCore::IDBCallbacks::onUpgradeNeeded):
+        (WebCore::IDBCallbacks::onSuccess):
+        * Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
+        (WebCore::IDBDatabaseBackendImpl::VersionChangeOperation::perform):
+        (WebCore::IDBDatabaseBackendImpl::processPendingCalls):
+        (WebCore::IDBDatabaseBackendImpl::openConnection):
+        * Modules/indexeddb/IDBOpenDBRequest.cpp:
+        (WebCore::IDBOpenDBRequest::onUpgradeNeeded):
+        (WebCore::IDBOpenDBRequest::onSuccess):
+        * Modules/indexeddb/IDBOpenDBRequest.h:
+        (IDBOpenDBRequest):
+
 2013-01-28  Adam Barth  <[email protected]>
 
         Layout Test http/tests/workers/terminate-during-sync-operation.html is flaky

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h (141057 => 141058)


--- trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h	2013-01-29 06:55:27 UTC (rev 141058)
@@ -71,8 +71,8 @@
     // From IDBFactory.open()/deleteDatabase()
     virtual void onBlocked(int64_t existingVersion) { ASSERT_NOT_REACHED(); }
     // From IDBFactory.open()
-    virtual void onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&) { ASSERT_NOT_REACHED(); }
-    virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&) { ASSERT_NOT_REACHED(); }
+    virtual void onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBTransactionBackendInterface>, PassRefPtr<IDBDatabaseBackendInterface>) { ASSERT_NOT_REACHED(); }
+    virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>) { ASSERT_NOT_REACHED(); }
 };
 
 } // namespace WebCore

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp (141057 => 141058)


--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp	2013-01-29 06:55:27 UTC (rev 141058)
@@ -1066,7 +1066,7 @@
     }
     ASSERT(!m_database->m_pendingSecondHalfOpen);
     m_database->m_pendingSecondHalfOpen = PendingOpenCall::create(m_callbacks, m_databaseCallbacks, m_transactionId, m_version);
-    m_callbacks->onUpgradeNeeded(oldVersion, m_database, m_database->metadata());
+    m_callbacks->onUpgradeNeeded(oldVersion, transaction, m_database);
 }
 
 void IDBDatabaseBackendImpl::transactionStarted(PassRefPtr<IDBTransactionBackendImpl> prpTransaction)
@@ -1123,7 +1123,7 @@
     if (m_pendingSecondHalfOpen) {
         ASSERT(m_pendingSecondHalfOpen->version() == m_metadata.intVersion);
         ASSERT(m_metadata.id != InvalidId);
-        m_pendingSecondHalfOpen->callbacks()->onSuccess(this, this->metadata());
+        m_pendingSecondHalfOpen->callbacks()->onSuccess(this);
         m_pendingSecondHalfOpen.release();
         // Fall through when complete, as pending deletes may be (partially) unblocked.
     }
@@ -1204,14 +1204,14 @@
         // For unit tests only - skip upgrade steps. Calling from script with DefaultIntVersion throws exception.
         ASSERT(isNewDatabase);
         m_databaseCallbacksSet.add(databaseCallbacks);
-        callbacks->onSuccess(this, this->metadata());
+        callbacks->onSuccess(this);
         return;
     }
 
     if (version == IDBDatabaseMetadata::NoIntVersion) {
         if (!isNewDatabase) {
             m_databaseCallbacksSet.add(RefPtr<IDBDatabaseCallbacks>(databaseCallbacks));
-            callbacks->onSuccess(this, this->metadata());
+            callbacks->onSuccess(this);
             return;
         }
         // Spec says: If no version is specified and no database exists, set database version to 1.
@@ -1228,7 +1228,7 @@
     }
     ASSERT(version == m_metadata.intVersion);
     m_databaseCallbacksSet.add(databaseCallbacks);
-    callbacks->onSuccess(this, this->metadata());
+    callbacks->onSuccess(this);
 }
 
 void IDBDatabaseBackendImpl::runIntVersionChangeTransaction(PassRefPtr<IDBCallbacks> prpCallbacks, PassRefPtr<IDBDatabaseCallbacks> prpDatabaseCallbacks, int64_t transactionId, int64_t requestedVersion)

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp (141057 => 141058)


--- trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp	2013-01-29 06:55:27 UTC (rev 141058)
@@ -70,7 +70,7 @@
     enqueueEvent(IDBVersionChangeEvent::create(IDBAny::create(oldVersion), newVersionAny.release(), eventNames().blockedEvent));
 }
 
-void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface> prpDatabaseBackend, const IDBDatabaseMetadata& metadata)
+void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBTransactionBackendInterface>, PassRefPtr<IDBDatabaseBackendInterface> prpDatabaseBackend)
 {
     IDB_TRACE("IDBOpenDBRequest::onUpgradeNeeded()");
     if (m_contextStopped || !scriptExecutionContext()) {
@@ -85,6 +85,9 @@
     ASSERT(m_databaseCallbacks);
 
     RefPtr<IDBDatabaseBackendInterface> databaseBackend = prpDatabaseBackend;
+    // FIXME: This potentially expensive (synchronous) call into the backend could be removed if the metadata
+    // were passed in during the (asynchronous) onUpgradeNeeded call from the backend. http://wkbug.com/103920
+    IDBDatabaseMetadata metadata = databaseBackend->metadata();
 
     RefPtr<IDBDatabase> idbDatabase = IDBDatabase::create(scriptExecutionContext(), databaseBackend, m_databaseCallbacks);
     idbDatabase->setMetadata(metadata);
@@ -95,10 +98,9 @@
         // This database hasn't had an integer version before.
         oldVersion = IDBDatabaseMetadata::DefaultIntVersion;
     }
-    IDBDatabaseMetadata oldMetadata(metadata);
-    oldMetadata.intVersion = oldVersion;
+    metadata.intVersion = oldVersion;
 
-    m_transaction = IDBTransaction::create(scriptExecutionContext(), m_transactionId, idbDatabase.get(), this, oldMetadata);
+    m_transaction = IDBTransaction::create(scriptExecutionContext(), m_transactionId, idbDatabase.get(), this, metadata);
     m_result = IDBAny::create(idbDatabase.release());
 
     if (m_version == IDBDatabaseMetadata::NoIntVersion)
@@ -106,13 +108,16 @@
     enqueueEvent(IDBVersionChangeEvent::create(IDBAny::create(oldVersion), IDBAny::create(m_version), eventNames().upgradeneededEvent));
 }
 
-void IDBOpenDBRequest::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> prpBackend, const IDBDatabaseMetadata& metadata)
+void IDBOpenDBRequest::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> prpBackend)
 {
     IDB_TRACE("IDBOpenDBRequest::onSuccess()");
     if (!shouldEnqueueEvent())
         return;
 
     RefPtr<IDBDatabaseBackendInterface> backend = prpBackend;
+    // FIXME: This potentially expensive (synchronous) call into the backend could be removed if the metadata
+    // were passed in during the (asynchronous) onSuccess call from the backend. http://wkbug.com/103920
+    IDBDatabaseMetadata metadata = backend->metadata();
     RefPtr<IDBDatabase> idbDatabase;
     if (m_result) {
         idbDatabase = m_result->idbDatabase();

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.h (141057 => 141058)


--- trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.h	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.h	2013-01-29 06:55:27 UTC (rev 141058)
@@ -42,8 +42,8 @@
     using IDBRequest::onSuccess;
 
     virtual void onBlocked(int64_t existingVersion) OVERRIDE;
-    virtual void onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&) OVERRIDE;
-    virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&) OVERRIDE;
+    virtual void onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBTransactionBackendInterface>, PassRefPtr<IDBDatabaseBackendInterface>) OVERRIDE;
+    virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>) OVERRIDE;
 
     // EventTarget
     virtual const AtomicString& interfaceName() const;

Modified: trunk/Source/WebKit/chromium/ChangeLog (141057 => 141058)


--- trunk/Source/WebKit/chromium/ChangeLog	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebKit/chromium/ChangeLog	2013-01-29 06:55:27 UTC (rev 141058)
@@ -1,3 +1,27 @@
+2013-01-28  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r141049.
+        http://trac.webkit.org/changeset/141049
+        https://bugs.webkit.org/show_bug.cgi?id=108151
+
+        Caused some indexed tests to crash. (Requested by keishi on
+        #webkit).
+
+        * public/WebIDBCallbacks.h:
+        (WebKit):
+        * src/IDBCallbacksProxy.cpp:
+        (WebKit::IDBCallbacksProxy::onUpgradeNeeded):
+        * src/IDBCallbacksProxy.h:
+        (IDBCallbacksProxy):
+        * src/WebIDBCallbacksImpl.cpp:
+        (WebKit::WebIDBCallbacksImpl::onSuccess):
+        (WebKit::WebIDBCallbacksImpl::onUpgradeNeeded):
+        * src/WebIDBCallbacksImpl.h:
+        (WebIDBCallbacksImpl):
+        * tests/IDBAbortOnCorruptTest.cpp:
+        (WebCore::MockIDBCallbacks::onSuccess):
+        * tests/IDBDatabaseBackendTest.cpp:
+
 2013-01-28  Raman Kumar  <[email protected]>
 
         Expose isRadioButton and isCheckbox API in chromium-webkit glue layer.

Modified: trunk/Source/WebKit/chromium/public/WebIDBCallbacks.h (141057 => 141058)


--- trunk/Source/WebKit/chromium/public/WebIDBCallbacks.h	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebKit/chromium/public/WebIDBCallbacks.h	2013-01-29 06:55:27 UTC (rev 141058)
@@ -40,7 +40,6 @@
 class WebIDBIndex;
 class WebIDBTransaction;
 class WebSerializedScriptValue;
-struct WebIDBMetadata;
 
 class WebIDBCallbacks {
 public:
@@ -52,7 +51,6 @@
     virtual void onSuccess(const WebDOMStringList&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess(WebIDBCursor*, const WebIDBKey& key, const WebIDBKey& primaryKey, const WebSerializedScriptValue&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess(WebIDBDatabase*) { WEBKIT_ASSERT_NOT_REACHED(); }
-    virtual void onSuccess(WebIDBDatabase*, const WebIDBMetadata&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess(const WebIDBKey&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess(const WebSerializedScriptValue&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess(const WebSerializedScriptValue&, const WebIDBKey&, const WebIDBKeyPath&) { WEBKIT_ASSERT_NOT_REACHED(); }
@@ -64,7 +62,6 @@
     virtual void onBlocked(long long oldVersion) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccessWithPrefetch(const WebVector<WebIDBKey>& keys, const WebVector<WebIDBKey>& primaryKeys, const WebVector<WebSerializedScriptValue>& values) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onUpgradeNeeded(long long oldVersion, WebIDBTransaction*, WebIDBDatabase*) { WEBKIT_ASSERT_NOT_REACHED(); }
-    virtual void onUpgradeNeeded(long long oldVersion, WebIDBDatabase*, const WebIDBMetadata&) { WEBKIT_ASSERT_NOT_REACHED(); }
 };
 
 } // namespace WebKit

Modified: trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp (141057 => 141058)


--- trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp	2013-01-29 06:55:27 UTC (rev 141058)
@@ -37,7 +37,6 @@
 #include "IDBDatabaseBackendProxy.h"
 #include "IDBDatabaseCallbacksProxy.h"
 #include "IDBDatabaseError.h"
-#include "IDBMetadata.h"
 #include "IDBTransactionBackendInterface.h"
 #include "WebIDBCallbacks.h"
 #include "WebIDBCursorImpl.h"
@@ -92,14 +91,6 @@
     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);
-}
-
 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBKey> idbKey)
 {
     m_didComplete = true;
@@ -168,18 +159,10 @@
 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));
+    m_callbacks->onUpgradeNeeded(oldVersion, new WebIDBTransactionImpl(transaction), new WebIDBDatabaseImpl(database, m_databaseCallbacks));
 }
 
-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 (141057 => 141058)


--- trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.h	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.h	2013-01-29 06:55:27 UTC (rev 141058)
@@ -50,7 +50,6 @@
     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>);
     virtual void onSuccess(PassRefPtr<WebCore::SerializedScriptValue>, PassRefPtr<WebCore::IDBKey>, const WebCore::IDBKeyPath&);
@@ -60,7 +59,6 @@
     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 (141057 => 141058)


--- trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp	2013-01-29 06:55:27 UTC (rev 141058)
@@ -74,24 +74,12 @@
 void WebIDBCallbacksImpl::onSuccess(WebIDBDatabase* webKitInstance)
 {
     if (m_databaseProxy) {
-        IDBDatabaseMetadata metadata = m_databaseProxy->metadata();
-        m_callbacks->onSuccess(m_databaseProxy.release(), metadata);
+        m_callbacks->onSuccess(m_databaseProxy.release());
         return;
     }
-    RefPtr<IDBDatabaseBackendInterface> localDatabaseProxy = IDBDatabaseBackendProxy::create(adoptPtr(webKitInstance));
-    m_callbacks->onSuccess(localDatabaseProxy.release(), localDatabaseProxy->metadata());
+    m_callbacks->onSuccess(IDBDatabaseBackendProxy::create(adoptPtr(webKitInstance)));
 }
 
-void WebIDBCallbacksImpl::onSuccess(WebIDBDatabase* webKitInstance, const WebIDBMetadata& metadata)
-{
-    if (m_databaseProxy) {
-        m_callbacks->onSuccess(m_databaseProxy.release(), metadata);
-        return;
-    }
-    RefPtr<IDBDatabaseBackendInterface> localDatabaseProxy = IDBDatabaseBackendProxy::create(adoptPtr(webKitInstance));
-    m_callbacks->onSuccess(localDatabaseProxy.release(), metadata);
-}
-
 void WebIDBCallbacksImpl::onSuccess(const WebIDBKey& key)
 {
     m_callbacks->onSuccess(key);
@@ -127,18 +115,12 @@
     m_callbacks->onBlocked(oldVersion);
 }
 
-void WebIDBCallbacksImpl::onUpgradeNeeded(long long oldVersion, WebIDBTransaction*, WebIDBDatabase* database)
+void WebIDBCallbacksImpl::onUpgradeNeeded(long long oldVersion, WebIDBTransaction* transaction, WebIDBDatabase* database)
 {
     m_databaseProxy = IDBDatabaseBackendProxy::create(adoptPtr(database));
-    m_callbacks->onUpgradeNeeded(oldVersion, m_databaseProxy, m_databaseProxy->metadata());
+    m_callbacks->onUpgradeNeeded(oldVersion, IDBTransactionBackendProxy::create(adoptPtr(transaction)), m_databaseProxy);
 }
 
-void WebIDBCallbacksImpl::onUpgradeNeeded(long long oldVersion, WebIDBDatabase* database, const WebIDBMetadata& metadata)
-{
-    m_databaseProxy = IDBDatabaseBackendProxy::create(adoptPtr(database));
-    m_callbacks->onUpgradeNeeded(oldVersion, m_databaseProxy, metadata);
-}
-
 } // namespace WebKit
 
 #endif // ENABLE(INDEXED_DATABASE)

Modified: trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.h (141057 => 141058)


--- trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.h	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.h	2013-01-29 06:55:27 UTC (rev 141058)
@@ -50,7 +50,6 @@
     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&);
     virtual void onSuccess(const WebSerializedScriptValue&, const WebIDBKey&, const WebIDBKeyPath&);
@@ -59,7 +58,6 @@
     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:
     RefPtr<WebCore::IDBCallbacks> m_callbacks;

Modified: trunk/Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp (141057 => 141058)


--- trunk/Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp	2013-01-29 06:55:27 UTC (rev 141058)
@@ -57,7 +57,7 @@
     }
     virtual void onSuccess(PassRefPtr<DOMStringList>) { }
     virtual void onSuccess(PassRefPtr<IDBCursorBackendInterface>, PassRefPtr<IDBKey>, PassRefPtr<IDBKey>, PassRefPtr<SerializedScriptValue>) { }
-    virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&)
+    virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>)
     {
         EXPECT_TRUE(false);
     }

Modified: trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp (141057 => 141058)


--- trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp	2013-01-29 06:52:51 UTC (rev 141057)
+++ trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp	2013-01-29 06:55:27 UTC (rev 141058)
@@ -69,7 +69,7 @@
     virtual void onError(PassRefPtr<IDBDatabaseError>) OVERRIDE { }
     virtual void onSuccess(PassRefPtr<DOMStringList>) OVERRIDE { }
     virtual void onSuccess(PassRefPtr<IDBCursorBackendInterface>, PassRefPtr<IDBKey>, PassRefPtr<IDBKey>, PassRefPtr<SerializedScriptValue>) OVERRIDE { }
-    virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&) OVERRIDE
+    virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>) OVERRIDE
     {
         m_wasSuccessDBCalled = true;
     }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to