[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit afc4575c01f4a463c9b6a8d95752dc5b37174f57
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 2 17:19:49 2010 +0000

    Do not use a proxy widget for the QComboBox on Maemo 5, as it
    is not working properly and it is not needed at all, as the
    comboboxes comes up in their full width on the screen and
    do not depend on view.
    
    Reviewed by Ariya Hidayat.
    
    * WebCoreSupport/QtFallbackWebPopup.cpp:
    (WebCore::QtFallbackWebPopup::show):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54241 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f58902f..6040378 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-02  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Ariya Hidayat.
+
+        Do not use a proxy widget for the QComboBox on Maemo 5, as it
+        is not working properly and it is not needed at all, as the
+        comboboxes comes up in their full width on the screen and
+        do not depend on view.
+
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::show):
+
 2010-02-02  Jessie Berlin  <jberlin at webkit.org>
 
         Rubber Stamped by Holger Freyther.
diff --git a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
index 7ee2b7c..c553c45 100644
--- a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
+++ b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
@@ -95,6 +95,15 @@ void QtFallbackWebPopup::show()
 {
     populate();
     m_combo->setCurrentIndex(currentIndex());
+
+#if defined(Q_WS_MAEMO_5)
+    // Comboboxes with Qt on Maemo 5 come up in their full width on the screen, so neither
+    // the proxy widget, nor the coordinates are needed.
+    m_combo->setParent(pageClient()->ownerWidget());
+    m_combo->showPopup();
+    return;
+#endif
+
     QRect rect = geometry();
     if (QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(pageClient()->pluginParent())) {
         if (!m_proxy) {
@@ -110,16 +119,11 @@ void QtFallbackWebPopup::show()
 
     }
 
-    // QCursor::pos() is not a great idea for a touch screen, but we don't need the coordinates
-    // as comboboxes with Qt on Maemo 5 come up in their full width on the screen.
-    // On the other platforms it's okay to use QCursor::pos().
-#if defined(Q_WS_MAEMO_5)
-    m_combo->showPopup();
-#else
+    // QCursor::pos() is not a great idea for a touch screen, but as Maemo 5 is handled
+    // separately above, this should be okay.
     QMouseEvent event(QEvent::MouseButtonPress, QCursor::pos(), Qt::LeftButton,
                       Qt::LeftButton, Qt::NoModifier);
     QCoreApplication::sendEvent(m_combo, &event);
-#endif
 }
 
 void QtFallbackWebPopup::hide()

-- 
WebKit Debian packaging