[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ce0cc1bbb989a5b8c9fb09efb6e05445781b9c2d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 2 23:12:18 2009 +0000

    2009-10-02  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
    
            Reviewed by Tor Arne Vestbø.
    
            [Qt] X sync our XEmbed container window creation before sending the
            xid to plugins.
            https://bugs.webkit.org/show_bug.cgi?id=25053
    
            * plugins/qt/PluginViewQt.cpp:
            (WebCore::PluginView::setNPWindowIfNeeded):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49053 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 58f1918..f5f659c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-02  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] X sync our XEmbed container window creation before sending the
+        xid to plugins.
+        https://bugs.webkit.org/show_bug.cgi?id=25053
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::setNPWindowIfNeeded):
+
 2009-10-02  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index 908e707..de7b879 100644
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -57,6 +57,7 @@
 #include "runtime.h"
 #include "runtime_root.h"
 #include "QWebPageClient.h"
+#include <QApplication>
 #include <QKeyEvent>
 #include <QWidget>
 #include <QX11Info>
@@ -276,6 +277,8 @@ void PluginView::setNPWindowIfNeeded()
     m_npWindow.clipRect.right = m_clipRect.width();
     m_npWindow.clipRect.bottom = m_clipRect.height();
 
+    QApplication::syncX();
+
     PluginView::setCurrentPluginView(this);
     JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
     setCallingPlugin(true);

-- 
WebKit Debian packaging