[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9aaa6b4dd40488e2a22f4d4166fb50dbc7b53be4
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 12:23:00 2010 +0000

    2010-08-17  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            [GTK] Fix wrapping of core Events in the bindings
            https://bugs.webkit.org/show_bug.cgi?id=44095
    
            Return the proper GObject type instead of hardcoding
            WebKitDOMEvent for all Event types.
    
            * bindings/gobject/GObjectEventListener.cpp:
            (WebCore::GObjectEventListener::handleEvent):
            * bindings/gobject/WebKitDOMBinding.cpp:
            (WebKit::kit):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65497 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3d7e1f6..5288e4d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,21 @@
 
         Reviewed by Gustavo Noronha.
 
+        [GTK] Fix wrapping of core Events in the bindings
+        https://bugs.webkit.org/show_bug.cgi?id=44095
+
+        Return the proper GObject type instead of hardcoding
+        WebKitDOMEvent for all Event types.
+
+        * bindings/gobject/GObjectEventListener.cpp:
+        (WebCore::GObjectEventListener::handleEvent):
+        * bindings/gobject/WebKitDOMBinding.cpp:
+        (WebKit::kit):
+
+2010-08-17  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
         Revert supposed build-fix which was in fact reverting a previous
         build fix which was correct (oh dear).
 
diff --git a/WebCore/bindings/gobject/GObjectEventListener.cpp b/WebCore/bindings/gobject/GObjectEventListener.cpp
index 1a4f680..3ce8461 100644
--- a/WebCore/bindings/gobject/GObjectEventListener.cpp
+++ b/WebCore/bindings/gobject/GObjectEventListener.cpp
@@ -21,6 +21,7 @@
 
 #include "Event.h"
 #include "EventListener.h"
+#include "webkit/WebKitDOMEvent.h"
 #include "webkit/WebKitDOMEventPrivate.h"
 #include <wtf/HashMap.h>
 #include <wtf/text/CString.h>
@@ -30,7 +31,7 @@ namespace WebCore {
 void GObjectEventListener::handleEvent(ScriptExecutionContext*, Event* event)
 {
     gboolean handled = FALSE;
-    WebKitDOMEvent* gobjectEvent = WebKit::wrapEvent(event);
+    WebKitDOMEvent* gobjectEvent = WEBKIT_DOM_EVENT(WebKit::kit(event));
     g_signal_emit_by_name(m_object, m_signalName.utf8().data(), gobjectEvent, &handled);
 }
 
diff --git a/WebCore/bindings/gobject/WebKitDOMBinding.cpp b/WebCore/bindings/gobject/WebKitDOMBinding.cpp
index 1154d6c..3c066e3 100644
--- a/WebCore/bindings/gobject/WebKitDOMBinding.cpp
+++ b/WebCore/bindings/gobject/WebKitDOMBinding.cpp
@@ -32,6 +32,7 @@
 #include "UIEvent.h"
 #include "WebKitDOMDOMWindowPrivate.h"
 #include "WebKitDOMElementPrivate.h"
+#include "WebKitDOMEventPrivate.h"
 #include "WebKitDOMNode.h"
 #include "WebKitDOMNodePrivate.h"
 #include "WebKitHTMLElementWrapperFactory.h"
@@ -140,7 +141,7 @@ gpointer kit(Event* event)
     else if (event->isUIEvent())
         wrappedEvent = wrapUIEvent(static_cast<UIEvent*>(event));
     else
-        wrappedEvent = 0;
+        wrappedEvent = wrapEvent(event);
 
     return DOMObjectCache::put(event, wrappedEvent);
 }

-- 
WebKit Debian packaging