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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 6af054682829b47d116965a025720aa50e8b2f2f
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 14 23:53:54 2010 +0000

    2010-09-14  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] Wheeling over windowed plugins sometimes cause them to disappear
    
            * plugins/qt/PluginContainerQt.cpp:
            (PluginClientWrapper::x11Event): Pass on captured mouse wheel events
            to the effective native window rather than the grandparent widget.
            We were calling QWidget::winId() which caused a new X11 window to be
            created for the grandparent widget and generally mess things up.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6d37089..be591f0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-14  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Wheeling over windowed plugins sometimes cause them to disappear
+
+        * plugins/qt/PluginContainerQt.cpp:
+        (PluginClientWrapper::x11Event): Pass on captured mouse wheel events
+        to the effective native window rather than the grandparent widget.
+        We were calling QWidget::winId() which caused a new X11 window to be
+        created for the grandparent widget and generally mess things up.
+
 2010-09-14  Kevin Ollivier  <kevino at theolliviers.com>
 
         [wx] Build fix after move of selectedText() method.
diff --git a/WebCore/plugins/qt/PluginContainerQt.cpp b/WebCore/plugins/qt/PluginContainerQt.cpp
index cb894a7..8486180 100644
--- a/WebCore/plugins/qt/PluginContainerQt.cpp
+++ b/WebCore/plugins/qt/PluginContainerQt.cpp
@@ -56,7 +56,7 @@ PluginClientWrapper::~PluginClientWrapper()
 bool PluginClientWrapper::x11Event(XEvent* event)
 {
     // modify the event window id and insert it into the Qt event system.
-    event->xany.window = m_parent->parentWidget()->winId();
+    event->xany.window = m_parent->effectiveWinId();
     static_cast<QApplication*>(QApplication::instance())->x11ProcessEvent(event);
     return true;
 }

-- 
WebKit Debian packaging