[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5d6907cbbab22006f5655a01b0ab81be0105604c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 05:39:59 2010 +0000

    2010-08-10  Anders Bakken  <agbakken at gmail.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Don't connect to microFocusChanged() if _q_updateMicroFocus is a noop.
            https://bugs.webkit.org/show_bug.cgi?id=40580
    
            _q_updateMicroFocus() is a noop unless this ifdef evaluates to true:
            #if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN))
    
            In such cases there's no need to carry the overhead of the extra
            signal/slot connection.
    
            * Api/qgraphicswebview.cpp:
            (QGraphicsWebViewPrivate::_q_updateMicroFocus):
            (QGraphicsWebView::setPage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65124 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 47ab82a..7f66d98 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -67,7 +67,9 @@ public:
     void _q_contentsSizeChanged(const QSize&);
     void _q_scaleChanged();
 
+#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN))
     void _q_updateMicroFocus();
+#endif
     void _q_pageDestroyed();
 
     QGraphicsWebView* q;
@@ -100,9 +102,9 @@ void QGraphicsWebViewPrivate::_q_doLoadFinished(bool success)
     emit q->loadFinished(success);
 }
 
+#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN))
 void QGraphicsWebViewPrivate::_q_updateMicroFocus()
 {
-#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN))
     // Ideally, this should be handled by a common call to an updateMicroFocus function
     // in QGraphicsItem. See http://bugreports.qt.nokia.com/browse/QTBUG-7578.
     QList<QGraphicsView*> views = q->scene()->views();
@@ -111,8 +113,8 @@ void QGraphicsWebViewPrivate::_q_updateMicroFocus()
         if (ic)
             ic->update();
     }
-#endif
 }
+#endif
 
 void QGraphicsWebViewPrivate::_q_pageDestroyed()
 {
@@ -488,10 +490,12 @@ void QGraphicsWebView::setPage(QWebPage* page)
             this, SIGNAL(statusBarMessage(QString)));
     connect(d->page, SIGNAL(linkClicked(QUrl)),
             this, SIGNAL(linkClicked(QUrl)));
-    connect(d->page, SIGNAL(microFocusChanged()),
-            this, SLOT(_q_updateMicroFocus()));
     connect(d->page, SIGNAL(destroyed()),
             this, SLOT(_q_pageDestroyed()));
+#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN))
+    connect(d->page, SIGNAL(microFocusChanged()),
+            this, SLOT(_q_updateMicroFocus()));
+#endif
 }
 
 /*!
diff --git a/WebKit/qt/Api/qgraphicswebview.h b/WebKit/qt/Api/qgraphicswebview.h
index 8650984..77f0359 100644
--- a/WebKit/qt/Api/qgraphicswebview.h
+++ b/WebKit/qt/Api/qgraphicswebview.h
@@ -146,7 +146,9 @@ protected:
 
 private:
     Q_PRIVATE_SLOT(d, void _q_doLoadFinished(bool success))
+#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN))
     Q_PRIVATE_SLOT(d, void _q_updateMicroFocus())
+#endif
     Q_PRIVATE_SLOT(d, void _q_pageDestroyed())
     // we don't want to change the moc based on USE() macro, so this function is here
     // but will be empty if ACCLERATED_COMPOSITING is disabled
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4167bb1..e04f02d 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-10  Anders Bakken  <agbakken at gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Don't connect to microFocusChanged() if _q_updateMicroFocus is a noop.
+        https://bugs.webkit.org/show_bug.cgi?id=40580
+
+        _q_updateMicroFocus() is a noop unless this ifdef evaluates to true:
+        #if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN))
+
+        In such cases there's no need to carry the overhead of the extra
+        signal/slot connection.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::_q_updateMicroFocus):
+        (QGraphicsWebView::setPage):
+
 2010-08-10  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Oliver Hunt.

-- 
WebKit Debian packaging