Diff
Modified: trunk/Source/WebCore/ChangeLog (146510 => 146511)
--- trunk/Source/WebCore/ChangeLog 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebCore/ChangeLog 2013-03-21 20:43:58 UTC (rev 146511)
@@ -1,3 +1,21 @@
+2013-03-21 Joshua Bell <jsb...@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 <p...@google.com>
Correct bisector angle calculation for markers
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (146510 => 146511)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2013-03-21 20:43:58 UTC (rev 146511)
@@ -311,18 +311,6 @@
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);
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h (146510 => 146511)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2013-03-21 20:43:58 UTC (rev 146511)
@@ -77,7 +77,6 @@
// 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);
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacks.h (146510 => 146511)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacks.h 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacks.h 2013-03-21 20:43:58 UTC (rev 146511)
@@ -39,7 +39,6 @@
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;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacksImpl.cpp (146510 => 146511)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacksImpl.cpp 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacksImpl.cpp 2013-03-21 20:43:58 UTC (rev 146511)
@@ -52,12 +52,6 @@
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)
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacksImpl.h (146510 => 146511)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacksImpl.h 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacksImpl.h 2013-03-21 20:43:58 UTC (rev 146511)
@@ -43,7 +43,6 @@
// 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>);
Modified: trunk/Source/WebKit/chromium/ChangeLog (146510 => 146511)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-03-21 20:43:58 UTC (rev 146511)
@@ -1,3 +1,18 @@
+2013-03-21 Joshua Bell <jsb...@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....@gmail.com>
Unreviewed. Rolled Chromium DEPS to r189497. Requested by
Modified: trunk/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h (146510 => 146511)
--- trunk/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h 2013-03-21 20:43:58 UTC (rev 146511)
@@ -38,7 +38,6 @@
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(); }
Modified: trunk/Source/WebKit/chromium/src/IDBDatabaseCallbacksProxy.cpp (146510 => 146511)
--- trunk/Source/WebKit/chromium/src/IDBDatabaseCallbacksProxy.cpp 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebKit/chromium/src/IDBDatabaseCallbacksProxy.cpp 2013-03-21 20:43:58 UTC (rev 146511)
@@ -58,11 +58,6 @@
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);
Modified: trunk/Source/WebKit/chromium/src/IDBDatabaseCallbacksProxy.h (146510 => 146511)
--- trunk/Source/WebKit/chromium/src/IDBDatabaseCallbacksProxy.h 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebKit/chromium/src/IDBDatabaseCallbacksProxy.h 2013-03-21 20:43:58 UTC (rev 146511)
@@ -41,7 +41,6 @@
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>);
Modified: trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.cpp (146510 => 146511)
--- trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.cpp 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.cpp 2013-03-21 20:43:58 UTC (rev 146511)
@@ -54,11 +54,6 @@
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);
Modified: trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.h (146510 => 146511)
--- trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.h 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.h 2013-03-21 20:43:58 UTC (rev 146511)
@@ -45,7 +45,6 @@
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);
Modified: trunk/Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp (146510 => 146511)
--- trunk/Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp 2013-03-21 20:43:58 UTC (rev 146511)
@@ -109,7 +109,6 @@
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 { }
Modified: trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp (146510 => 146511)
--- trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp 2013-03-21 20:35:36 UTC (rev 146510)
+++ trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp 2013-03-21 20:43:58 UTC (rev 146511)
@@ -95,7 +95,6 @@
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 { }
