Diff
Modified: trunk/Source/WebCore/ChangeLog (126198 => 126199)
--- trunk/Source/WebCore/ChangeLog 2012-08-21 22:35:41 UTC (rev 126198)
+++ trunk/Source/WebCore/ChangeLog 2012-08-21 22:41:32 UTC (rev 126199)
@@ -1,3 +1,23 @@
+2012-08-21 Alec Flett <[email protected]>
+
+ IndexedDB: remove old update/openCursor glue
+ https://bugs.webkit.org/show_bug.cgi?id=94378
+
+ Reviewed by Tony Chang.
+
+ Remove old openCursor and update methods after landing
+ https://bugs.webkit.org/show_bug.cgi?id=91125 and removing
+ Chromium-side glue.
+
+ No new tests: this code is dead.
+
+ * Modules/indexeddb/IDBObjectStoreBackendImpl.cpp:
+ * Modules/indexeddb/IDBObjectStoreBackendImpl.h:
+ (IDBObjectStoreBackendImpl):
+ * Modules/indexeddb/IDBObjectStoreBackendInterface.h:
+ * inspector/InspectorIndexedDBAgent.cpp:
+ (WebCore):
+
2012-08-21 James Robinson <[email protected]>
[chromium] Should be able to destroy a CCLayerTreeHost without manually setting the root layer
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.cpp (126198 => 126199)
--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.cpp 2012-08-21 22:35:41 UTC (rev 126198)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.cpp 2012-08-21 22:41:32 UTC (rev 126199)
@@ -510,12 +510,6 @@
transaction->didCompleteTaskEvents();
}
-void IDBObjectStoreBackendImpl::openCursor(PassRefPtr<IDBKeyRange> prpRange, unsigned short tmpDirection, PassRefPtr<IDBCallbacks> prpCallbacks, IDBTransactionBackendInterface* transactionPtr, ExceptionCode& ec)
-{
- IDBCursor::Direction direction = static_cast<IDBCursor::Direction>(tmpDirection);
- openCursor(prpRange, direction, prpCallbacks, IDBTransactionBackendInterface::NormalTask, transactionPtr, ec);
-}
-
void IDBObjectStoreBackendImpl::openCursor(PassRefPtr<IDBKeyRange> prpRange, IDBCursor::Direction direction, PassRefPtr<IDBCallbacks> prpCallbacks, IDBTransactionBackendInterface::TaskType taskType, IDBTransactionBackendInterface* transactionPtr, ExceptionCode& ec)
{
IDB_TRACE("IDBObjectStoreBackendImpl::openCursor");
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.h (126198 => 126199)
--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.h 2012-08-21 22:35:41 UTC (rev 126198)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.h 2012-08-21 22:41:32 UTC (rev 126199)
@@ -79,8 +79,6 @@
virtual PassRefPtr<IDBIndexBackendInterface> index(const String& name, ExceptionCode&);
virtual void deleteIndex(const String& name, IDBTransactionBackendInterface*, ExceptionCode&);
- // FIXME: Remove this version of openCursor when TaskType is plumbed through chromium.
- virtual void openCursor(PassRefPtr<IDBKeyRange> range, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&);
virtual void openCursor(PassRefPtr<IDBKeyRange>, IDBCursor::Direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface::TaskType, IDBTransactionBackendInterface*, ExceptionCode&);
virtual void count(PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&);
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendInterface.h (126198 => 126199)
--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendInterface.h 2012-08-21 22:35:41 UTC (rev 126198)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendInterface.h 2012-08-21 22:41:32 UTC (rev 126199)
@@ -69,8 +69,6 @@
virtual PassRefPtr<IDBIndexBackendInterface> index(const String& name, ExceptionCode&) = 0;
virtual void deleteIndex(const String& name, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
- // FIXME: Remove this version of openCursor when TaskType is plumbed through chromium.
- virtual void openCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
virtual void openCursor(PassRefPtr<IDBKeyRange>, IDBCursor::Direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface::TaskType, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
virtual void count(PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
};
Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (126198 => 126199)
--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2012-08-21 22:35:41 UTC (rev 126198)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2012-08-21 22:41:32 UTC (rev 126199)
@@ -610,7 +610,7 @@
RefPtr<OpenCursorCallback> openCursorCallback = OpenCursorCallback::create(m_frontendProvider, m_injectedScript, this, idbTransaction.get(), OpenCursorCallback::ObjectStoreDataCursor, m_requestId, m_skipCount, m_pageSize);
ExceptionCode ec = 0;
- idbObjectStore->openCursor(m_idbKeyRange, IDBCursor::NEXT, openCursorCallback, idbTransaction.get(), ec);
+ idbObjectStore->openCursor(m_idbKeyRange, IDBCursor::NEXT, openCursorCallback, IDBTransactionBackendInterface::NormalTask, idbTransaction.get(), ec);
}
}
Modified: trunk/Source/WebKit/chromium/ChangeLog (126198 => 126199)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-21 22:35:41 UTC (rev 126198)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-21 22:41:32 UTC (rev 126199)
@@ -1,3 +1,20 @@
+2012-08-21 Alec Flett <[email protected]>
+
+ IndexedDB: remove old update/openCursor glue
+ https://bugs.webkit.org/show_bug.cgi?id=94378
+
+ Reviewed by Tony Chang.
+
+ Remove Chromium/WebKit API for old methods that have now been
+ removed from chromium proper.
+
+ * public/WebIDBObjectStore.h:
+ * src/IDBObjectStoreBackendProxy.cpp:
+ * src/IDBObjectStoreBackendProxy.h:
+ (IDBObjectStoreBackendProxy):
+ * src/WebIDBObjectStoreImpl.h:
+ (WebIDBObjectStoreImpl):
+
2012-08-21 James Robinson <[email protected]>
[chromium] Should be able to destroy a CCLayerTreeHost without manually setting the root layer
Modified: trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h (126198 => 126199)
--- trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h 2012-08-21 22:35:41 UTC (rev 126198)
+++ trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h 2012-08-21 22:41:32 UTC (rev 126199)
@@ -72,11 +72,6 @@
return 0;
}
virtual void deleteIndex(const WebString& name, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
- // FIXME: Remove this version of openCursor when TaskType is plumbed through chromium.
- virtual void openCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
- {
- openCursor(range, static_cast<WebIDBCursor::Direction>(direction), callbacks, WebIDBTransaction::NormalTask, transaction, ec);
- }
virtual void openCursor(const WebIDBKeyRange&, WebIDBCursor::Direction direction, WebIDBCallbacks*, WebIDBTransaction::TaskType, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void count(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
Modified: trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp (126198 => 126199)
--- trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp 2012-08-21 22:35:41 UTC (rev 126198)
+++ trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp 2012-08-21 22:41:32 UTC (rev 126199)
@@ -138,14 +138,6 @@
m_webIDBObjectStore->deleteIndex(name, *transactionProxy->getWebIDBTransaction(), ec);
}
-void IDBObjectStoreBackendProxy::openCursor(PassRefPtr<IDBKeyRange> range, unsigned short direction, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
-{
- // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
- // all implementations of IDB interfaces are proxy objects.
- IDBTransactionBackendProxy* transactionProxy = static_cast<IDBTransactionBackendProxy*>(transaction);
- m_webIDBObjectStore->openCursor(range, static_cast<WebIDBCursor::Direction>(direction), new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction(), ec);
-}
-
void IDBObjectStoreBackendProxy::openCursor(PassRefPtr<IDBKeyRange> range, IDBCursor::Direction direction, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface::TaskType taskType, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
{
// The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
Modified: trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.h (126198 => 126199)
--- trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.h 2012-08-21 22:35:41 UTC (rev 126198)
+++ trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.h 2012-08-21 22:41:32 UTC (rev 126199)
@@ -55,8 +55,6 @@
PassRefPtr<WebCore::IDBIndexBackendInterface> index(const String& name, WebCore::ExceptionCode&);
void deleteIndex(const String& name, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
- // FIXME: Remove this version of openCursor when TaskType is plumbed through chromium.
- virtual void openCursor(PassRefPtr<WebCore::IDBKeyRange>, unsigned short direction, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
virtual void openCursor(PassRefPtr<WebCore::IDBKeyRange>, WebCore::IDBCursor::Direction, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface::TaskType, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
virtual void count(PassRefPtr<WebCore::IDBKeyRange>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
Modified: trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h (126198 => 126199)
--- trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h 2012-08-21 22:35:41 UTC (rev 126198)
+++ trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h 2012-08-21 22:41:32 UTC (rev 126199)
@@ -56,10 +56,6 @@
WebIDBIndex* index(const WebString& name, WebExceptionCode&);
void deleteIndex(const WebString& name, const WebIDBTransaction&, WebExceptionCode&);
- void openCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
- {
- openCursor(range, static_cast<WebIDBCursor::Direction>(direction), callbacks, WebIDBTransaction::NormalTask, transaction, ec);
- }
void openCursor(const WebIDBKeyRange&, WebIDBCursor::Direction, WebIDBCallbacks*, WebIDBTransaction::TaskType, const WebIDBTransaction&, WebExceptionCode&);
void count(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
