Changeset 126152 in webkit

Timestamp:

Aug 21, 2012 5:50:18 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add destroy notify for register_uri_scheme
​https://bugs.webkit.org/show_bug.cgi?id=94315

Reviewed by Philippe Normand.

For introspection to work correctly, a destroy notify needs to be
added to register_uri_scheme so that bindings know when to
finalize the user_data.

• UIProcess/API/gtk/WebKitWebContext.cpp:

(webkit_web_context_register_uri_scheme):
(webkitWebContextReceivedURIRequest):

• UIProcess/API/gtk/WebKitWebContext.h:
• UIProcess/API/gtk/tests/TestWebKitWebContext.cpp:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebContext.cpp (modified) (6 diffs)
• UIProcess/API/gtk/WebKitWebContext.h (modified) (1 diff)
• UIProcess/API/gtk/tests/TestWebKitWebContext.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-08-21  Jesse van den Kieboom  <jessevdk@gnome.org> and Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add destroy notify for register_uri_scheme
+        https://bugs.webkit.org/show_bug.cgi?id=94315
+
+        Reviewed by Philippe Normand.
+
+        For introspection to work correctly, a destroy notify needs to be
+        added to register_uri_scheme so that bindings know when to
+        finalize the user_data.
+
+        * UIProcess/API/gtk/WebKitWebContext.cpp:
+        (webkit_web_context_register_uri_scheme):
+        (webkitWebContextReceivedURIRequest):
+        * UIProcess/API/gtk/WebKitWebContext.h:
+        * UIProcess/API/gtk/tests/TestWebKitWebContext.cpp:
+
 2012-08-21  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

@@ -36 +36 @@
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
 #include <wtf/gobject/GOwnPtr.h>
 #include <wtf/gobject/GRefPtr.h>
@@ -48 +50 @@
 };
 
-struct WebKitURISchemeHandler {
+class WebKitURISchemeHandler: public RefCounted<WebKitURISchemeHandler> {
+public:
     WebKitURISchemeHandler()
-        : callback(0)
-        , userData(0)
+        : m_callback(0)
+        , m_userData(0)
+        , m_destroyNotify(0)
     {
     }
-    WebKitURISchemeHandler(WebKitURISchemeRequestCallback callback, void* userData)
-        : callback(callback)
-        , userData(userData)
+    WebKitURISchemeHandler(WebKitURISchemeRequestCallback callback, void* userData, GDestroyNotify destroyNotify)
+        : m_callback(callback)
+        , m_userData(userData)
+        , m_destroyNotify(destroyNotify)
     {
     }
 
-    WebKitURISchemeRequestCallback callback;
-    void* userData;
+    ~WebKitURISchemeHandler()
+    {
+        if (m_destroyNotify)
+            m_destroyNotify(m_userData);
+    }
+
+    bool hasCallback()
+    {
+        return m_callback;
+    }
+
+    void performCallback(WebKitURISchemeRequest* request)
+    {
+        ASSERT(m_callback);
+
+        m_callback(request, m_userData);
+    }
+
+private:
+    WebKitURISchemeRequestCallback m_callback;
+    void* m_userData;
+    GDestroyNotify m_destroyNotify;
 };
 
-typedef HashMap<String, WebKitURISchemeHandler> URISchemeHandlerMap;
+typedef HashMap<String, RefPtr<WebKitURISchemeHandler> > URISchemeHandlerMap;
 typedef HashMap<uint64_t, GRefPtr<WebKitURISchemeRequest> > URISchemeRequestMap;
 
@@ -380 +405 @@
  * @context: a #WebKitWebContext
  * @scheme: the network scheme to register
- * @callback: a #WebKitURISchemeRequestCallback
+ * @callback: (scope async): a #WebKitURISchemeRequestCallback
  * @user_data: data to pass to callback function
+ * @user_data_destroy_func: destroy notify for @user_data
  *
  * Register @scheme in @context, so that when an URI request with @scheme is made in the
@@ -418 +444 @@
  * </programlisting></informalexample>
  */
-void webkit_web_context_register_uri_scheme(WebKitWebContext* context, const char* scheme, WebKitURISchemeRequestCallback callback, gpointer userData)
+void webkit_web_context_register_uri_scheme(WebKitWebContext* context, const char* scheme, WebKitURISchemeRequestCallback callback, gpointer userData, GDestroyNotify destroyNotify)
 {
     g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
@@ -424 +450 @@
     g_return_if_fail(callback);
 
-    context->priv->uriSchemeHandlers.set(String::fromUTF8(scheme), WebKitURISchemeHandler(callback, userData));
+    RefPtr<WebKitURISchemeHandler> handler = adoptRef(new WebKitURISchemeHandler(callback, userData, destroyNotify));
+    context->priv->uriSchemeHandlers.set(String::fromUTF8(scheme), handler.get());
     WKRetainPtr<WKStringRef> wkScheme(AdoptWK, WKStringCreateWithUTF8CString(scheme));
     WKSoupRequestManagerRegisterURIScheme(context->priv->requestManager.get(), wkScheme.get());
@@ -580 +607 @@
 void webkitWebContextReceivedURIRequest(WebKitWebContext* context, WebKitURISchemeRequest* request)
 {
-    WebKitURISchemeHandler handler = context->priv->uriSchemeHandlers.get(webkit_uri_scheme_request_get_scheme(request));
-    if (!handler.callback)
+    String scheme(String::fromUTF8(webkit_uri_scheme_request_get_scheme(request)));
+    RefPtr<WebKitURISchemeHandler> handler = context->priv->uriSchemeHandlers.get(scheme);
+    ASSERT(handler.get());
+    if (!handler->hasCallback())
         return;
 
     context->priv->uriSchemeRequests.set(webkitURISchemeRequestGetID(request), request);
-    handler.callback(request, handler.userData);
+    handler->performCallback(request);
 }
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h

@@ -132 +132 @@
                                                      const gchar                   *scheme,
                                                      WebKitURISchemeRequestCallback callback,
-                                                     gpointer                       user_data);
+                                                     gpointer                       user_data,
+                                                     GDestroyNotify                 user_data_destroy_func);
 
 WEBKIT_API gboolean

trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp

@@ -166 +166 @@
     {
         m_handlersMap.set(String::fromUTF8(scheme), URISchemeHandler(reply, replyLength, mimeType, replyWithPath));
-        webkit_web_context_register_uri_scheme(webkit_web_context_get_default(), scheme, uriSchemeRequestCallback, this);
+        webkit_web_context_register_uri_scheme(webkit_web_context_get_default(), scheme, uriSchemeRequestCallback, this, 0);
     }