From 96d115ed7265d46e379dee947ce6b47f1ce210fe Mon Sep 17 00:00:00 2001 From: "beidson@apple.com" Date: Fri, 8 Nov 2013 22:48:22 +0000 Subject: [PATCH] Merge IDBCursorBackendInterface and IDBCursorBackendImpl https://bugs.webkit.org/show_bug.cgi?id=124068 Reviewed by Anders Carlsson. Source/WebCore: * CMakeLists.txt: * GNUmakefile.list.am: * WebCore.xcodeproj/project.pbxproj: * Modules/indexeddb/IDBCursorBackendInterface.h: Removed. * Modules/indexeddb/IDBCursorBackend.cpp: Renamed from Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.cpp. * Modules/indexeddb/IDBCursorBackend.h: Renamed from Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.h. * Modules/indexeddb/IDBCallbacks.h: * Modules/indexeddb/IDBCursor.cpp: * Modules/indexeddb/IDBCursor.h: * Modules/indexeddb/IDBCursorWithValue.cpp: * Modules/indexeddb/IDBCursorWithValue.h: * Modules/indexeddb/IDBDatabaseBackendImpl.cpp: * Modules/indexeddb/IDBFactoryBackendInterface.h: * Modules/indexeddb/IDBRequest.cpp: * Modules/indexeddb/IDBRequest.h: * Modules/indexeddb/IDBTransactionBackendImpl.cpp: * Modules/indexeddb/IDBTransactionBackendImpl.h: * Modules/indexeddb/IDBTransactionBackendInterface.h: * Modules/indexeddb/IDBTransactionBackendOperations.cpp: * Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.cpp: * Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h: Source/WebKit2: * WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp: (WebKit::WebIDBFactoryBackend::createCursorBackend): * WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@158959 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/CMakeLists.txt | 2 +- Source/WebCore/ChangeLog | 32 +++++++++ Source/WebCore/GNUmakefile.list.am | 5 +- .../WebCore/Modules/indexeddb/IDBCallbacks.h | 4 +- .../WebCore/Modules/indexeddb/IDBCursor.cpp | 6 +- Source/WebCore/Modules/indexeddb/IDBCursor.h | 8 +-- ...orBackendImpl.cpp => IDBCursorBackend.cpp} | 60 ++++++++--------- ...CursorBackendImpl.h => IDBCursorBackend.h} | 42 ++++++------ .../indexeddb/IDBCursorBackendInterface.h | 65 ------------------- .../Modules/indexeddb/IDBCursorWithValue.cpp | 6 +- .../Modules/indexeddb/IDBCursorWithValue.h | 4 +- .../indexeddb/IDBDatabaseBackendImpl.cpp | 2 +- .../indexeddb/IDBFactoryBackendInterface.h | 2 +- .../WebCore/Modules/indexeddb/IDBRequest.cpp | 4 +- Source/WebCore/Modules/indexeddb/IDBRequest.h | 2 +- .../indexeddb/IDBTransactionBackendImpl.cpp | 10 +-- .../indexeddb/IDBTransactionBackendImpl.h | 8 +-- .../IDBTransactionBackendInterface.h | 6 +- .../IDBTransactionBackendOperations.cpp | 4 +- .../leveldb/IDBFactoryBackendLevelDB.cpp | 6 +- .../leveldb/IDBFactoryBackendLevelDB.h | 2 +- .../WebCore/WebCore.xcodeproj/project.pbxproj | 24 +++---- Source/WebKit2/ChangeLog | 11 ++++ .../IndexedDB/WebIDBFactoryBackend.cpp | 4 +- .../IndexedDB/WebIDBFactoryBackend.h | 2 +- 25 files changed, 146 insertions(+), 175 deletions(-) rename Source/WebCore/Modules/indexeddb/{IDBCursorBackendImpl.cpp => IDBCursorBackend.cpp} (73%) rename Source/WebCore/Modules/indexeddb/{IDBCursorBackendImpl.h => IDBCursorBackend.h} (54%) delete mode 100644 Source/WebCore/Modules/indexeddb/IDBCursorBackendInterface.h diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt index 3f9ad212cc7..85a54c9a641 100644 --- a/Source/WebCore/CMakeLists.txt +++ b/Source/WebCore/CMakeLists.txt @@ -761,7 +761,7 @@ set(WebCore_SOURCES Modules/indexeddb/DOMWindowIndexedDatabase.cpp Modules/indexeddb/IDBAny.cpp Modules/indexeddb/IDBCursor.cpp - Modules/indexeddb/IDBCursorBackendImpl.cpp + Modules/indexeddb/IDBCursorBackend.cpp Modules/indexeddb/IDBCursorWithValue.cpp Modules/indexeddb/IDBDatabase.cpp Modules/indexeddb/IDBDatabaseBackendImpl.cpp diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 42ae0b78ae2..bdae8dbd311 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,35 @@ +2013-11-08 Brady Eidson + + Merge IDBCursorBackendInterface and IDBCursorBackendImpl + https://bugs.webkit.org/show_bug.cgi?id=124068 + + Reviewed by Anders Carlsson. + + * CMakeLists.txt: + * GNUmakefile.list.am: + * WebCore.xcodeproj/project.pbxproj: + + * Modules/indexeddb/IDBCursorBackendInterface.h: Removed. + + * Modules/indexeddb/IDBCursorBackend.cpp: Renamed from Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.cpp. + * Modules/indexeddb/IDBCursorBackend.h: Renamed from Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.h. + + * Modules/indexeddb/IDBCallbacks.h: + * Modules/indexeddb/IDBCursor.cpp: + * Modules/indexeddb/IDBCursor.h: + * Modules/indexeddb/IDBCursorWithValue.cpp: + * Modules/indexeddb/IDBCursorWithValue.h: + * Modules/indexeddb/IDBDatabaseBackendImpl.cpp: + * Modules/indexeddb/IDBFactoryBackendInterface.h: + * Modules/indexeddb/IDBRequest.cpp: + * Modules/indexeddb/IDBRequest.h: + * Modules/indexeddb/IDBTransactionBackendImpl.cpp: + * Modules/indexeddb/IDBTransactionBackendImpl.h: + * Modules/indexeddb/IDBTransactionBackendInterface.h: + * Modules/indexeddb/IDBTransactionBackendOperations.cpp: + * Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.cpp: + * Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h: + 2013-11-08 Sam Weinig Modernize FrameLoader a bit diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am index b79ee2a8c27..e35e5d8edbb 100644 --- a/Source/WebCore/GNUmakefile.list.am +++ b/Source/WebCore/GNUmakefile.list.am @@ -1794,9 +1794,8 @@ webcore_modules_sources += \ Source/WebCore/Modules/indexeddb/leveldb/IDBBackingStoreTransactionLevelDB.cpp \ Source/WebCore/Modules/indexeddb/leveldb/IDBBackingStoreTransactionLevelDB.h \ Source/WebCore/Modules/indexeddb/IDBCallbacks.h \ - Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.cpp \ - Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.h \ - Source/WebCore/Modules/indexeddb/IDBCursorBackendInterface.h \ + Source/WebCore/Modules/indexeddb/IDBCursorBackend.cpp \ + Source/WebCore/Modules/indexeddb/IDBCursorBackend.h \ Source/WebCore/Modules/indexeddb/IDBCursor.cpp \ Source/WebCore/Modules/indexeddb/IDBCursor.h \ Source/WebCore/Modules/indexeddb/IDBCursorWithValue.cpp \ diff --git a/Source/WebCore/Modules/indexeddb/IDBCallbacks.h b/Source/WebCore/Modules/indexeddb/IDBCallbacks.h index 6d0b5141d7c..9ed390a1692 100644 --- a/Source/WebCore/Modules/indexeddb/IDBCallbacks.h +++ b/Source/WebCore/Modules/indexeddb/IDBCallbacks.h @@ -39,7 +39,7 @@ namespace WebCore { class DOMStringList; -class IDBCursorBackendInterface; +class IDBCursorBackend; class IDBDatabaseBackendInterface; struct IDBDatabaseMetadata; @@ -52,7 +52,7 @@ public: // From IDBFactory.webkitGetDatabaseNames() virtual void onSuccess(PassRefPtr) = 0; // From IDBObjectStore/IDBIndex.openCursor(), IDBIndex.openKeyCursor() - virtual void onSuccess(PassRefPtr, PassRefPtr, PassRefPtr primaryKey, PassRefPtr) = 0; + virtual void onSuccess(PassRefPtr, PassRefPtr, PassRefPtr primaryKey, PassRefPtr) = 0; // From IDBObjectStore.add()/put(), IDBIndex.getKey() virtual void onSuccess(PassRefPtr) = 0; // From IDBObjectStore/IDBIndex.get()/count(), and various methods that yield null/undefined. diff --git a/Source/WebCore/Modules/indexeddb/IDBCursor.cpp b/Source/WebCore/Modules/indexeddb/IDBCursor.cpp index 39736ff01f6..1266dd3c280 100644 --- a/Source/WebCore/Modules/indexeddb/IDBCursor.cpp +++ b/Source/WebCore/Modules/indexeddb/IDBCursor.cpp @@ -31,7 +31,7 @@ #include "IDBAny.h" #include "IDBBindingUtilities.h" #include "IDBCallbacks.h" -#include "IDBCursorBackendInterface.h" +#include "IDBCursorBackend.h" #include "IDBKey.h" #include "IDBObjectStore.h" #include "IDBRequest.h" @@ -43,7 +43,7 @@ namespace WebCore { -PassRefPtr IDBCursor::create(PassRefPtr backend, IndexedDB::CursorDirection direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction) +PassRefPtr IDBCursor::create(PassRefPtr backend, IndexedDB::CursorDirection direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction) { return adoptRef(new IDBCursor(backend, direction, request, source, transaction)); } @@ -73,7 +73,7 @@ const AtomicString& IDBCursor::directionPrevUnique() } -IDBCursor::IDBCursor(PassRefPtr backend, IndexedDB::CursorDirection direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction) +IDBCursor::IDBCursor(PassRefPtr backend, IndexedDB::CursorDirection direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction) : m_backend(backend) , m_request(request) , m_direction(direction) diff --git a/Source/WebCore/Modules/indexeddb/IDBCursor.h b/Source/WebCore/Modules/indexeddb/IDBCursor.h index c0f7b60a687..c6a744f3388 100644 --- a/Source/WebCore/Modules/indexeddb/IDBCursor.h +++ b/Source/WebCore/Modules/indexeddb/IDBCursor.h @@ -42,7 +42,7 @@ namespace WebCore { class DOMRequestState; class IDBAny; class IDBCallbacks; -class IDBCursorBackendInterface; +class IDBCursorBackend; class IDBRequest; class ScriptExecutionContext; @@ -58,7 +58,7 @@ public: static IndexedDB::CursorDirection stringToDirection(const String& modeString, ExceptionCode&); static const AtomicString& directionToString(unsigned short mode); - static PassRefPtr create(PassRefPtr, IndexedDB::CursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*); + static PassRefPtr create(PassRefPtr, IndexedDB::CursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*); virtual ~IDBCursor(); // Implement the IDL @@ -82,13 +82,13 @@ public: PassRefPtr idbPrimaryKey() { return m_currentPrimaryKey; } protected: - IDBCursor(PassRefPtr, IndexedDB::CursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*); + IDBCursor(PassRefPtr, IndexedDB::CursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*); virtual bool isKeyCursor() const { return true; } private: PassRefPtr effectiveObjectStore(); - RefPtr m_backend; + RefPtr m_backend; RefPtr m_request; const IndexedDB::CursorDirection m_direction; RefPtr m_source; diff --git a/Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.cpp b/Source/WebCore/Modules/indexeddb/IDBCursorBackend.cpp similarity index 73% rename from Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.cpp rename to Source/WebCore/Modules/indexeddb/IDBCursorBackend.cpp index 1495b371144..801b316a919 100644 --- a/Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.cpp +++ b/Source/WebCore/Modules/indexeddb/IDBCursorBackend.cpp @@ -24,7 +24,7 @@ */ #include "config.h" -#include "IDBCursorBackendImpl.h" +#include "IDBCursorBackend.h" #if ENABLE(INDEXED_DATABASE) @@ -41,67 +41,67 @@ namespace WebCore { -class IDBCursorBackendImpl::CursorIterationOperation : public IDBOperation { +class IDBCursorBackend::CursorIterationOperation : public IDBOperation { public: - static PassOwnPtr create(PassRefPtr cursor, PassRefPtr key, PassRefPtr callbacks) + static PassOwnPtr create(PassRefPtr cursor, PassRefPtr key, PassRefPtr callbacks) { return adoptPtr(new CursorIterationOperation(cursor, key, callbacks)); } virtual void perform() OVERRIDE FINAL; private: - CursorIterationOperation(PassRefPtr cursor, PassRefPtr key, PassRefPtr callbacks) + CursorIterationOperation(PassRefPtr cursor, PassRefPtr key, PassRefPtr callbacks) : m_cursor(cursor) , m_key(key) , m_callbacks(callbacks) { } - RefPtr m_cursor; + RefPtr m_cursor; RefPtr m_key; RefPtr m_callbacks; }; -class IDBCursorBackendImpl::CursorAdvanceOperation : public IDBOperation { +class IDBCursorBackend::CursorAdvanceOperation : public IDBOperation { public: - static PassOwnPtr create(PassRefPtr cursor, unsigned long count, PassRefPtr callbacks) + static PassOwnPtr create(PassRefPtr cursor, unsigned long count, PassRefPtr callbacks) { return adoptPtr(new CursorAdvanceOperation(cursor, count, callbacks)); } virtual void perform() OVERRIDE FINAL; private: - CursorAdvanceOperation(PassRefPtr cursor, unsigned long count, PassRefPtr callbacks) + CursorAdvanceOperation(PassRefPtr cursor, unsigned long count, PassRefPtr callbacks) : m_cursor(cursor) , m_count(count) , m_callbacks(callbacks) { } - RefPtr m_cursor; + RefPtr m_cursor; unsigned long m_count; RefPtr m_callbacks; }; -class IDBCursorBackendImpl::CursorPrefetchIterationOperation : public IDBOperation { +class IDBCursorBackend::CursorPrefetchIterationOperation : public IDBOperation { public: - static PassOwnPtr create(PassRefPtr cursor, int numberToFetch, PassRefPtr callbacks) + static PassOwnPtr create(PassRefPtr cursor, int numberToFetch, PassRefPtr callbacks) { return adoptPtr(new CursorPrefetchIterationOperation(cursor, numberToFetch, callbacks)); } virtual void perform() OVERRIDE FINAL; private: - CursorPrefetchIterationOperation(PassRefPtr cursor, int numberToFetch, PassRefPtr callbacks) + CursorPrefetchIterationOperation(PassRefPtr cursor, int numberToFetch, PassRefPtr callbacks) : m_cursor(cursor) , m_numberToFetch(numberToFetch) , m_callbacks(callbacks) { } - RefPtr m_cursor; + RefPtr m_cursor; int m_numberToFetch; RefPtr m_callbacks; }; -IDBCursorBackendImpl::IDBCursorBackendImpl(PassRefPtr cursor, IndexedDB::CursorType cursorType, IDBDatabaseBackendInterface::TaskType taskType, IDBTransactionBackendInterface* transaction, int64_t objectStoreId) +IDBCursorBackend::IDBCursorBackend(PassRefPtr cursor, IndexedDB::CursorType cursorType, IDBDatabaseBackendInterface::TaskType taskType, IDBTransactionBackendInterface* transaction, int64_t objectStoreId) : m_taskType(taskType) , m_cursorType(cursorType) , m_database(&(transaction->database())) @@ -113,27 +113,27 @@ IDBCursorBackendImpl::IDBCursorBackendImpl(PassRefPtrregisterOpenCursor(this); } -IDBCursorBackendImpl::~IDBCursorBackendImpl() +IDBCursorBackend::~IDBCursorBackend() { m_transaction->unregisterOpenCursor(this); } -void IDBCursorBackendImpl::continueFunction(PassRefPtr key, PassRefPtr prpCallbacks, ExceptionCode&) +void IDBCursorBackend::continueFunction(PassRefPtr key, PassRefPtr prpCallbacks, ExceptionCode&) { - LOG(StorageAPI, "IDBCursorBackendImpl::continue"); + LOG(StorageAPI, "IDBCursorBackend::continue"); RefPtr callbacks = prpCallbacks; m_transaction->scheduleTask(m_taskType, CursorIterationOperation::create(this, key, callbacks)); } -void IDBCursorBackendImpl::advance(unsigned long count, PassRefPtr prpCallbacks, ExceptionCode&) +void IDBCursorBackend::advance(unsigned long count, PassRefPtr prpCallbacks, ExceptionCode&) { - LOG(StorageAPI, "IDBCursorBackendImpl::advance"); + LOG(StorageAPI, "IDBCursorBackend::advance"); RefPtr callbacks = prpCallbacks; m_transaction->scheduleTask(CursorAdvanceOperation::create(this, count, callbacks)); } -void IDBCursorBackendImpl::CursorAdvanceOperation::perform() +void IDBCursorBackend::CursorAdvanceOperation::perform() { LOG(StorageAPI, "CursorAdvanceOperation"); if (!m_cursor->m_cursor || !m_cursor->m_cursor->advance(m_count)) { @@ -145,7 +145,7 @@ void IDBCursorBackendImpl::CursorAdvanceOperation::perform() m_callbacks->onSuccess(m_cursor->key(), m_cursor->primaryKey(), m_cursor->value()); } -void IDBCursorBackendImpl::CursorIterationOperation::perform() +void IDBCursorBackend::CursorIterationOperation::perform() { LOG(StorageAPI, "CursorIterationOperation"); if (!m_cursor->m_cursor || !m_cursor->m_cursor->continueFunction(m_key.get())) { @@ -157,22 +157,22 @@ void IDBCursorBackendImpl::CursorIterationOperation::perform() m_callbacks->onSuccess(m_cursor->key(), m_cursor->primaryKey(), m_cursor->value()); } -void IDBCursorBackendImpl::deleteFunction(PassRefPtr prpCallbacks, ExceptionCode&) +void IDBCursorBackend::deleteFunction(PassRefPtr prpCallbacks, ExceptionCode&) { - LOG(StorageAPI, "IDBCursorBackendImpl::delete"); + LOG(StorageAPI, "IDBCursorBackend::delete"); ASSERT(m_transaction->mode() != IndexedDB::TransactionReadOnly); RefPtr keyRange = IDBKeyRange::create(m_cursor->primaryKey()); m_database->deleteRange(m_transaction.get()->id(), m_objectStoreId, keyRange.release(), prpCallbacks); } -void IDBCursorBackendImpl::prefetchContinue(int numberToFetch, PassRefPtr prpCallbacks, ExceptionCode&) +void IDBCursorBackend::prefetchContinue(int numberToFetch, PassRefPtr prpCallbacks, ExceptionCode&) { - LOG(StorageAPI, "IDBCursorBackendImpl::prefetchContinue"); + LOG(StorageAPI, "IDBCursorBackend::prefetchContinue"); RefPtr callbacks = prpCallbacks; m_transaction->scheduleTask(m_taskType, CursorPrefetchIterationOperation::create(this, numberToFetch, callbacks)); } -void IDBCursorBackendImpl::CursorPrefetchIterationOperation::perform() +void IDBCursorBackend::CursorPrefetchIterationOperation::perform() { LOG(StorageAPI, "CursorPrefetchIterationOperation"); @@ -221,9 +221,9 @@ void IDBCursorBackendImpl::CursorPrefetchIterationOperation::perform() m_callbacks->onSuccessWithPrefetch(foundKeys, foundPrimaryKeys, foundValues); } -void IDBCursorBackendImpl::prefetchReset(int usedPrefetches, int) +void IDBCursorBackend::prefetchReset(int usedPrefetches, int) { - LOG(StorageAPI, "IDBCursorBackendImpl::prefetchReset"); + LOG(StorageAPI, "IDBCursorBackend::prefetchReset"); m_cursor = m_savedCursor; m_savedCursor = 0; @@ -237,9 +237,9 @@ void IDBCursorBackendImpl::prefetchReset(int usedPrefetches, int) } } -void IDBCursorBackendImpl::close() +void IDBCursorBackend::close() { - LOG(StorageAPI, "IDBCursorBackendImpl::close"); + LOG(StorageAPI, "IDBCursorBackend::close"); m_closed = true; m_cursor.clear(); m_savedCursor.clear(); diff --git a/Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.h b/Source/WebCore/Modules/indexeddb/IDBCursorBackend.h similarity index 54% rename from Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.h rename to Source/WebCore/Modules/indexeddb/IDBCursorBackend.h index 4e767c10abf..b43ff79ce62 100644 --- a/Source/WebCore/Modules/indexeddb/IDBCursorBackendImpl.h +++ b/Source/WebCore/Modules/indexeddb/IDBCursorBackend.h @@ -24,13 +24,12 @@ */ -#ifndef IDBCursorBackendImpl_h -#define IDBCursorBackendImpl_h +#ifndef IDBCursorBackend_h +#define IDBCursorBackend_h #if ENABLE(INDEXED_DATABASE) #include "IDBBackingStoreInterface.h" -#include "IDBCursorBackendInterface.h" #include "IDBDatabaseBackendImpl.h" #include "IDBTransactionBackendImpl.h" #include "SharedBuffer.h" @@ -42,34 +41,33 @@ namespace WebCore { class IDBKeyRange; -class IDBCursorBackendImpl : public IDBCursorBackendInterface { +class IDBCursorBackend : public RefCounted { public: - static PassRefPtr create(PassRefPtr cursor, IndexedDB::CursorType cursorType, IDBTransactionBackendInterface* transaction, int64_t objectStoreId) + static PassRefPtr create(PassRefPtr cursor, IndexedDB::CursorType cursorType, IDBTransactionBackendInterface* transaction, int64_t objectStoreId) { - return adoptRef(new IDBCursorBackendImpl(cursor, cursorType, IDBDatabaseBackendInterface::NormalTask, transaction, objectStoreId)); + return adoptRef(new IDBCursorBackend(cursor, cursorType, IDBDatabaseBackendInterface::NormalTask, transaction, objectStoreId)); } - static PassRefPtr create(PassRefPtr cursor, IndexedDB::CursorType cursorType, IDBDatabaseBackendInterface::TaskType taskType, IDBTransactionBackendInterface* transaction, int64_t objectStoreId) + static PassRefPtr create(PassRefPtr cursor, IndexedDB::CursorType cursorType, IDBDatabaseBackendInterface::TaskType taskType, IDBTransactionBackendInterface* transaction, int64_t objectStoreId) { - return adoptRef(new IDBCursorBackendImpl(cursor, cursorType, taskType, transaction, objectStoreId)); + return adoptRef(new IDBCursorBackend(cursor, cursorType, taskType, transaction, objectStoreId)); } - virtual ~IDBCursorBackendImpl(); + ~IDBCursorBackend(); - // IDBCursorBackendInterface - virtual void advance(unsigned long, PassRefPtr, ExceptionCode&); - virtual void continueFunction(PassRefPtr, PassRefPtr, ExceptionCode&); - virtual void deleteFunction(PassRefPtr, ExceptionCode&); - virtual void prefetchContinue(int numberToFetch, PassRefPtr, ExceptionCode&); - virtual void prefetchReset(int usedPrefetches, int unusedPrefetches); - virtual void postSuccessHandlerCallback() { } + void advance(unsigned long, PassRefPtr, ExceptionCode&); + void continueFunction(PassRefPtr, PassRefPtr, ExceptionCode&); + void deleteFunction(PassRefPtr, ExceptionCode&); + void prefetchContinue(int numberToFetch, PassRefPtr, ExceptionCode&); + void prefetchReset(int usedPrefetches, int unusedPrefetches); + void postSuccessHandlerCallback() { } - virtual IDBKey* key() const OVERRIDE { return m_cursor->key().get(); } - virtual IDBKey* primaryKey() const OVERRIDE { return m_cursor->primaryKey().get(); } - virtual SharedBuffer* value() const OVERRIDE { return (m_cursorType == IndexedDB::CursorKeyOnly) ? 0 : m_cursor->value().get(); } + IDBKey* key() const { return m_cursor->key().get(); } + IDBKey* primaryKey() const { return m_cursor->primaryKey().get(); } + SharedBuffer* value() const { return (m_cursorType == IndexedDB::CursorKeyOnly) ? 0 : m_cursor->value().get(); } - virtual void close() OVERRIDE; + void close(); private: - IDBCursorBackendImpl(PassRefPtr, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, IDBTransactionBackendInterface*, int64_t objectStoreId); + IDBCursorBackend(PassRefPtr, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, IDBTransactionBackendInterface*, int64_t objectStoreId); class CursorIterationOperation; class CursorAdvanceOperation; @@ -91,4 +89,4 @@ private: #endif // ENABLE(INDEXED_DATABASE) -#endif // IDBCursorBackendImpl_h +#endif // IDBCursorBackend_h diff --git a/Source/WebCore/Modules/indexeddb/IDBCursorBackendInterface.h b/Source/WebCore/Modules/indexeddb/IDBCursorBackendInterface.h deleted file mode 100644 index f692b4184e1..00000000000 --- a/Source/WebCore/Modules/indexeddb/IDBCursorBackendInterface.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2010 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef IDBCursorBackendInterface_h -#define IDBCursorBackendInterface_h - -#if ENABLE(INDEXED_DATABASE) - -#include -#include - -namespace WebCore { - -class IDBCallbacks; -class IDBKey; -class IDBRequest; -class SharedBuffer; - -typedef int ExceptionCode; - -class IDBCursorBackendInterface : public RefCounted { -public: - virtual ~IDBCursorBackendInterface() {} - - virtual void advance(unsigned long count, PassRefPtr, ExceptionCode&) = 0; - virtual void continueFunction(PassRefPtr key, PassRefPtr, ExceptionCode&) = 0; - virtual void deleteFunction(PassRefPtr, ExceptionCode&) = 0; - virtual void prefetchContinue(int numberToFetch, PassRefPtr, ExceptionCode&) = 0; - virtual void prefetchReset(int usedPrefetches, int unusedPrefetches) = 0; - virtual void postSuccessHandlerCallback() = 0; - - virtual IDBKey* key() const = 0; - virtual IDBKey* primaryKey() const = 0; - virtual SharedBuffer* value() const = 0; - - virtual void close() = 0; -}; - -} // namespace WebCore - -#endif - -#endif // IDBCursorBackendInterface_h diff --git a/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.cpp b/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.cpp index 4036111049e..90ec57af552 100644 --- a/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.cpp +++ b/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.cpp @@ -28,12 +28,12 @@ #if ENABLE(INDEXED_DATABASE) -#include "IDBCursorBackendInterface.h" +#include "IDBCursorBackend.h" #include "IDBKey.h" namespace WebCore { -PassRefPtr IDBCursorWithValue::create(PassRefPtr backend, IndexedDB::CursorDirection direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction) +PassRefPtr IDBCursorWithValue::create(PassRefPtr backend, IndexedDB::CursorDirection direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction) { return adoptRef(new IDBCursorWithValue(backend, direction, request, source, transaction)); } @@ -44,7 +44,7 @@ PassRefPtr IDBCursorWithValue::fromCursor(PassRefPtr backend, IndexedDB::CursorDirection direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction) +IDBCursorWithValue::IDBCursorWithValue(PassRefPtr backend, IndexedDB::CursorDirection direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction) : IDBCursor(backend, direction, request, source, transaction) { } diff --git a/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.h b/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.h index 15823a0624a..0bb4ff4cd64 100644 --- a/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.h +++ b/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.h @@ -34,7 +34,7 @@ namespace WebCore { class IDBCursorWithValue : public IDBCursor { public: - static PassRefPtr create(PassRefPtr, IndexedDB::CursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*); + static PassRefPtr create(PassRefPtr, IndexedDB::CursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*); static PassRefPtr fromCursor(PassRefPtr); virtual ~IDBCursorWithValue(); @@ -45,7 +45,7 @@ protected: virtual bool isKeyCursor() const OVERRIDE { return false; } private: - IDBCursorWithValue(PassRefPtr, IndexedDB::CursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*); + IDBCursorWithValue(PassRefPtr, IndexedDB::CursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*); }; } // namespace WebCore diff --git a/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp b/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp index ef1840d41b7..162e9997d5f 100644 --- a/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp +++ b/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp @@ -29,7 +29,7 @@ #if ENABLE(INDEXED_DATABASE) #include "IDBBackingStoreInterface.h" -#include "IDBCursorBackendInterface.h" +#include "IDBCursorBackend.h" #include "IDBDatabaseCallbacks.h" #include "IDBDatabaseException.h" #include "IDBFactoryBackendInterface.h" diff --git a/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.h b/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.h index f3541a7574f..c8057d71939 100644 --- a/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.h +++ b/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.h @@ -66,7 +66,7 @@ public: virtual PassRefPtr maybeCreateTransactionBackend(IDBDatabaseBackendInterface*, int64_t transactionId, PassRefPtr, const Vector& objectStoreIds, IndexedDB::TransactionMode) = 0; - virtual PassRefPtr createCursorBackend(IDBTransactionBackendInterface&, IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, int64_t objectStoreId) = 0; + virtual PassRefPtr createCursorBackend(IDBTransactionBackendInterface&, IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, int64_t objectStoreId) = 0; }; } // namespace WebCore diff --git a/Source/WebCore/Modules/indexeddb/IDBRequest.cpp b/Source/WebCore/Modules/indexeddb/IDBRequest.cpp index e4d041b3d47..95d8cf6f549 100644 --- a/Source/WebCore/Modules/indexeddb/IDBRequest.cpp +++ b/Source/WebCore/Modules/indexeddb/IDBRequest.cpp @@ -37,7 +37,7 @@ #include "EventQueue.h" #include "ExceptionCodePlaceholder.h" #include "IDBBindingUtilities.h" -#include "IDBCursorBackendInterface.h" +#include "IDBCursorBackend.h" #include "IDBCursorWithValue.h" #include "IDBDatabase.h" #include "IDBEventDispatcher.h" @@ -275,7 +275,7 @@ void IDBRequest::onSuccess(PassRefPtr domStringList) enqueueEvent(createSuccessEvent()); } -void IDBRequest::onSuccess(PassRefPtr backend, PassRefPtr key, PassRefPtr primaryKey, PassRefPtr buffer) +void IDBRequest::onSuccess(PassRefPtr backend, PassRefPtr key, PassRefPtr primaryKey, PassRefPtr buffer) { LOG(StorageAPI, "IDBRequest::onSuccess(IDBCursor)"); if (!shouldEnqueueEvent()) diff --git a/Source/WebCore/Modules/indexeddb/IDBRequest.h b/Source/WebCore/Modules/indexeddb/IDBRequest.h index 7adbaff924f..5f59b7d7a9a 100644 --- a/Source/WebCore/Modules/indexeddb/IDBRequest.h +++ b/Source/WebCore/Modules/indexeddb/IDBRequest.h @@ -86,7 +86,7 @@ public: // IDBCallbacks virtual void onError(PassRefPtr); virtual void onSuccess(PassRefPtr); - virtual void onSuccess(PassRefPtr, PassRefPtr, PassRefPtr primaryKey, PassRefPtr); + virtual void onSuccess(PassRefPtr, PassRefPtr, PassRefPtr primaryKey, PassRefPtr); virtual void onSuccess(PassRefPtr); virtual void onSuccess(PassRefPtr); virtual void onSuccess(PassRefPtr, PassRefPtr, const IDBKeyPath&); diff --git a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp b/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp index 828d15193e6..7ab88b3351a 100644 --- a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp +++ b/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp @@ -28,7 +28,7 @@ #if ENABLE(INDEXED_DATABASE) -#include "IDBCursorBackendInterface.h" +#include "IDBCursorBackend.h" #include "IDBDatabaseBackendImpl.h" #include "IDBDatabaseCallbacks.h" #include "IDBDatabaseException.h" @@ -153,12 +153,12 @@ bool IDBTransactionBackendImpl::hasPendingTasks() const return m_pendingPreemptiveEvents || !isTaskQueueEmpty(); } -void IDBTransactionBackendImpl::registerOpenCursor(IDBCursorBackendInterface* cursor) +void IDBTransactionBackendImpl::registerOpenCursor(IDBCursorBackend* cursor) { m_openCursors.add(cursor); } -void IDBTransactionBackendImpl::unregisterOpenCursor(IDBCursorBackendInterface* cursor) +void IDBTransactionBackendImpl::unregisterOpenCursor(IDBCursorBackend* cursor) { m_openCursors.remove(cursor); } @@ -265,7 +265,7 @@ void IDBTransactionBackendImpl::taskTimerFired(Timer* void IDBTransactionBackendImpl::closeOpenCursors() { - for (HashSet::iterator i = m_openCursors.begin(); i != m_openCursors.end(); ++i) + for (HashSet::iterator i = m_openCursors.begin(); i != m_openCursors.end(); ++i) (*i)->close(); m_openCursors.clear(); } @@ -330,7 +330,7 @@ void IDBTransactionBackendImpl::scheduleClearOperation(int64_t objectStoreId, Pa scheduleTask(ClearOperation::create(this, m_backingStore.get(), database().id(), objectStoreId, callbacks)); } -PassRefPtr IDBTransactionBackendImpl::createCursorBackend(IDBBackingStoreCursorInterface& cursor, IndexedDB::CursorType cursorType, IDBDatabaseBackendInterface::TaskType taskType, int64_t objectStoreId) +PassRefPtr IDBTransactionBackendImpl::createCursorBackend(IDBBackingStoreCursorInterface& cursor, IndexedDB::CursorType cursorType, IDBDatabaseBackendInterface::TaskType taskType, int64_t objectStoreId) { return m_database->factoryBackend().createCursorBackend(*this, cursor, cursorType, taskType, objectStoreId); } diff --git a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h b/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h index 7e6b348120c..619a612e80f 100644 --- a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h +++ b/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h @@ -59,8 +59,8 @@ public: virtual void scheduleTask(PassOwnPtr task, PassOwnPtr abortTask = nullptr) { scheduleTask(IDBDatabaseBackendInterface::NormalTask, task, abortTask); } virtual void scheduleTask(IDBDatabaseBackendInterface::TaskType, PassOwnPtr, PassOwnPtr abortTask = nullptr) OVERRIDE; - virtual void registerOpenCursor(IDBCursorBackendInterface*) OVERRIDE; - virtual void unregisterOpenCursor(IDBCursorBackendInterface*) OVERRIDE; + virtual void registerOpenCursor(IDBCursorBackend*) OVERRIDE; + virtual void unregisterOpenCursor(IDBCursorBackend*) OVERRIDE; virtual void addPreemptiveEvent() OVERRIDE { m_pendingPreemptiveEvents++; } virtual void didCompletePreemptiveEvent() OVERRIDE { m_pendingPreemptiveEvents--; ASSERT(m_pendingPreemptiveEvents >= 0); } @@ -81,7 +81,7 @@ public: virtual void scheduleDeleteRangeOperation(int64_t objectStoreId, PassRefPtr, PassRefPtr) OVERRIDE FINAL; virtual void scheduleClearOperation(int64_t objectStoreId, PassRefPtr) OVERRIDE FINAL; - virtual PassRefPtr createCursorBackend(IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, int64_t objectStoreId) OVERRIDE; + virtual PassRefPtr createCursorBackend(IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, int64_t objectStoreId) OVERRIDE; private: IDBTransactionBackendImpl(IDBDatabaseBackendImpl*, int64_t id, PassRefPtr, const HashSet& objectStoreIds, IndexedDB::TransactionMode); @@ -120,7 +120,7 @@ private: Timer m_taskTimer; int m_pendingPreemptiveEvents; - HashSet m_openCursors; + HashSet m_openCursors; RefPtr m_backingStore; }; diff --git a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h b/Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h index 507b709c02a..5902c61a2eb 100644 --- a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h +++ b/Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h @@ -63,8 +63,8 @@ public: virtual void scheduleTask(PassOwnPtr, PassOwnPtr abortTask = nullptr) = 0; virtual void scheduleTask(IDBDatabaseBackendInterface::TaskType, PassOwnPtr, PassOwnPtr abortTask = nullptr) = 0; - virtual void registerOpenCursor(IDBCursorBackendInterface*) = 0; - virtual void unregisterOpenCursor(IDBCursorBackendInterface*) = 0; + virtual void registerOpenCursor(IDBCursorBackend*) = 0; + virtual void unregisterOpenCursor(IDBCursorBackend*) = 0; virtual void scheduleCreateObjectStoreOperation(const IDBObjectStoreMetadata&) = 0; virtual void scheduleDeleteObjectStoreOperation(const IDBObjectStoreMetadata&) = 0; @@ -85,7 +85,7 @@ public: virtual IDBBackingStoreTransactionInterface& backingStoreTransaction() = 0; virtual IDBDatabaseBackendInterface& database() const = 0; - virtual PassRefPtr createCursorBackend(IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, int64_t objectStoreId) = 0; + virtual PassRefPtr createCursorBackend(IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, int64_t objectStoreId) = 0; int64_t id() const { return m_id; } diff --git a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp b/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp index a369a068fcd..325ae2615b6 100644 --- a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp +++ b/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "IDBTransactionBackendOperations.h" -#include "IDBCursorBackendInterface.h" +#include "IDBCursorBackend.h" #include "IDBDatabaseCallbacks.h" #include "IDBIndexWriter.h" #include "IDBKeyRange.h" @@ -280,7 +280,7 @@ void OpenCursorOperation::perform() IDBDatabaseBackendInterface::TaskType taskType(static_cast(m_taskType)); - RefPtr cursor = m_transaction->createCursorBackend(*backingStoreCursor, m_cursorType, taskType, m_objectStoreId); + RefPtr cursor = m_transaction->createCursorBackend(*backingStoreCursor, m_cursorType, taskType, m_objectStoreId); m_callbacks->onSuccess(cursor, cursor->key(), cursor->primaryKey(), cursor->value()); } diff --git a/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.cpp b/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.cpp index 796a1a153c5..dfbcbf046e8 100644 --- a/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.cpp +++ b/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.cpp @@ -31,7 +31,7 @@ #include "DOMStringList.h" #include "IDBBackingStoreLevelDB.h" -#include "IDBCursorBackendImpl.h" +#include "IDBCursorBackend.h" #include "IDBDatabaseBackendImpl.h" #include "IDBDatabaseException.h" #include "IDBTransactionBackendImpl.h" @@ -197,9 +197,9 @@ PassRefPtr IDBFactoryBackendLevelDB::maybeCreate return IDBTransactionBackendImpl::create(static_cast(backend), transactionId, databaseCallbacks, objectStoreIds, mode); } -PassRefPtr IDBFactoryBackendLevelDB::createCursorBackend(IDBTransactionBackendInterface& transactionBackend, IDBBackingStoreCursorInterface& backingStoreCursor, IndexedDB::CursorType cursorType, IDBDatabaseBackendInterface::TaskType taskType, int64_t objectStoreId) +PassRefPtr IDBFactoryBackendLevelDB::createCursorBackend(IDBTransactionBackendInterface& transactionBackend, IDBBackingStoreCursorInterface& backingStoreCursor, IndexedDB::CursorType cursorType, IDBDatabaseBackendInterface::TaskType taskType, int64_t objectStoreId) { - return IDBCursorBackendImpl::create(&backingStoreCursor, cursorType, taskType, &transactionBackend, objectStoreId); + return IDBCursorBackend::create(&backingStoreCursor, cursorType, taskType, &transactionBackend, objectStoreId); } diff --git a/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h b/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h index dad10f81890..86f5024d708 100644 --- a/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h +++ b/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h @@ -65,7 +65,7 @@ public: virtual PassRefPtr maybeCreateTransactionBackend(IDBDatabaseBackendInterface*, int64_t transactionId, PassRefPtr, const Vector&, IndexedDB::TransactionMode) OVERRIDE FINAL; - virtual PassRefPtr createCursorBackend(IDBTransactionBackendInterface&, IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, int64_t objectStoreId); + virtual PassRefPtr createCursorBackend(IDBTransactionBackendInterface&, IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, int64_t objectStoreId); protected: virtual PassRefPtr openBackingStore(const SecurityOrigin&, const String& dataDir); diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj index 1f1c9863a6e..910f4bd7d6a 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ 510184690B08602A004A825F /* CachedPage.h in Headers */ = {isa = PBXBuildFile; fileRef = 510184670B08602A004A825F /* CachedPage.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5101846A0B08602A004A825F /* CachedPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510184680B08602A004A825F /* CachedPage.cpp */; }; 51059DDB1820B17600DFF9B1 /* IDBTransactionBackendImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51059DD71820B17600DFF9B1 /* IDBTransactionBackendImpl.cpp */; }; - 51059DDC1820B17600DFF9B1 /* IDBTransactionBackendImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 51059DD81820B17600DFF9B1 /* IDBTransactionBackendImpl.h */; }; + 51059DDC1820B17600DFF9B1 /* IDBTransactionBackendImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 51059DD81820B17600DFF9B1 /* IDBTransactionBackendImpl.h */; settings = {ATTRIBUTES = (Private, ); }; }; 51059DDD1820B17600DFF9B1 /* IDBTransactionBackendOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51059DD91820B17600DFF9B1 /* IDBTransactionBackendOperations.cpp */; }; 51059DDE1820B17600DFF9B1 /* IDBTransactionBackendOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 51059DDA1820B17600DFF9B1 /* IDBTransactionBackendOperations.h */; }; 510D4A33103165EE0049EA54 /* SocketStreamErrorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A2D103165EE0049EA54 /* SocketStreamErrorBase.cpp */; }; @@ -1687,7 +1687,7 @@ 512DD8FC0D91E6AF000F89EE /* ArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 512DD8F20D91E6AF000F89EE /* ArchiveResource.h */; settings = {ATTRIBUTES = (Private, ); }; }; 512DD8FD0D91E6AF000F89EE /* ArchiveFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 512DD8F30D91E6AF000F89EE /* ArchiveFactory.h */; }; 512EA9BC181F2EE0001D01E0 /* IDBPendingOpenCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 512EA9BB181F2EE0001D01E0 /* IDBPendingOpenCall.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 512EA9BE18202857001D01E0 /* IDBOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 512EA9BD18202857001D01E0 /* IDBOperation.h */; }; + 512EA9BE18202857001D01E0 /* IDBOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 512EA9BD18202857001D01E0 /* IDBOperation.h */; settings = {ATTRIBUTES = (Private, ); }; }; 51327D6011A33A2B004F9D65 /* SinkDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 51327D5E11A33A2B004F9D65 /* SinkDocument.h */; }; 51327D6111A33A2B004F9D65 /* SinkDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51327D5F11A33A2B004F9D65 /* SinkDocument.cpp */; }; 513F14530AB634C400094DDF /* IconLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 513F14510AB634C400094DDF /* IconLoader.cpp */; }; @@ -1725,8 +1725,6 @@ 514C767E0CE923A1007EF3CD /* ResourceResponseBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C76690CE923A1007EF3CD /* ResourceResponseBase.cpp */; }; 514C767F0CE923A1007EF3CD /* ResourceResponseBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 514C766A0CE923A1007EF3CD /* ResourceResponseBase.h */; settings = {ATTRIBUTES = (Private, ); }; }; 515788C11207852C00A37C4A /* VisitedLinkStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 515788C01207852C00A37C4A /* VisitedLinkStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 515C321518216A5B00A6DAA9 /* IDBCursorBackendImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515C321318216A5B00A6DAA9 /* IDBCursorBackendImpl.cpp */; }; - 515C321618216A5B00A6DAA9 /* IDBCursorBackendImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 515C321418216A5B00A6DAA9 /* IDBCursorBackendImpl.h */; }; 5160300B0CC4251200C8AC25 /* FileSystemPOSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5160300A0CC4251200C8AC25 /* FileSystemPOSIX.cpp */; }; 5160306C0CC4362300C8AC25 /* FileSystemCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5160306B0CC4362300C8AC25 /* FileSystemCF.cpp */; }; 5160F4980B0AA75F00C1D2AF /* HistoryItemMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160F4970B0AA75F00C1D2AF /* HistoryItemMac.mm */; }; @@ -1744,6 +1742,8 @@ 51660AC31828C84600074CAD /* IDBBackingStoreTransactionLevelDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 51660ABF1828C84600074CAD /* IDBBackingStoreTransactionLevelDB.h */; }; 51660AC61828C86000074CAD /* IDBBackingStoreCursorInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 51660AC41828C86000074CAD /* IDBBackingStoreCursorInterface.h */; settings = {ATTRIBUTES = (Private, ); }; }; 51660AC71828C86000074CAD /* IDBBackingStoreTransactionInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 51660AC51828C86000074CAD /* IDBBackingStoreTransactionInterface.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 516730A3182D8FBB003FAF5C /* IDBCursorBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 516730A1182D8FBB003FAF5C /* IDBCursorBackend.cpp */; }; + 516730A4182D8FBB003FAF5C /* IDBCursorBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = 516730A2182D8FBB003FAF5C /* IDBCursorBackend.h */; settings = {ATTRIBUTES = (Private, ); }; }; 516953971329A3C800B92D04 /* IconDatabaseBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 516953951329A3C800B92D04 /* IconDatabaseBase.cpp */; }; 516953981329A3C800B92D04 /* IconDatabaseBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 516953961329A3C800B92D04 /* IconDatabaseBase.h */; settings = {ATTRIBUTES = (Private, ); }; }; 516BB7940CE91E6800512F79 /* JSTreeWalkerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 516BB7920CE91E6800512F79 /* JSTreeWalkerCustom.cpp */; }; @@ -1780,7 +1780,6 @@ 51D719BE181106E00016DC51 /* IDBCallbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D71974181106DF0016DC51 /* IDBCallbacks.h */; settings = {ATTRIBUTES = (Private, ); }; }; 51D719BF181106E00016DC51 /* IDBCursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D71975181106DF0016DC51 /* IDBCursor.cpp */; }; 51D719C0181106E00016DC51 /* IDBCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D71976181106DF0016DC51 /* IDBCursor.h */; }; - 51D719C2181106E00016DC51 /* IDBCursorBackendInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D71978181106DF0016DC51 /* IDBCursorBackendInterface.h */; settings = {ATTRIBUTES = (Private, ); }; }; 51D719C3181106E00016DC51 /* IDBCursorWithValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D71979181106DF0016DC51 /* IDBCursorWithValue.cpp */; }; 51D719C4181106E00016DC51 /* IDBCursorWithValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D7197A181106DF0016DC51 /* IDBCursorWithValue.h */; }; 51D719C6181106E00016DC51 /* IDBDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D7197C181106DF0016DC51 /* IDBDatabase.cpp */; }; @@ -8408,8 +8407,6 @@ 514C76690CE923A1007EF3CD /* ResourceResponseBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceResponseBase.cpp; sourceTree = ""; }; 514C766A0CE923A1007EF3CD /* ResourceResponseBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceResponseBase.h; sourceTree = ""; }; 515788C01207852C00A37C4A /* VisitedLinkStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkStrategy.h; sourceTree = ""; }; - 515C321318216A5B00A6DAA9 /* IDBCursorBackendImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBCursorBackendImpl.cpp; sourceTree = ""; }; - 515C321418216A5B00A6DAA9 /* IDBCursorBackendImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursorBackendImpl.h; sourceTree = ""; }; 5160300A0CC4251200C8AC25 /* FileSystemPOSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystemPOSIX.cpp; sourceTree = ""; }; 5160306B0CC4362300C8AC25 /* FileSystemCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystemCF.cpp; sourceTree = ""; }; 5160F4970B0AA75F00C1D2AF /* HistoryItemMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = HistoryItemMac.mm; path = mac/HistoryItemMac.mm; sourceTree = ""; }; @@ -8427,6 +8424,8 @@ 51660ABF1828C84600074CAD /* IDBBackingStoreTransactionLevelDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBBackingStoreTransactionLevelDB.h; sourceTree = ""; }; 51660AC41828C86000074CAD /* IDBBackingStoreCursorInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBBackingStoreCursorInterface.h; sourceTree = ""; }; 51660AC51828C86000074CAD /* IDBBackingStoreTransactionInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBBackingStoreTransactionInterface.h; sourceTree = ""; }; + 516730A1182D8FBB003FAF5C /* IDBCursorBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBCursorBackend.cpp; sourceTree = ""; }; + 516730A2182D8FBB003FAF5C /* IDBCursorBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursorBackend.h; sourceTree = ""; }; 516953951329A3C800B92D04 /* IconDatabaseBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IconDatabaseBase.cpp; sourceTree = ""; }; 516953961329A3C800B92D04 /* IconDatabaseBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconDatabaseBase.h; sourceTree = ""; }; 516BB7920CE91E6800512F79 /* JSTreeWalkerCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTreeWalkerCustom.cpp; sourceTree = ""; }; @@ -8470,7 +8469,6 @@ 51D71975181106DF0016DC51 /* IDBCursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBCursor.cpp; sourceTree = ""; }; 51D71976181106DF0016DC51 /* IDBCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursor.h; sourceTree = ""; }; 51D71977181106DF0016DC51 /* IDBCursor.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBCursor.idl; sourceTree = ""; }; - 51D71978181106DF0016DC51 /* IDBCursorBackendInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursorBackendInterface.h; sourceTree = ""; }; 51D71979181106DF0016DC51 /* IDBCursorWithValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBCursorWithValue.cpp; sourceTree = ""; }; 51D7197A181106DF0016DC51 /* IDBCursorWithValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursorWithValue.h; sourceTree = ""; }; 51D7197B181106DF0016DC51 /* IDBCursorWithValue.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBCursorWithValue.idl; sourceTree = ""; }; @@ -16952,9 +16950,8 @@ 51D71975181106DF0016DC51 /* IDBCursor.cpp */, 51D71976181106DF0016DC51 /* IDBCursor.h */, 51D71977181106DF0016DC51 /* IDBCursor.idl */, - 515C321318216A5B00A6DAA9 /* IDBCursorBackendImpl.cpp */, - 515C321418216A5B00A6DAA9 /* IDBCursorBackendImpl.h */, - 51D71978181106DF0016DC51 /* IDBCursorBackendInterface.h */, + 516730A1182D8FBB003FAF5C /* IDBCursorBackend.cpp */, + 516730A2182D8FBB003FAF5C /* IDBCursorBackend.h */, 51D71979181106DF0016DC51 /* IDBCursorWithValue.cpp */, 51D7197A181106DF0016DC51 /* IDBCursorWithValue.h */, 51D7197B181106DF0016DC51 /* IDBCursorWithValue.idl */, @@ -22913,7 +22910,6 @@ 9746AF2514F4DDE6003E7A71 /* GeolocationClient.h in Headers */, 9746AF2714F4DDE6003E7A70 /* GeolocationController.h in Headers */, 9746AF2814F4DDE6003E7A70 /* GeolocationError.h in Headers */, - 515C321618216A5B00A6DAA9 /* IDBCursorBackendImpl.h in Headers */, 078E091A17D14D1C00420AA1 /* NavigatorMediaStream.h in Headers */, 9746AF2914F4DDE6003E7A70 /* GeolocationPosition.h in Headers */, 9746AF2A14F4DDE6003E7A70 /* Geoposition.h in Headers */, @@ -23347,7 +23343,6 @@ 8482B7521198CB6B00BFB005 /* JSHashChangeEvent.h in Headers */, BC94D14F0C275C68006BC617 /* JSHistory.h in Headers */, BC97E413109154FA0010D361 /* JSHTMLAllCollection.h in Headers */, - 51D719C2181106E00016DC51 /* IDBCursorBackendInterface.h in Headers */, 1A4A2DF00A1B852A00C807F8 /* JSHTMLAnchorElement.h in Headers */, 1A4A2DF20A1B852A00C807F8 /* JSHTMLAppletElement.h in Headers */, 1AE2AA1F0A1CDAB400B42B25 /* JSHTMLAreaElement.h in Headers */, @@ -23519,6 +23514,7 @@ AA7FEEA716A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.h in Headers */, AA7FEEA916A4E6F3004C0C33 /* JSSpeechSynthesisVoice.h in Headers */, BC8243290D0CE8A200460C8F /* JSSQLError.h in Headers */, + 516730A4182D8FBB003FAF5C /* IDBCursorBackend.h in Headers */, B525A96511CA2340003A23A8 /* JSSQLException.h in Headers */, 1AE82FED0CAB07EE002237AE /* JSSQLResultSet.h in Headers */, 1AFE119A0CBFFCC4003017FA /* JSSQLResultSetRowList.h in Headers */, @@ -26432,7 +26428,6 @@ 82AB1773125C826700C5069D /* InspectorStyleSheet.cpp in Sources */, 82889B4C13C62392009A6156 /* InspectorStyleTextEditor.cpp in Sources */, 07277E4E17D018CC0015534D /* JSMediaStreamAudioDestinationNode.cpp in Sources */, - 515C321518216A5B00A6DAA9 /* IDBCursorBackendImpl.cpp in Sources */, 754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */, 573D134714CE39FF0057ABCA /* InspectorTypeBuilder.cpp in Sources */, 4F3289B511A42AAB005ABE7E /* InspectorValues.cpp in Sources */, @@ -27278,6 +27273,7 @@ 371E65CE13661EED00BEEDB0 /* PageSerializer.cpp in Sources */, A7197F2617568AE5007B9442 /* PageThrottler.cpp in Sources */, E1284AEA10447DEE00EAEB52 /* PageTransitionEvent.cpp in Sources */, + 516730A3182D8FBB003FAF5C /* IDBCursorBackend.cpp in Sources */, 51E1ECC20C91C90400DC255B /* PageURLRecord.cpp in Sources */, FFD5B97A135CC97800D5E92A /* PageVisibilityState.cpp in Sources */, FD3160A212B026F700C1A359 /* Panner.cpp in Sources */, diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 9dad23914d1..da7c328a778 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,14 @@ +2013-11-08 Brady Eidson + + Merge IDBCursorBackendInterface and IDBCursorBackendImpl + https://bugs.webkit.org/show_bug.cgi?id=124068 + + Reviewed by Anders Carlsson. + + * WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp: + (WebKit::WebIDBFactoryBackend::createCursorBackend): + * WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h: + 2013-11-08 Anders Carlsson Remove a workaround for a bug in malloc on Symbian diff --git a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp index c15c7c6fe45..0c16f66e35e 100644 --- a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp +++ b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp @@ -33,7 +33,7 @@ #include "WebProcessIDBDatabaseBackend.h" #include "WebToDatabaseProcessConnection.h" #include -#include +#include #include #include #include @@ -106,7 +106,7 @@ PassRefPtr WebIDBFactoryBackend::maybeCreateTran return 0; } -PassRefPtr WebIDBFactoryBackend::createCursorBackend(IDBTransactionBackendInterface&, IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, int64_t) +PassRefPtr WebIDBFactoryBackend::createCursorBackend(IDBTransactionBackendInterface&, IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, int64_t) { notImplemented(); return 0; diff --git a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h index bfe5efc1cfe..24e025adbf9 100644 --- a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h +++ b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h @@ -47,7 +47,7 @@ public: virtual PassRefPtr maybeCreateTransactionBackend(WebCore::IDBDatabaseBackendInterface*, int64_t transactionId, PassRefPtr, const Vector&, WebCore::IndexedDB::TransactionMode) OVERRIDE; - virtual PassRefPtr createCursorBackend(WebCore::IDBTransactionBackendInterface&, WebCore::IDBBackingStoreCursorInterface&, WebCore::IndexedDB::CursorType, WebCore::IDBDatabaseBackendInterface::TaskType, int64_t objectStoreId) OVERRIDE; + virtual PassRefPtr createCursorBackend(WebCore::IDBTransactionBackendInterface&, WebCore::IDBBackingStoreCursorInterface&, WebCore::IndexedDB::CursorType, WebCore::IDBDatabaseBackendInterface::TaskType, int64_t objectStoreId) OVERRIDE; private: explicit WebIDBFactoryBackend(const String& databaseDirectoryIdentifier); -- GitLab