IndexedDB: Remove onVersionChange(string) plumbing
authorjsbell@chromium.org <jsbell@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Mar 2013 20:43:58 +0000 (20:43 +0000)
committerjsbell@chromium.org <jsbell@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Mar 2013 20:43:58 +0000 (20:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=112712

Reviewed by Adam Barth.

Source/WebCore:

Delete unused onVersionChange(string) overload.

No new tests - just deleting dead code.

* Modules/indexeddb/IDBDatabase.cpp: Delete onVersionChange(string) overload.
* Modules/indexeddb/IDBDatabase.h: Ditto.
* Modules/indexeddb/IDBDatabaseBackendImpl.cpp: Ditto.
* Modules/indexeddb/IDBDatabaseCallbacks.h: Ditto.
* Modules/indexeddb/IDBDatabaseCallbacksImpl.cpp: Ditto.
* Modules/indexeddb/IDBDatabaseCallbacksImpl.h: Ditto.

Source/WebKit/chromium:

* public/WebIDBDatabaseCallbacks.h: Remove onVersionChange(string) overload.
* src/IDBDatabaseCallbacksProxy.cpp: Ditto.
* src/IDBDatabaseCallbacksProxy.h: Ditto.
* src/WebIDBDatabaseCallbacksImpl.cpp: Ditto.
* src/WebIDBDatabaseCallbacksImpl.h: Ditto.
* tests/IDBAbortOnCorruptTest.cpp: Ditto.
* tests/IDBDatabaseBackendTest.cpp: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@146511 268f45cc-cd09-0410-ab3c-d52691b4dbfc

14 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Modules/indexeddb/IDBDatabase.cpp
Source/WebCore/Modules/indexeddb/IDBDatabase.h
Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacks.h
Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacksImpl.cpp
Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacksImpl.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h
Source/WebKit/chromium/src/IDBDatabaseCallbacksProxy.cpp
Source/WebKit/chromium/src/IDBDatabaseCallbacksProxy.h
Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.cpp
Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.h
Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp
Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp

index 8b8bee7..0018ceb 100644 (file)
@@ -1,3 +1,21 @@
+2013-03-21  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Remove onVersionChange(string) plumbing
+        https://bugs.webkit.org/show_bug.cgi?id=112712
+
+        Reviewed by Adam Barth.
+
+        Delete unused onVersionChange(string) overload.
+
+        No new tests - just deleting dead code.
+
+        * Modules/indexeddb/IDBDatabase.cpp: Delete onVersionChange(string) overload.
+        * Modules/indexeddb/IDBDatabase.h: Ditto.
+        * Modules/indexeddb/IDBDatabaseBackendImpl.cpp: Ditto.
+        * Modules/indexeddb/IDBDatabaseCallbacks.h: Ditto.
+        * Modules/indexeddb/IDBDatabaseCallbacksImpl.cpp: Ditto.
+        * Modules/indexeddb/IDBDatabaseCallbacksImpl.h: Ditto.
+
 2013-03-21  Philip Rogers  <pdr@google.com>
 
         Correct bisector angle calculation for markers
index d7952c8..ed85f90 100644 (file)
@@ -311,18 +311,6 @@ void IDBDatabase::onVersionChange(int64_t oldVersion, int64_t newVersion)
     enqueueEvent(IDBVersionChangeEvent::create(IDBAny::create(oldVersion), newVersionAny.release(), eventNames().versionchangeEvent));
 }
 
-void IDBDatabase::onVersionChange(const String& newVersion)
-{
-    if (m_contextStopped || !scriptExecutionContext())
-        return;
-
-    if (m_closePending)
-        return;
-
-    RefPtr<IDBAny> newVersionAny = newVersion.isEmpty() ? IDBAny::createNull() : IDBAny::createString(newVersion);
-    enqueueEvent(IDBVersionChangeEvent::create(version(), newVersionAny.release(), eventNames().versionchangeEvent));
-}
-
 void IDBDatabase::enqueueEvent(PassRefPtr<Event> event)
 {
     ASSERT(!m_contextStopped);
index 8dd52c9..6abce87 100644 (file)
@@ -77,7 +77,6 @@ public:
 
     // IDBDatabaseCallbacks
     virtual void onVersionChange(int64_t oldVersion, int64_t newVersion);
-    virtual void onVersionChange(const String& requestedVersion);
     virtual void onAbort(int64_t, PassRefPtr<IDBDatabaseError>);
     virtual void onComplete(int64_t);
 
index aa734f8..fc242e0 100644 (file)
@@ -39,7 +39,6 @@ public:
     virtual ~IDBDatabaseCallbacks() { }
 
     virtual void onForcedClose() = 0;
-    virtual void onVersionChange(const String& version) = 0;
     virtual void onVersionChange(int64_t oldVersion, int64_t newVersion) = 0;
 
     virtual void onAbort(int64_t transactionId, PassRefPtr<IDBDatabaseError>) = 0;
index 411af3c..42af7a2 100644 (file)
@@ -52,12 +52,6 @@ void IDBDatabaseCallbacksImpl::onForcedClose()
         m_database->forceClose();
 }
 
