[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 3de38718641296e33adcffe38524b9ad518b7366
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 8 14:44:24 2009 +0000

    2009-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Re-add the QApplication::syncX() line for plugin windows removed
            by r49169. Also changed the location of the sync just after the
            creation instead of just before sending it to the plugin.
            https://bugs.webkit.org/show_bug.cgi?id=25053
    
            * plugins/qt/PluginViewQt.cpp:
            (WebCore::PluginView::platformStart):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49300 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a665dd4..ac9f23d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Re-add the QApplication::syncX() line for plugin windows removed
+        by r49169. Also changed the location of the sync just after the
+        creation instead of just before sending it to the plugin.
+        https://bugs.webkit.org/show_bug.cgi?id=25053
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::platformStart):
+
 2009-10-08  Joseph Pecoraro  <joepeck at webkit.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index 47c6432..27639e1 100644
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -757,6 +757,8 @@ bool PluginView::platformStart()
         if (m_needsXEmbed) {
             QWebPageClient* client = m_parentFrame->view()->hostWindow()->platformPageClient();
             setPlatformWidget(new PluginContainerQt(this, QWidget::find(client->winId())));
+            // sync our XEmbed container window creation before sending the xid to plugins.
+            QApplication::syncX();
         } else {
             notImplemented();
             m_status = PluginStatusCanNotLoadPlugin;

-- 
WebKit Debian packaging