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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 5a0d4fe1f36764adec8a3fc1939dd12dd416d50b
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 1 16:59:28 2009 +0000

    Make Software Input Panel requests work with QGraphicsWebView
    _and_ QWebView by sharing the event code in handleSoftwareInputPanel().
    
    Patch by Simon Hausmann <simon.hausmann at nokia.com> on 2009-10-01
    Reviewed by Tor Arne Vestbø.
    
    * Api/qwebpage.cpp:
    (QWebPagePrivate::mouseReleaseEvent):
    (QWebPagePrivate::handleSoftwareInputPanel):
    * Api/qwebpage_p.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48977 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index d1a4059..942c3ea 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -764,10 +764,14 @@ void QWebPagePrivate::mouseReleaseEvent(QGraphicsSceneMouseEvent* ev)
     ev->setAccepted(accepted);
 
     handleClipboard(ev, ev->button());
+    handleSoftwareInputPanel(ev->button());
+}
 
+void QWebPagePrivate::handleSoftwareInputPanel(Qt::MouseButton button)
+{
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
     if (view && view->testAttribute(Qt::WA_InputMethodEnabled)
-        && ev->button() == Qt::LeftButton && qApp->autoSipEnabled()) {
+        && button == Qt::LeftButton && qApp->autoSipEnabled()) {
         QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel(
             view->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel));
         if (!clickCausedFocus || behavior == QStyle::RSIP_OnMouseClick) {
@@ -794,6 +798,7 @@ void QWebPagePrivate::mouseReleaseEvent(QMouseEvent *ev)
     ev->setAccepted(accepted);
 
     handleClipboard(ev, ev->button());
+    handleSoftwareInputPanel(ev->button());
 }
 
 #ifndef QT_NO_CONTEXTMENU
diff --git a/WebKit/qt/Api/qwebpage_p.h b/WebKit/qt/Api/qwebpage_p.h
index d41471a..b9571fa 100644
--- a/WebKit/qt/Api/qwebpage_p.h
+++ b/WebKit/qt/Api/qwebpage_p.h
@@ -111,6 +111,7 @@ public:
     void shortcutOverrideEvent(QKeyEvent*);
     void leaveEvent(QEvent*);
     void handleClipboard(QEvent*, Qt::MouseButton);
+    void handleSoftwareInputPanel(Qt::MouseButton);
     bool handleScrolling(QKeyEvent*, WebCore::Frame*);
 
     void setInspector(QWebInspector*);
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index ec6d878..57cf3c3 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-01  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Make Software Input Panel requests work with QGraphicsWebView
+        _and_ QWebView by sharing the event code in handleSoftwareInputPanel().
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::mouseReleaseEvent):
+        (QWebPagePrivate::handleSoftwareInputPanel):
+        * Api/qwebpage_p.h:
+
 2009-10-01  Alexis Menard  <alexis.menard at nokia.com>
 
         Reviewed by Tor Arne Vestbø.

-- 
WebKit Debian packaging