-void IDBDatabaseCallbacksImpl::onVersionChange(const String& version)
-{
-    if (m_database)
-        m_database->onVersionChange(version);
-}
-
 void IDBDatabaseCallbacksImpl::onVersionChange(int64_t oldVersion, int64_t newVersion)
 {
     if (m_database)
index 3c14f8a..5a78b37 100644 (file)
@@ -43,7 +43,6 @@ public:
 
     // IDBDatabaseCallbacks
     virtual void onForcedClose();
-    virtual void onVersionChange(const String& version);
     virtual void onVersionChange(int64_t oldVersion, int64_t newVersion);
 
     virtual void onAbort(int64_t transactionId, PassRefPtr<IDBDatabaseError>);
index 6e78b27..ffef797 100644 (file)
@@ -1,3 +1,18 @@
+2013-03-21  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Remove onVersionChange(string) plumbing
+        https://bugs.webkit.org/show_bug.cgi?id=112712
+
+        Reviewed by Adam Barth.
+
+        * public/WebIDBDatabaseCallbacks.h: Remove onVersionChange(string) overload.
+        * src/IDBDatabaseCallbacksProxy.cpp: Ditto.
+        * src/IDBDatabaseCallbacksProxy.h: Ditto.
+        * src/WebIDBDatabaseCallbacksImpl.cpp: Ditto.
+        * src/WebIDBDatabaseCallbacksImpl.h: Ditto.
+        * tests/IDBAbortOnCorruptTest.cpp: Ditto.
+        * tests/IDBDatabaseBackendTest.cpp: Ditto.
+
 2013-03-20  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed.  Rolled Chromium DEPS to r189497.  Requested by
index fa35f15..de65f6b 100644 (file)
@@ -38,7 +38,6 @@ public:
 
     virtual void onForcedClose() { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onVersionChange(long long oldVersion, long long newVersion) { WEBKIT_ASSERT_NOT_REACHED(); }
-    virtual void onVersionChange(const WebString& requestedVersion) { WEBKIT_ASSERT_NOT_REACHED(); }
 
     virtual void onAbort(long long transactionId, const WebIDBDatabaseError&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onComplete(long long transactionId) { WEBKIT_ASSERT_NOT_REACHED(); }
index 6365926..2ce1beb 100644 (file)
@@ -58,11 +58,6 @@ void IDBDatabaseCallbacksProxy::onVersionChange(int64_t oldVersion, int64_t newV
     m_callbacks->onVersionChange(oldVersion, newVersion);
 }
 
-void IDBDatabaseCallbacksProxy::onVersionChange(const String& requestedVersion)
-{
-    m_callbacks->onVersionChange(requestedVersion);
-}
-
 void IDBDatabaseCallbacksProxy::onAbort(int64_t transactionId, PassRefPtr<WebCore::IDBDatabaseError> error)
 {
     m_callbacks->onAbort(transactionId, error);
index fab45ba..6276f51 100644 (file)
@@ -41,7 +41,6 @@ public:
     virtual ~IDBDatabaseCallbacksProxy();
 
     virtual void onForcedClose();
-    virtual void onVersionChange(const String& requestedVersion);
     virtual void onVersionChange(int64_t oldVersion, int64_t newVersion);
 
     virtual void onAbort(int64_t transactionId, PassRefPtr<WebCore::IDBDatabaseError>);
index ee6e299..ff8cb9a 100644 (file)
@@ -54,11 +54,6 @@ void WebIDBDatabaseCallbacksImpl::onVersionChange(long long oldVersion, long lon
     m_callbacks->onVersionChange(oldVersion, newVersion);
 }
 
-void WebIDBDatabaseCallbacksImpl::onVersionChange(const WebString& version)
-{
-    m_callbacks->onVersionChange(version);
-}
-
 void WebIDBDatabaseCallbacksImpl::onAbort(long long transactionId, const WebIDBDatabaseError& error)
 {
     m_callbacks->onAbort(transactionId, error);
index 624afc4..91d1920 100644 (file)
@@ -45,7 +45,6 @@ public:
 
     virtual void onForcedClose();
     virtual void onVersionChange(long long oldVersion, long long newVersion);
-    virtual void onVersionChange(const WebString& version);
     virtual void onAbort(long long transactionId, const WebIDBDatabaseError&);
     virtual void onComplete(long long transactionId);
 
index 871c6b8..f4f9d7e 100644 (file)
@@ -109,7 +109,6 @@ class FakeIDBDatabaseCallbacks : public IDBDatabaseCallbacks {
 public:
     static PassRefPtr<FakeIDBDatabaseCallbacks> create() { return adoptRef(new FakeIDBDatabaseCallbacks()); }
     virtual ~FakeIDBDatabaseCallbacks() { }
-    virtual void onVersionChange(const String& version) OVERRIDE { }
     virtual void onVersionChange(int64_t oldVersion, int64_t newVersion) OVERRIDE { }
     virtual void onForcedClose() OVERRIDE { }
     virtual void onAbort(int64_t transactionId, PassRefPtr<IDBDatabaseError> error) OVERRIDE { }
index d184025..fb02a36 100644 (file)
@@ -95,7 +95,6 @@ class FakeIDBDatabaseCallbacks : public IDBDatabaseCallbacks {
 public:
     static PassRefPtr<FakeIDBDatabaseCallbacks> create() { return adoptRef(new FakeIDBDatabaseCallbacks()); }
     virtual ~FakeIDBDatabaseCallbacks() { }
-    virtual void onVersionChange(const String& version) OVERRIDE { }
     virtual void onVersionChange(int64_t oldVersion, int64_t newVersion) OVERRIDE { }
     virtual void onForcedClose() OVERRIDE { }
     virtual void onAbort(int64_t transactionId, PassRefPtr<IDBDatabaseError> error) OVERRIDE { }