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

[zecke at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 526af92f86344919e41aa11093b113954f91146c
Author: zecke at webkit.org <zecke at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 23 12:02:54 2009 +0000

    [Qt] Plugins : Use window's winId() instead of the widget's.
    
    2009-10-23  Girish Ramakrishnan  <girish at forwardbias.in>
    
            Reviewed by Holger Freyther.
    
            [Qt] Plugins : Use window's winId() instead of the widget's.
    
            As per, https://developer.mozilla.org/en/NPN_GetValue
            NPNVnetscapeWindow on Unix/X11: "Gets the browser toplevel window in which the
            plug-in is displayed; returns Window".
    
            The issue was found because NPNVNetscapeWindow winId() ends up creating
            a native window resulting in flicker.
    
            https://bugs.webkit.org/show_bug.cgi?id=30706
    
            * plugins/qt/PluginViewQt.cpp:
            (WebCore::PluginView::getValue):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49975 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0b03cb9..0a0d62d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,24 @@
 
         Reviewed by Holger Freyther.
 
+        [Qt] Plugins : Use window's winId() instead of the widget's.
+
+        As per, https://developer.mozilla.org/en/NPN_GetValue
+        NPNVnetscapeWindow on Unix/X11: "Gets the browser toplevel window in which the
+        plug-in is displayed; returns Window".
+
+        The issue was found because NPNVNetscapeWindow winId() ends up creating
+        a native window resulting in flicker.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30706
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::getValue):
+
+2009-10-23  Girish Ramakrishnan  <girish at forwardbias.in>
+
+        Reviewed by Holger Freyther.
+
         [Qt] Windowless Plugins : Don't use m_clipRect when painting.
 
         Though it works, it is not correct to use m_clipRect for painting
diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index f67c6ba..9d025a8 100644
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -633,7 +633,7 @@ NPError PluginView::getValue(NPNVariable variable, void* value)
     case NPNVnetscapeWindow: {
         void* w = reinterpret_cast<void*>(value);
         QWebPageClient* client = m_parentFrame->view()->hostWindow()->platformPageClient();
-        *((XID *)w) = client ? client->ownerWidget()->winId() : 0;
+        *((XID *)w) = client ? client->ownerWidget()->window()->winId() : 0;
         return NPERR_NO_ERROR;
     }
 

-- 
WebKit Debian packaging