1 files changed, 15 insertions, 22 deletions
diff --git a/WebKit/chromium/src/IDBCallbacksProxy.h b/WebKit/chromium/src/IDBCallbacksProxy.h
index e803c96..692b0a3 100644
--- a/WebKit/chromium/src/IDBCallbacksProxy.h
+++ b/WebKit/chromium/src/IDBCallbacksProxy.h
@@ -29,40 +29,33 @@
 #ifndef IDBCallbacksProxy_h
 #define IDBCallbacksProxy_h
 
-#include "IDBCallbacks.h"
-#include "IDBDatabaseError.h"
 #include "WebIDBCallbacks.h"
-#include "WebIDBDatabaseError.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 
 #if ENABLE(INDEXED_DATABASE)
 
-namespace WebCore {
+namespace WebKit {
+class WebIDBDatabase;
+class WebIDBDatabaseError;
+class WebSerializedScriptValue;
+}
 
-template <typename WebKitClass, typename WebCoreClass, typename WebCoreProxy>
-class IDBCallbacksProxy : public WebKit::WebIDBCallbacks<WebKitClass> {
-public:
-    IDBCallbacksProxy(PassRefPtr<IDBCallbacks<WebCoreClass> > callbacks)
-        : m_callbacks(callbacks) { }
+namespace WebCore {
 
-    virtual ~IDBCallbacksProxy() { }
+class IDBCallbacks;
 
-    virtual void onSuccess(WebKitClass* webKitInstance)
-    {
-        RefPtr<WebCoreClass> proxy = WebCoreProxy::create(webKitInstance);
-        m_callbacks->onSuccess(proxy);
-        m_callbacks.clear();
-    }
+class IDBCallbacksProxy : public WebKit::WebIDBCallbacks {
+public:
+    IDBCallbacksProxy(PassRefPtr<IDBCallbacks> callbacks);
+    virtual ~IDBCallbacksProxy();
 
-    virtual void onError(const WebKit::WebIDBDatabaseError& error)
-    {
-        m_callbacks->onError(error);
-        m_callbacks.clear();
-    }
+    virtual void onError(const WebKit::WebIDBDatabaseError& error);
+    virtual void onSuccess(WebKit::WebIDBDatabase* webKitInstance);
+    virtual void onSuccess(const WebKit::WebSerializedScriptValue& serializedScriptValue);
 
 private:
-    PassRefPtr<IDBCallbacks<WebCoreClass> > m_callbacks;
+    RefPtr<IDBCallbacks> m_callbacks;
 };