| Index: Source/WebKit/chromium/tests/IDBTransactionTest.cpp
|
| diff --git a/Source/WebKit/chromium/tests/IDBTransactionTest.cpp b/Source/WebKit/chromium/tests/IDBTransactionTest.cpp
|
| index 1498610ac5a30699a700048d229a63a5946af0f6..33e3ac0e5e96dae7c521403e5c1b9f6d8513179d 100644
|
| --- a/Source/WebKit/chromium/tests/IDBTransactionTest.cpp
|
| +++ b/Source/WebKit/chromium/tests/IDBTransactionTest.cpp
|
| @@ -84,12 +84,12 @@ private:
|
|
|
| class FakeIDBDatabaseBackendProxy : public IDBDatabaseBackendInterface {
|
| public:
|
| - static PassRefPtr<FakeIDBDatabaseBackendProxy> create() { return adoptRef(new FakeIDBDatabaseBackendProxy()); }
|
| + static FakeIDBDatabaseBackendProxy* create() { return new FakeIDBDatabaseBackendProxy(); }
|
|
|
| virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) OVERRIDE { }
|
| virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) OVERRIDE { }
|
| - virtual void createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, unsigned short mode) OVERRIDE { }
|
| - virtual void close(PassRefPtr<IDBDatabaseCallbacks>) OVERRIDE { }
|
| + virtual void createTransaction(int64_t transactionId, IDBDatabaseCallbacks*, const Vector<int64_t>& objectStoreIds, unsigned short mode) OVERRIDE { }
|
| + virtual void close(IDBDatabaseCallbacks*) OVERRIDE { }
|
|
|
| virtual void commit(int64_t transactionId) OVERRIDE { }
|
| virtual void abort(int64_t transactionId) OVERRIDE { }
|
| @@ -98,14 +98,16 @@ public:
|
| virtual void createIndex(int64_t transactionId, int64_t objectStoreId, int64_t indexId, const String& name, const IDBKeyPath&, bool unique, bool multiEntry) OVERRIDE { }
|
| virtual void deleteIndex(int64_t transactionId, int64_t objectStoreId, int64_t indexId) OVERRIDE { }
|
|
|
| - virtual void get(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, bool keyOnly, PassRefPtr<IDBCallbacks>) OVERRIDE { }
|
| - virtual void put(int64_t transactionId, int64_t objectStoreId, PassRefPtr<SharedBuffer> value, PassRefPtr<IDBKey>, PutMode, PassRefPtr<IDBCallbacks>, const Vector<int64_t>& indexIds, const Vector<IndexKeys>&) OVERRIDE { }
|
| + virtual void get(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, bool keyOnly, IDBCallbacks*) OVERRIDE { }
|
| + virtual void put(int64_t transactionId, int64_t objectStoreId, PassRefPtr<SharedBuffer> value, PassRefPtr<IDBKey>, PutMode, IDBCallbacks*, const Vector<int64_t>& indexIds, const Vector<IndexKeys>&) OVERRIDE { }
|
| virtual void setIndexKeys(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBKey>, const Vector<int64_t>& indexIds, const Vector<IndexKeys>&) OVERRIDE { }
|
| virtual void setIndexesReady(int64_t transactionId, int64_t objectStoreId, const Vector<int64_t>& indexIds) OVERRIDE { }
|
| - virtual void openCursor(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, IndexedDB::CursorDirection, bool keyOnly, TaskType, PassRefPtr<IDBCallbacks>) OVERRIDE { }
|
| - virtual void count(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>) OVERRIDE { }
|
| - virtual void deleteRange(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>) OVERRIDE { }
|
| - virtual void clear(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBCallbacks>) OVERRIDE { }
|
| + virtual void openCursor(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, IndexedDB::CursorDirection, bool keyOnly, TaskType, IDBCallbacks*) OVERRIDE { }
|
| + virtual void count(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, IDBCallbacks*) OVERRIDE { }
|
| + virtual void deleteRange(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBKeyRange>, IDBCallbacks*) OVERRIDE { }
|
| + virtual void clear(int64_t transactionId, int64_t objectStoreId, IDBCallbacks*) OVERRIDE { }
|
| +
|
| + virtual void trace(Visitor*) OVERRIDE { }
|
|
|
| private:
|
| FakeIDBDatabaseBackendProxy() { }
|
| @@ -113,11 +115,12 @@ private:
|
|
|
| class FakeIDBDatabaseCallbacks : public IDBDatabaseCallbacks {
|
| public:
|
| - static PassRefPtr<FakeIDBDatabaseCallbacks> create() { return adoptRef(new FakeIDBDatabaseCallbacks()); }
|
| + static FakeIDBDatabaseCallbacks* create() { return new FakeIDBDatabaseCallbacks(); }
|
| virtual void onVersionChange(int64_t oldVersion, int64_t newVersion) OVERRIDE { }
|
| virtual void onForcedClose() OVERRIDE { }
|
| virtual void onAbort(int64_t transactionId, PassRefPtr<IDBDatabaseError> error) OVERRIDE { }
|
| virtual void onComplete(int64_t transactionId) OVERRIDE { }
|
| + virtual void trace(Visitor*) OVERRIDE { }
|
| private:
|
| FakeIDBDatabaseCallbacks() { }
|
| };
|
| @@ -127,8 +130,8 @@ TEST_F(IDBTransactionTest, EnsureLifetime)
|
| v8::HandleScope handleScope;
|
| v8::Context::Scope scope(context());
|
|
|
| - RefPtr<FakeIDBDatabaseBackendProxy> proxy = FakeIDBDatabaseBackendProxy::create();
|
| - RefPtr<FakeIDBDatabaseCallbacks> connection = FakeIDBDatabaseCallbacks::create();
|
| + FakeIDBDatabaseBackendProxy* proxy = FakeIDBDatabaseBackendProxy::create();
|
| + FakeIDBDatabaseCallbacks* connection = FakeIDBDatabaseCallbacks::create();
|
| RefPtr<IDBDatabase> db = IDBDatabase::create(scriptExecutionContext(), proxy, connection);
|
|
|
| const int64_t transactionId = 1234;
|
|
|