| Index: Source/WebKit/chromium/src/IDBCallbacksProxy.h
|
| diff --git a/Source/WebKit/chromium/src/IDBCallbacksProxy.h b/Source/WebKit/chromium/src/IDBCallbacksProxy.h
|
| index 5aaf130b2ecb855ecc13de34f0827eadb1bd42fe..325b5545107050fb042854af8f60755ea11688ff 100644
|
| --- a/Source/WebKit/chromium/src/IDBCallbacksProxy.h
|
| +++ b/Source/WebKit/chromium/src/IDBCallbacksProxy.h
|
| @@ -29,6 +29,7 @@
|
| #ifndef IDBCallbacksProxy_h
|
| #define IDBCallbacksProxy_h
|
|
|
| +#include "heap/Handle.h"
|
| #include "modules/indexeddb/IDBCallbacks.h"
|
| #include <wtf/PassOwnPtr.h>
|
| #include <wtf/PassRefPtr.h>
|
| @@ -41,13 +42,13 @@ class IDBDatabaseCallbacksProxy;
|
|
|
| class IDBCallbacksProxy : public WebCore::IDBCallbacks {
|
| public:
|
| - static PassRefPtr<IDBCallbacksProxy> create(PassOwnPtr<WebIDBCallbacks>);
|
| + static IDBCallbacksProxy* create(PassOwnPtr<WebIDBCallbacks>);
|
| virtual ~IDBCallbacksProxy();
|
|
|
| virtual void onError(PassRefPtr<WebCore::IDBDatabaseError>);
|
| virtual void onSuccess(const Vector<String>&);
|
| virtual void onSuccess(PassRefPtr<WebCore::IDBCursorBackendInterface>, PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBKey> primaryKey, PassRefPtr<WebCore::SharedBuffer>);
|
| - virtual void onSuccess(PassRefPtr<WebCore::IDBDatabaseBackendInterface>, const WebCore::IDBDatabaseMetadata&);
|
| + virtual void onSuccess(WebCore::IDBDatabaseBackendInterface*, const WebCore::IDBDatabaseMetadata&);
|
| virtual void onSuccess(PassRefPtr<WebCore::IDBKey>);
|
| virtual void onSuccess(PassRefPtr<WebCore::SharedBuffer>);
|
| virtual void onSuccess(PassRefPtr<WebCore::SharedBuffer>, PassRefPtr<WebCore::IDBKey>, const WebCore::IDBKeyPath&);
|
| @@ -56,15 +57,17 @@ public:
|
| virtual void onSuccess(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBKey> primaryKey, PassRefPtr<WebCore::SharedBuffer>);
|
| virtual void onSuccessWithPrefetch(const Vector<RefPtr<WebCore::IDBKey> >& keys, const Vector<RefPtr<WebCore::IDBKey> >& primaryKeys, const Vector<RefPtr<WebCore::SharedBuffer> >& values);
|
| virtual void onBlocked(int64_t existingVersion);
|
| - virtual void onUpgradeNeeded(int64_t oldVersion, PassRefPtr<WebCore::IDBDatabaseBackendInterface>, const WebCore::IDBDatabaseMetadata&);
|
| + virtual void onUpgradeNeeded(int64_t oldVersion, WebCore::IDBDatabaseBackendInterface*, const WebCore::IDBDatabaseMetadata&);
|
|
|
| - void setDatabaseCallbacks(PassRefPtr<IDBDatabaseCallbacksProxy>);
|
| + void setDatabaseCallbacks(IDBDatabaseCallbacksProxy*);
|
| +
|
| + void trace(WebCore::Visitor*);
|
|
|
| private:
|
| IDBCallbacksProxy(PassOwnPtr<WebIDBCallbacks>);
|
|
|
| OwnPtr<WebIDBCallbacks> m_callbacks;
|
| - RefPtr<IDBDatabaseCallbacksProxy> m_databaseCallbacks;
|
| + WebCore::Member<IDBDatabaseCallbacksProxy> m_databaseCallbacks;
|
| bool m_didComplete;
|
| bool m_didCreateProxy;
|
| };
|
|
|