Changeset 62004 in webkit

Timestamp:

Jun 28, 2010 7:39:17 AM (14 years ago)

Author:

xan@webkit.org

Message:

2010-06-28 Xan Lopez <​xlopez@igalia.com>

Reviewed by Gustavo Noronha.

Until now we were adding the event listeners for a given object in
the wrap method, since that's the first moment we have accoss to
the core WebCore object. The problem is that we only install the
listeners that the topmost class in the class hierarchy needs (eg,
HTMLParagrahElement for a P element), when most of the actual
event attributes are defined in the base classes (Node, Element,
...).

To fix this set the core object as a construct/write-only property
on the wrapper GObject, and set the eventlisteners in the cGObject
'construct' method, chaining up through all the class hierarchy
until the end. This way we'll get all the eventlisteners defined
in all the superclasses of our object, which is what we want.

• bindings/gobject/WebKitDOMObject.cpp: (webkit_dom_object_get_property): (webkit_dom_object_set_property): (webkit_dom_object_class_init):
• bindings/scripts/CodeGeneratorGObject.pm:
• dom/Node.idl:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/gobject/WebKitDOMObject.cpp (modified) (2 diffs)
• bindings/scripts/CodeGeneratorGObject.pm (modified) (5 diffs)
• dom/Node.idl (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-28  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Until now we were adding the event listeners for a given object in
+        the wrap method, since that's the first moment we have accoss to
+        the core WebCore object. The problem is that we only install the
+        listeners that the topmost class in the class hierarchy needs (eg,
+        HTMLParagrahElement for a P element), when most of the actual
+        event attributes are defined in the base classes (Node, Element,
+        ...).
+
+        To fix this set the core object as a construct/write-only property
+        on the wrapper GObject, and set the eventlisteners in the cGObject
+        'construct' method, chaining up through all the class hierarchy
+        until the end. This way we'll get all the eventlisteners defined
+        in all the superclasses of our object, which is what we want.
+
+        * bindings/gobject/WebKitDOMObject.cpp:
+        (webkit_dom_object_get_property):
+        (webkit_dom_object_set_property):
+        (webkit_dom_object_class_init):
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        * dom/Node.idl:
+
 2010-06-28  Xan Lopez  <xlopez@igalia.com>
 

trunk/WebCore/bindings/gobject/WebKitDOMObject.cpp

@@ -12 +12 @@
 #include "WebKitDOMBinding.h"
 
+enum {
+    PROP_0,
+    PROP_CORE_OBJECT
+};
+
 G_DEFINE_TYPE(WebKitDOMObject, webkit_dom_object, G_TYPE_OBJECT);
 
@@ -18 +23 @@
 }
 
+static void webkit_dom_object_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+{
+    switch (prop_id) {
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        break;
+    }
+}
+
+static void webkit_dom_object_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+{
+    switch (prop_id) {
+    case PROP_CORE_OBJECT:
+        WEBKIT_DOM_OBJECT(object)->coreObject = g_value_get_pointer(value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        break;
+    }
+}
+
 static void webkit_dom_object_class_init(WebKitDOMObjectClass* klass)
 {
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(klass);
+    gobjectClass->set_property = webkit_dom_object_set_property;
+    gobjectClass->get_property = webkit_dom_object_get_property;
+
+    g_object_class_install_property(gobjectClass,
+                                    PROP_CORE_OBJECT,
+                                    g_param_spec_pointer("core-object",
+                                                         "Core Object",
+                                                         "The WebCore object the WebKitDOMObject wraps",
+                                                         static_cast<GParamFlags>(G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)));
 }
 

trunk/WebCore/bindings/scripts/CodeGeneratorGObject.pm

@@ -505 +505 @@
 
     my $txtInstallEventListener = << "EOF";
-    RefPtr<WebCore::GObjectEventListener> ${listenerName} = WebCore::GObjectEventListener::create(reinterpret_cast<GObject*>(wrapper), "${gobjectSignalName}");
+    RefPtr<WebCore::GObjectEventListener> ${listenerName} = WebCore::GObjectEventListener::create(reinterpret_cast<GObject*>(object), "${gobjectSignalName}");
     coreObject->addEventListener("${domSignalName}", ${listenerName}, false);
 EOF
@@ -626 +626 @@
 @txtGetProps
 
+static void ${lowerCaseIfaceName}_constructed(GObject* object)
+{
+EOF
+    push(@cBodyPriv, $implContent);
+
+    if (scalar @txtInstallEventListeners > 0) {
+        $implContent = << "EOF";
+    WebCore::${interfaceName}* coreObject = static_cast<WebCore::${interfaceName}*>(WEBKIT_DOM_OBJECT(object)->coreObject);
+EOF
+    push(@cBodyPriv, $implContent);
+    }
+
+    $implContent = << "EOF";
+@txtInstallEventListeners
+    if (G_OBJECT_CLASS(${lowerCaseIfaceName}_parent_class)->constructed)
+        G_OBJECT_CLASS(${lowerCaseIfaceName}_parent_class)->constructed(object);
+}
+
 static void ${lowerCaseIfaceName}_class_init(${className}Class* requestClass)
 {
@@ -632 +650 @@
     gobjectClass->set_property = ${lowerCaseIfaceName}_set_property;
     gobjectClass->get_property = ${lowerCaseIfaceName}_get_property;
+    gobjectClass->constructed = ${lowerCaseIfaceName}_constructed;
 
 @txtInstallProps
@@ -1102 +1121 @@
 {
     g_return_val_if_fail(coreObject, 0);
-    
-    ${className}* wrapper = WEBKIT_DOM_${clsCaps}(g_object_new(WEBKIT_TYPE_DOM_${clsCaps}, NULL));
-    g_return_val_if_fail(wrapper, 0);
 
     /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
@@ -1110 +1126 @@
      * matching deref().
      */
-
     coreObject->ref();
-    WEBKIT_DOM_OBJECT(wrapper)->coreObject = coreObject;
-@txtInstallEventListeners
-
-    return wrapper;
+
+    return  WEBKIT_DOM_${clsCaps}(g_object_new(WEBKIT_TYPE_DOM_${clsCaps},
+                                               "core-object", coreObject, NULL));
 }
 } // namespace WebKit

trunk/WebCore/dom/Node.idl

@@ -135 +135 @@
 #if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
 #if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
         void addEventListener(in DOMString type, 
                               in EventListener listener, 
@@ -144 +143 @@
         boolean dispatchEvent(in Event event)
             raises(EventException);
-#endif
 #endif
 #endif