webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 3 insertions, 88 deletions

diff --git a/Source/WebKit2/UIProcess/AutoCorrectionCallback.h b/Source/WebKit2/UIProcess/AutoCorrectionCallback.h
index 90cf9284e..fca183cdc 100644
--- a/Source/WebKit2/UIProcess/AutoCorrectionCallback.h
+++ b/Source/WebKit2/UIProcess/AutoCorrectionCallback.h
@@ -30,98 +30,13 @@
 #include "GenericCallback.h"
 #include "WKAPICast.h"
 #include <wtf/HashMap.h>
-#include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
 namespace WebKit {
 
-class AutocorrectionDataCallback : public CallbackBase {
-public:
-    typedef void (*CallbackFunction)(const Vector<WebCore::FloatRect>&, const String&, double, uint64_t, WKErrorRef, void*);
-
-    static PassRefPtr<AutocorrectionDataCallback> create(void* context, CallbackFunction callback)
-    {
-        return adoptRef(new AutocorrectionDataCallback(context, callback));
-    }
-
-    virtual ~AutocorrectionDataCallback()
-    {
-        ASSERT(!m_callback);
-    }
-
-    void performCallbackWithReturnValue(const Vector<WebCore::FloatRect>& returnValue1, const String& returnValue2, double returnValue3, uint64_t returnValue4)
-    {
-        ASSERT(m_callback);
-
-        m_callback(returnValue1, returnValue2, returnValue3, returnValue4, 0, context());
-
-        m_callback = 0;
-    }
-
-    void invalidate()
-    {
-        ASSERT(m_callback);
-
-        RefPtr<API::Error> error = API::Error::create();
-        m_callback(Vector<WebCore::FloatRect>(), String(), 0, 0, toAPI(error.get()), context());
-
-        m_callback = 0;
-    }
-
-private:
-    AutocorrectionDataCallback(void* context, CallbackFunction callback)
-        : CallbackBase(context)
-        , m_callback(callback)
-    {
-        ASSERT(m_callback);
-    }
-    
-    CallbackFunction m_callback;
-};
-
-class AutocorrectionContextCallback : public CallbackBase {
-public:
-    typedef void (*CallbackFunction)(const String&, const String&, const String&, const String&, uint64_t, uint64_t, WKErrorRef, void*);
-
-    static PassRefPtr<AutocorrectionContextCallback> create(void* context, CallbackFunction callback)
-    {
-        return adoptRef(new AutocorrectionContextCallback(context, callback));
-    }
-
-    virtual ~AutocorrectionContextCallback()
-    {
-        ASSERT(!m_callback);
-    }
-
-    void performCallbackWithReturnValue(const String& returnValue1, const String& returnValue2, const String& returnValue3, const String& returnValue4, uint64_t returnValue5, uint64_t returnValue6)
-    {
-        ASSERT(m_callback);
-
-        m_callback(returnValue1, returnValue2, returnValue3, returnValue4, returnValue5, returnValue6, 0, context());
-
-        m_callback = 0;
-    }
-
-    void invalidate()
-    {
-        ASSERT(m_callback);
-
-        RefPtr<API::Error> error = API::Error::create();
-        m_callback(String(), String(), String(), String(), 0, 0, toAPI(error.get()), context());
-
-        m_callback = 0;
-    }
-
-private:
-    AutocorrectionContextCallback(void* context, CallbackFunction callback)
-        : CallbackBase(context)
-        , m_callback(callback)
-    {
-        ASSERT(m_callback);
-    }
-    
-    CallbackFunction m_callback;
-};
+typedef GenericCallback<const Vector<WebCore::FloatRect>&, const String&, double, uint64_t> AutocorrectionDataCallback;
+typedef GenericCallback<const String&, const String&, const String&, const String&, uint64_t, uint64_t> AutocorrectionContextCallback;
+typedef GenericCallback<const String&, const String&, const String&> SelectionContextCallback;
 
 } // namespace WebKit