Changeset 157918 in webkit
- Timestamp:
- Oct 24, 2013 2:08:48 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r157903 r157918 1 2013-10-24 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GObject bindings] Make EventTarget interface introspectable 4 https://bugs.webkit.org/show_bug.cgi?id=77835 5 6 Reviewed by Gustavo Noronha Silva. 7 8 Add support for use GRefPtr with GClosure. 9 10 * wtf/gobject/GRefPtr.cpp: 11 (WTF::refGPtr): 12 (WTF::derefGPtr): 13 * wtf/gobject/GRefPtr.h: 14 * wtf/gobject/GTypedefs.h: 15 1 16 2013-10-23 Anders Carlsson <andersca@apple.com> 2 17 -
trunk/Source/WTF/wtf/gobject/GRefPtr.cpp
r150019 r157918 22 22 #if USE(GLIB) 23 23 24 #include <glib-object.h> 24 25 #include <glib.h> 25 26 … … 146 147 } 147 148 149 template <> GClosure* refGPtr(GClosure* ptr) 150 { 151 if (ptr) 152 g_closure_ref(ptr); 153 return ptr; 154 } 155 156 template <> void derefGPtr(GClosure* ptr) 157 { 158 if (ptr) 159 g_closure_unref(ptr); 160 } 161 148 162 } // namespace WTF 149 163 -
trunk/Source/WTF/wtf/gobject/GRefPtr.h
r157624 r157918 220 220 template <> GBytes* refGPtr(GBytes*); 221 221 template <> void derefGPtr(GBytes*); 222 template <> GClosure* refGPtr(GClosure*); 223 template <> void derefGPtr(GClosure*); 222 224 223 225 template <typename T> inline T* refGPtr(T* ptr) -
trunk/Source/WTF/wtf/gobject/GTypedefs.h
r130491 r157918 67 67 typedef struct _GByteArray GByteArray; 68 68 typedef struct _GBytes GBytes; 69 typedef struct _GClosure GClosure; 69 70 70 71 #if USE(CAIRO) -
trunk/Source/WebCore/ChangeLog
r157916 r157918 1 2013-10-24 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GObject bindings] Make EventTarget interface introspectable 4 https://bugs.webkit.org/show_bug.cgi?id=77835 5 6 Reviewed by Gustavo Noronha Silva. 7 8 Add webkit_dom_event_target_add_event_listener_with_closure and 9 webkit_dom_event_target_remove_event_listener_with_closure to be 10 used by GObject instrospection bindings. Instead of receving a 11 GCallback, which makes the function not introspectable, they 12 receive a GClosure. 13 14 * bindings/gobject/GObjectEventListener.cpp: 15 (WebCore::GObjectEventListener::GObjectEventListener): 16 (WebCore::GObjectEventListener::~GObjectEventListener): 17 (WebCore::GObjectEventListener::gobjectDestroyed): 18 (WebCore::GObjectEventListener::handleEvent): 19 (WebCore::GObjectEventListener::operator==): 20 * bindings/gobject/GObjectEventListener.h: 21 (WebCore::GObjectEventListener::addEventListener): 22 (WebCore::GObjectEventListener::removeEventListener): 23 * bindings/gobject/WebKitDOMEventTarget.cpp: 24 (webkit_dom_event_target_dispatch_event): 25 (webkit_dom_event_target_add_event_listener): 26 (webkit_dom_event_target_remove_event_listener): 27 (webkit_dom_event_target_add_event_listener_with_closure): 28 (webkit_dom_event_target_remove_event_listener_with_closure): 29 * bindings/gobject/WebKitDOMEventTarget.h: 30 * bindings/scripts/CodeGeneratorGObject.pm: 31 (GenerateEventTargetIface): 32 * bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp: 33 (webkit_dom_test_event_target_dispatch_event): 34 (webkit_dom_test_event_target_add_event_listener): 35 (webkit_dom_test_event_target_remove_event_listener): 36 * bindings/scripts/test/GObject/WebKitDOMTestNode.cpp: 37 (webkit_dom_test_node_dispatch_event): 38 (webkit_dom_test_node_add_event_listener): 39 (webkit_dom_test_node_remove_event_listener): 40 1 41 2013-10-14 Sergio Villar Senin <svillar@igalia.com> 2 42 -
trunk/Source/WebCore/bindings/gobject/GObjectEventListener.cpp
r133893 r157918 23 23 #include "WebKitDOMEvent.h" 24 24 #include "WebKitDOMEventPrivate.h" 25 #include <glib-object.h>25 #include "WebKitDOMEventTarget.h" 26 26 #include <wtf/HashMap.h> 27 27 28 28 namespace WebCore { 29 29 30 typedef void (*GObjectEventListenerCallback)(GObject*, WebKitDOMEvent*, void*); 31 32 GObjectEventListener::GObjectEventListener(GObject* object, EventTarget* target, const char* domEventName, GCallback handler, bool capture, void* userData) 30 GObjectEventListener::GObjectEventListener(GObject* target, EventTarget* coreTarget, const char* domEventName, GClosure* handler, bool capture) 33 31 : EventListener(GObjectEventListenerType) 34 , m_ object(object)35 , m_coreTarget( target)32 , m_target(target) 33 , m_coreTarget(coreTarget) 36 34 , m_domEventName(domEventName) 37 35 , m_handler(handler) 38 36 , m_capture(capture) 39 , m_userData(userData)40 37 { 41 38 ASSERT(m_coreTarget); 42 g_object_weak_ref(object, reinterpret_cast<GWeakNotify>(GObjectEventListener::gobjectDestroyedCallback), this); 39 if (G_CLOSURE_NEEDS_MARSHAL(m_handler.get())) 40 g_closure_set_marshal(m_handler.get(), g_cclosure_marshal_generic); 41 g_object_weak_ref(m_target, reinterpret_cast<GWeakNotify>(GObjectEventListener::gobjectDestroyedCallback), this); 43 42 } 44 43 … … 47 46 if (!m_coreTarget) 48 47 return; 49 g_object_weak_unref(m_ object, reinterpret_cast<GWeakNotify>(GObjectEventListener::gobjectDestroyedCallback), this);48 g_object_weak_unref(m_target, reinterpret_cast<GWeakNotify>(GObjectEventListener::gobjectDestroyedCallback), this); 50 49 } 51 50 … … 60 59 m_coreTarget = 0; 61 60 target->removeEventListener(m_domEventName.data(), this, m_capture); 61 m_handler = 0; 62 62 } 63 63 64 64 void GObjectEventListener::handleEvent(ScriptExecutionContext*, Event* event) 65 65 { 66 WebKitDOMEvent* gobjectEvent = WEBKIT_DOM_EVENT(WebKit::kit(event)); 67 reinterpret_cast<GObjectEventListenerCallback>(m_handler)(m_object, gobjectEvent, m_userData); 68 g_object_unref(gobjectEvent); 66 GValue parameters[2] = { G_VALUE_INIT, G_VALUE_INIT }; 67 g_value_init(¶meters[0], WEBKIT_TYPE_DOM_EVENT_TARGET); 68 g_value_set_object(¶meters[0], m_target); 69 70 GRefPtr<WebKitDOMEvent> domEvent = adoptGRef(WebKit::kit(event)); 71 g_value_init(¶meters[1], WEBKIT_TYPE_DOM_EVENT); 72 g_value_set_object(¶meters[1], domEvent.get()); 73 74 g_closure_invoke(m_handler.get(), 0, 2, parameters, NULL); 75 g_value_unset(parameters + 0); 76 g_value_unset(parameters + 1); 69 77 } 70 78 … … 72 80 { 73 81 if (const GObjectEventListener* gobjectEventListener = GObjectEventListener::cast(&listener)) 74 return m_object == gobjectEventListener->m_object && m_handler == gobjectEventListener->m_handler; 82 return m_target == gobjectEventListener->m_target 83 && reinterpret_cast<GCClosure*>(m_handler.get())->callback == reinterpret_cast<GCClosure*>(gobjectEventListener->m_handler.get())->callback; 75 84 76 85 return false; -
trunk/Source/WebCore/bindings/gobject/GObjectEventListener.h
r133893 r157918 23 23 #include "EventTarget.h" 24 24 #include <wtf/RefPtr.h> 25 #include <wtf/gobject/GRefPtr.h> 25 26 #include <wtf/text/CString.h> 26 27 27 28 typedef struct _GObject GObject; 28 typedef void (*GCallback) (void);29 typedef struct _GClosure GClosure; 29 30 30 31 namespace WebCore { … … 33 34 public: 34 35 35 static bool addEventListener(GObject* object, EventTarget* target, const char* domEventName, GCallback handler, bool useCapture, void* userData)36 static bool addEventListener(GObject* target, EventTarget* coreTarget, const char* domEventName, GClosure* handler, bool useCapture) 36 37 { 37 RefPtr<GObjectEventListener> listener(adoptRef(new GObjectEventListener( object, target, domEventName, handler, useCapture, userData)));38 return target->addEventListener(domEventName, listener.release(), useCapture);38 RefPtr<GObjectEventListener> listener(adoptRef(new GObjectEventListener(target, coreTarget, domEventName, handler, useCapture))); 39 return coreTarget->addEventListener(domEventName, listener.release(), useCapture); 39 40 } 40 41 41 static bool removeEventListener(GObject* object, EventTarget* target, const char* domEventName, GCallbackhandler, bool useCapture)42 static bool removeEventListener(GObject* target, EventTarget* coreTarget, const char* domEventName, GClosure* handler, bool useCapture) 42 43 { 43 GObjectEventListener key( object, target, domEventName, handler, useCapture, 0);44 return target->removeEventListener(domEventName, &key, useCapture);44 GObjectEventListener key(target, coreTarget, domEventName, handler, useCapture); 45 return coreTarget->removeEventListener(domEventName, &key, useCapture); 45 46 } 46 47 … … 60 61 61 62 private: 62 GObjectEventListener(GObject*, EventTarget*, const char* domEventName, GC allback handler, bool capture, void* userData);63 GObjectEventListener(GObject*, EventTarget*, const char* domEventName, GClosure*, bool capture); 63 64 ~GObjectEventListener(); 64 65 void gobjectDestroyed(); … … 66 67 virtual void handleEvent(ScriptExecutionContext*, Event*); 67 68 68 GObject* m_object; 69 69 GObject* m_target; 70 70 // We do not need to keep a reference to the m_coreTarget, because 71 71 // we only use it when the GObject and thus the m_coreTarget object is alive. 72 72 EventTarget* m_coreTarget; 73 73 CString m_domEventName; 74 G Callbackm_handler;74 GRefPtr<GClosure> m_handler; 75 75 bool m_capture; 76 void* m_userData;77 76 }; 78 77 } // namespace WebCore -
trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp
r149879 r157918 37 37 #include "WebKitDOMEventTargetPrivate.h" 38 38 #include "WebKitDOMPrivate.h" 39 #include <wtf/gobject/GRefPtr.h> 39 40 40 41 typedef WebKitDOMEventTargetIface WebKitDOMEventTargetInterface; … … 46 47 } 47 48 48 voidwebkit_dom_event_target_dispatch_event(WebKitDOMEventTarget* target, WebKitDOMEvent* event, GError** error)49 gboolean webkit_dom_event_target_dispatch_event(WebKitDOMEventTarget* target, WebKitDOMEvent* event, GError** error) 49 50 { 50 g_return_if_fail(WEBKIT_DOM_IS_EVENT_TARGET(target)); 51 g_return_if_fail(WEBKIT_DOM_IS_EVENT(event)); 51 g_return_val_if_fail(WEBKIT_DOM_IS_EVENT_TARGET(target), FALSE); 52 g_return_val_if_fail(WEBKIT_DOM_IS_EVENT(event), FALSE); 53 g_return_val_if_fail(!error || !*error, FALSE); 52 54 53 WebKitDOMEventTargetIface* iface = WEBKIT_DOM_EVENT_TARGET_GET_IFACE(target); 54 55 if (iface->dispatch_event) 56 iface->dispatch_event(target, event, error); 55 return WEBKIT_DOM_EVENT_TARGET_GET_IFACE(target)->dispatch_event(target, event, error); 57 56 } 58 57 59 gboolean webkit_dom_event_target_add_event_listener(WebKitDOMEventTarget* target, const char* eventName, GCallback handler, gboolean bubble, gpointer userData)58 gboolean webkit_dom_event_target_add_event_listener(WebKitDOMEventTarget* target, const char* eventName, GCallback handler, gboolean useCapture, gpointer userData) 60 59 { 61 60 … … 63 62 g_return_val_if_fail(eventName, FALSE); 64 63 65 WebKitDOMEventTargetIface* iface = WEBKIT_DOM_EVENT_TARGET_GET_IFACE(target); 66 67 if (iface->add_event_listener) 68 return iface->add_event_listener(target, eventName, handler, bubble, userData); 69 70 return FALSE; 64 GRefPtr<GClosure> closure = adoptGRef(g_cclosure_new(handler, userData, 0)); 65 return WEBKIT_DOM_EVENT_TARGET_GET_IFACE(target)->add_event_listener(target, eventName, closure.get(), useCapture); 71 66 } 72 67 73 gboolean webkit_dom_event_target_remove_event_listener(WebKitDOMEventTarget* target, const char* eventName, GCallback handler, gboolean bubble)68 gboolean webkit_dom_event_target_remove_event_listener(WebKitDOMEventTarget* target, const char* eventName, GCallback handler, gboolean useCapture) 74 69 { 75 70 g_return_val_if_fail(WEBKIT_DOM_IS_EVENT_TARGET(target), FALSE); 76 71 g_return_val_if_fail(eventName, FALSE); 77 72 78 WebKitDOMEventTargetIface* iface = WEBKIT_DOM_EVENT_TARGET_GET_IFACE(target); 73 GRefPtr<GClosure> closure = adoptGRef(g_cclosure_new(handler, 0, 0)); 74 return WEBKIT_DOM_EVENT_TARGET_GET_IFACE(target)->remove_event_listener(target, eventName, closure.get(), useCapture); 75 } 79 76 80 if (iface->remove_event_listener) 81 return iface->remove_event_listener(target, eventName, handler, bubble); 77 gboolean webkit_dom_event_target_add_event_listener_with_closure(WebKitDOMEventTarget* target, const char* eventName, GClosure* handler, gboolean useCapture) 78 { 79 g_return_val_if_fail(WEBKIT_DOM_IS_EVENT_TARGET(target), FALSE); 80 g_return_val_if_fail(eventName, FALSE); 81 g_return_val_if_fail(handler, FALSE); 82 82 83 return FALSE; 83 return WEBKIT_DOM_EVENT_TARGET_GET_IFACE(target)->add_event_listener(target, eventName, handler, useCapture); 84 } 85 86 gboolean webkit_dom_event_target_remove_event_listener_with_closure(WebKitDOMEventTarget* target, const char* eventName, GClosure* handler, gboolean useCapture) 87 { 88 g_return_val_if_fail(WEBKIT_DOM_IS_EVENT_TARGET(target), FALSE); 89 g_return_val_if_fail(eventName, FALSE); 90 g_return_val_if_fail(handler, FALSE); 91 92 return WEBKIT_DOM_EVENT_TARGET_GET_IFACE(target)->remove_event_listener(target, eventName, handler, useCapture); 84 93 } 85 94 -
trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h
r148914 r157918 37 37 38 38 /* virtual table */ 39 void(* dispatch_event)(WebKitDOMEventTarget *target,39 gboolean (* dispatch_event)(WebKitDOMEventTarget *target, 40 40 WebKitDOMEvent *event, 41 41 GError **error); … … 43 43 gboolean (* add_event_listener)(WebKitDOMEventTarget *target, 44 44 const char *event_name, 45 GCallback handler, 46 gboolean bubble, 47 gpointer user_data); 45 GClosure *handler, 46 gboolean use_capture); 48 47 gboolean (* remove_event_listener)(WebKitDOMEventTarget *target, 49 48 const char *event_name, 50 GC allbackhandler,51 gboolean bubble);49 GClosure *handler, 50 gboolean use_capture); 52 51 }; 53 52 … … 55 54 WEBKIT_API GType webkit_dom_event_target_get_type(void) G_GNUC_CONST; 56 55 57 WEBKIT_API void webkit_dom_event_target_dispatch_event(WebKitDOMEventTarget *target, 56 /** 57 * webkit_dom_event_target_dispatch_event: 58 * @target: A #WebKitDOMEventTarget 59 * @event: A #WebKitDOMEvent 60 * @error: return location for an error or %NULL 61 * 62 * Returns: a #gboolean 63 */ 64 WEBKIT_API gboolean webkit_dom_event_target_dispatch_event(WebKitDOMEventTarget *target, 58 65 WebKitDOMEvent *event, 59 66 GError **error); … … 64 71 * @event_name: A #gchar 65 72 * @handler: (scope async): A #GCallback 66 * @ bubble: A #gboolean73 * @use_capture: A #gboolean 67 74 * @user_data: A #gpointer 68 75 * 76 * Returns: a #gboolean 69 77 */ 70 78 WEBKIT_API gboolean webkit_dom_event_target_add_event_listener(WebKitDOMEventTarget *target, 71 79 const char *event_name, 72 80 GCallback handler, 73 gboolean bubble,81 gboolean use_capture, 74 82 gpointer user_data); 75 83 … … 79 87 * @event_name: A #gchar 80 88 * @handler: (scope call): A #GCallback 81 * @ bubble: A #gboolean89 * @use_capture: A #gboolean 82 90 * 91 * Returns: a #gboolean 83 92 */ 84 93 WEBKIT_API gboolean webkit_dom_event_target_remove_event_listener(WebKitDOMEventTarget *target, 85 94 const char *event_name, 86 95 GCallback handler, 87 gboolean bubble); 96 gboolean use_capture); 97 98 /** 99 * webkit_dom_event_target_add_event_listener_with_closure: 100 * @target: A #WebKitDOMEventTarget 101 * @event_name: A #gchar 102 * @handler: A #GClosure 103 * @use_capture: A #gboolean 104 * 105 * Version of webkit_dom_event_target_add_event_listener() using a closure 106 * instead of a callbacks for easier binding in other languages. 107 * 108 * Returns: a #gboolean 109 * 110 * Rename to: webkit_dom_event_target_add_event_listener 111 */ 112 WEBKIT_API gboolean webkit_dom_event_target_add_event_listener_with_closure(WebKitDOMEventTarget *target, 113 const char *event_name, 114 GClosure *handler, 115 gboolean use_capture); 116 117 /** 118 * webkit_dom_event_target_remove_event_listener_with_closure: 119 * @target: A #WebKitDOMEventTarget 120 * @event_name: A #gchar 121 * @handler: A #GClosure 122 * @use_capture: A #gboolean 123 * 124 * Version of webkit_dom_event_target_remove_event_listener() using a closure 125 * instead of a callbacks for easier binding in other languages. 126 * 127 * Returns: a #gboolean 128 * 129 * Rename to: webkit_dom_event_target_remove_event_listener 130 */ 131 WEBKIT_API gboolean webkit_dom_event_target_remove_event_listener_with_closure(WebKitDOMEventTarget *target, 132 const char *event_name, 133 GClosure *handler, 134 gboolean use_capture); 135 88 136 89 137 G_END_DECLS -
trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
r156182 r157918 1381 1381 $implIncludes{"WebKitDOMEventPrivate.h"} = 1; 1382 1382 1383 push(@cBodyProperties, "static voidwebkit_dom_${decamelize}_dispatch_event(WebKitDOMEventTarget* target, WebKitDOMEvent* event, GError** error)\n{\n");1383 push(@cBodyProperties, "static gboolean webkit_dom_${decamelize}_dispatch_event(WebKitDOMEventTarget* target, WebKitDOMEvent* event, GError** error)\n{\n"); 1384 1384 push(@cBodyProperties, "#if ${conditionalString}\n") if $conditionalString; 1385 1385 push(@cBodyProperties, " WebCore::Event* coreEvent = WebKit::core(event);\n"); 1386 1386 push(@cBodyProperties, " WebCore::${interfaceName}* coreTarget = static_cast<WebCore::${interfaceName}*>(WEBKIT_DOM_OBJECT(target)->coreObject);\n\n"); 1387 1387 push(@cBodyProperties, " WebCore::ExceptionCode ec = 0;\n"); 1388 push(@cBodyProperties, " coreTarget->dispatchEvent(coreEvent, ec);\n");1388 push(@cBodyProperties, " gboolean result = coreTarget->dispatchEvent(coreEvent, ec);\n"); 1389 1389 push(@cBodyProperties, " if (ec) {\n WebCore::ExceptionCodeDescription description(ec);\n"); 1390 1390 push(@cBodyProperties, " g_set_error_literal(error, g_quark_from_string(\"WEBKIT_DOM\"), description.code, description.name);\n }\n"); 1391 push(@cBodyProperties, "#else\n") if $conditionalString; 1392 push(@cBodyProperties, @conditionalWarn) if scalar(@conditionalWarn); 1393 push(@cBodyProperties, "#endif // ${conditionalString}\n") if $conditionalString; 1394 push(@cBodyProperties, "}\n\n"); 1395 1396 push(@cBodyProperties, "static gboolean webkit_dom_${decamelize}_add_event_listener(WebKitDOMEventTarget* target, const char* eventName, GCallback handler, gboolean bubble, gpointer userData)\n{\n"); 1397 push(@cBodyProperties, "#if ${conditionalString}\n") if $conditionalString; 1398 push(@cBodyProperties, " WebCore::${interfaceName}* coreTarget = static_cast<WebCore::${interfaceName}*>(WEBKIT_DOM_OBJECT(target)->coreObject);\n"); 1399 push(@cBodyProperties, " return WebCore::GObjectEventListener::addEventListener(G_OBJECT(target), coreTarget, eventName, handler, bubble, userData);\n"); 1391 push(@cBodyProperties, " return result;\n"); 1400 1392 push(@cBodyProperties, "#else\n") if $conditionalString; 1401 1393 push(@cBodyProperties, @conditionalWarn) if scalar(@conditionalWarn); … … 1403 1395 push(@cBodyProperties, "}\n\n"); 1404 1396 1405 push(@cBodyProperties, "static gboolean webkit_dom_${decamelize}_ remove_event_listener(WebKitDOMEventTarget* target, const char* eventName, GCallback handler, gboolean bubble)\n{\n");1397 push(@cBodyProperties, "static gboolean webkit_dom_${decamelize}_add_event_listener(WebKitDOMEventTarget* target, const char* eventName, GClosure* handler, gboolean useCapture)\n{\n"); 1406 1398 push(@cBodyProperties, "#if ${conditionalString}\n") if $conditionalString; 1407 1399 push(@cBodyProperties, " WebCore::${interfaceName}* coreTarget = static_cast<WebCore::${interfaceName}*>(WEBKIT_DOM_OBJECT(target)->coreObject);\n"); 1408 push(@cBodyProperties, " return WebCore::GObjectEventListener::removeEventListener(G_OBJECT(target), coreTarget, eventName, handler, bubble);\n"); 1400 push(@cBodyProperties, " return WebCore::GObjectEventListener::addEventListener(G_OBJECT(target), coreTarget, eventName, handler, useCapture);\n"); 1401 push(@cBodyProperties, "#else\n") if $conditionalString; 1402 push(@cBodyProperties, @conditionalWarn) if scalar(@conditionalWarn); 1403 push(@cBodyProperties, " return false;\n#endif // ${conditionalString}\n") if $conditionalString; 1404 push(@cBodyProperties, "}\n\n"); 1405 1406 push(@cBodyProperties, "static gboolean webkit_dom_${decamelize}_remove_event_listener(WebKitDOMEventTarget* target, const char* eventName, GClosure* handler, gboolean useCapture)\n{\n"); 1407 push(@cBodyProperties, "#if ${conditionalString}\n") if $conditionalString; 1408 push(@cBodyProperties, " WebCore::${interfaceName}* coreTarget = static_cast<WebCore::${interfaceName}*>(WEBKIT_DOM_OBJECT(target)->coreObject);\n"); 1409 push(@cBodyProperties, " return WebCore::GObjectEventListener::removeEventListener(G_OBJECT(target), coreTarget, eventName, handler, useCapture);\n"); 1409 1410 push(@cBodyProperties, "#else\n") if $conditionalString; 1410 1411 push(@cBodyProperties, @conditionalWarn) if scalar(@conditionalWarn); -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp
r156163 r157918 69 69 } // namespace WebKit 70 70 71 static voidwebkit_dom_test_event_target_dispatch_event(WebKitDOMEventTarget* target, WebKitDOMEvent* event, GError** error)71 static gboolean webkit_dom_test_event_target_dispatch_event(WebKitDOMEventTarget* target, WebKitDOMEvent* event, GError** error) 72 72 { 73 73 WebCore::Event* coreEvent = WebKit::core(event); … … 75 75 76 76 WebCore::ExceptionCode ec = 0; 77 coreTarget->dispatchEvent(coreEvent, ec);77 gboolean result = coreTarget->dispatchEvent(coreEvent, ec); 78 78 if (ec) { 79 79 WebCore::ExceptionCodeDescription description(ec); 80 80 g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), description.code, description.name); 81 81 } 82 return result; 82 83 } 83 84 84 static gboolean webkit_dom_test_event_target_add_event_listener(WebKitDOMEventTarget* target, const char* eventName, GC allback handler, gboolean bubble, gpointer userData)85 static gboolean webkit_dom_test_event_target_add_event_listener(WebKitDOMEventTarget* target, const char* eventName, GClosure* handler, gboolean useCapture) 85 86 { 86 87 WebCore::TestEventTarget* coreTarget = static_cast<WebCore::TestEventTarget*>(WEBKIT_DOM_OBJECT(target)->coreObject); 87 return WebCore::GObjectEventListener::addEventListener(G_OBJECT(target), coreTarget, eventName, handler, bubble, userData);88 return WebCore::GObjectEventListener::addEventListener(G_OBJECT(target), coreTarget, eventName, handler, useCapture); 88 89 } 89 90 90 static gboolean webkit_dom_test_event_target_remove_event_listener(WebKitDOMEventTarget* target, const char* eventName, GC allback handler, gboolean bubble)91 static gboolean webkit_dom_test_event_target_remove_event_listener(WebKitDOMEventTarget* target, const char* eventName, GClosure* handler, gboolean useCapture) 91 92 { 92 93 WebCore::TestEventTarget* coreTarget = static_cast<WebCore::TestEventTarget*>(WEBKIT_DOM_OBJECT(target)->coreObject); 93 return WebCore::GObjectEventListener::removeEventListener(G_OBJECT(target), coreTarget, eventName, handler, bubble);94 return WebCore::GObjectEventListener::removeEventListener(G_OBJECT(target), coreTarget, eventName, handler, useCapture); 94 95 } 95 96 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.cpp
r156163 r157918 57 57 } // namespace WebKit 58 58 59 static voidwebkit_dom_test_node_dispatch_event(WebKitDOMEventTarget* target, WebKitDOMEvent* event, GError** error)59 static gboolean webkit_dom_test_node_dispatch_event(WebKitDOMEventTarget* target, WebKitDOMEvent* event, GError** error) 60 60 { 61 61 WebCore::Event* coreEvent = WebKit::core(event); … … 63 63 64 64 WebCore::ExceptionCode ec = 0; 65 coreTarget->dispatchEvent(coreEvent, ec);65 gboolean result = coreTarget->dispatchEvent(coreEvent, ec); 66 66 if (ec) { 67 67 WebCore::ExceptionCodeDescription description(ec); 68 68 g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), description.code, description.name); 69 69 } 70 return result; 70 71 } 71 72 72 static gboolean webkit_dom_test_node_add_event_listener(WebKitDOMEventTarget* target, const char* eventName, GC allback handler, gboolean bubble, gpointer userData)73 static gboolean webkit_dom_test_node_add_event_listener(WebKitDOMEventTarget* target, const char* eventName, GClosure* handler, gboolean useCapture) 73 74 { 74 75 WebCore::TestNode* coreTarget = static_cast<WebCore::TestNode*>(WEBKIT_DOM_OBJECT(target)->coreObject); 75 return WebCore::GObjectEventListener::addEventListener(G_OBJECT(target), coreTarget, eventName, handler, bubble, userData);76 return WebCore::GObjectEventListener::addEventListener(G_OBJECT(target), coreTarget, eventName, handler, useCapture); 76 77 } 77 78 78 static gboolean webkit_dom_test_node_remove_event_listener(WebKitDOMEventTarget* target, const char* eventName, GC allback handler, gboolean bubble)79 static gboolean webkit_dom_test_node_remove_event_listener(WebKitDOMEventTarget* target, const char* eventName, GClosure* handler, gboolean useCapture) 79 80 { 80 81 WebCore::TestNode* coreTarget = static_cast<WebCore::TestNode*>(WEBKIT_DOM_OBJECT(target)->coreObject); 81 return WebCore::GObjectEventListener::removeEventListener(G_OBJECT(target), coreTarget, eventName, handler, bubble);82 return WebCore::GObjectEventListener::removeEventListener(G_OBJECT(target), coreTarget, eventName, handler, useCapture); 82 83 } 83 84 -
trunk/Tools/ChangeLog
r157891 r157918 1 2013-10-24 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GObject bindings] Make EventTarget interface introspectable 4 https://bugs.webkit.org/show_bug.cgi?id=77835 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * Scripts/webkitpy/style/checker.py: Add exceptions for custom 9 GObject DOM bindings headers. 10 1 11 2013-10-23 Lucas Forschler <lforschler@apple.com> 2 12 -
trunk/Tools/Scripts/webkitpy/style/checker.py
r156895 r157918 152 152 # parens for function calls, and always having variable names. 153 153 # Also, GTK+ allows the use of NULL. 154 "Source/WebCore/bindings/gobject/WebKitDOMCustom.h", 155 "Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h", 154 156 "Source/WebCore/bindings/scripts/test/GObject", 155 157 "Source/WebKit/gtk/webkit/", … … 217 219 # variables and functions containing underscores. 218 220 "Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp", 219 "Source/WebCore/bindings/gobject/WebKitDOM Custom.h",221 "Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp", 220 222 "Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer1.cpp", 221 223 "Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp",
Note: See TracChangeset
for help on using the changeset viewer.