Changeset 65124 in webkit

Timestamp:

Aug 10, 2010 10:39:59 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-10 Anders Bakken <​agbakken@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):

Location:

trunk/WebKit/qt

Files:

• Api/qgraphicswebview.cpp (modified) (4 diffs)
• Api/qgraphicswebview.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qgraphicswebview.cpp

@@ -68 +68 @@
     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();
 
@@ -101 +103 @@
 }
 
+#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.
@@ -112 +114 @@
             ic->update();
     }
-#endif
-}
+}
+#endif
 
 void QGraphicsWebViewPrivate::_q_pageDestroyed()
@@ -489 +491 @@
     connect(d->page, SIGNAL(linkClicked(QUrl)),
             this, SIGNAL(linkClicked(QUrl)));
+    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()));
-    connect(d->page, SIGNAL(destroyed()),
-            this, SLOT(_q_pageDestroyed()));
+#endif
 }
 

trunk/WebKit/qt/Api/qgraphicswebview.h

@@ -147 +147 @@
 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

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-08-10  Anders Bakken  <agbakken@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@apple.com>