Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 3 insertions, 18 deletions

diff --git a/Source/WebKit/qt/Api/qgraphicswebview.cpp b/Source/WebKit/qt/Api/qgraphicswebview.cpp
index b6ac31b..b1c9586 100644
--- a/Source/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/Source/WebKit/qt/Api/qgraphicswebview.cpp
@@ -69,9 +69,6 @@ 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;
@@ -112,20 +109,6 @@ 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()
-{
-    // 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();
-    for (int c = 0; c < views.size(); ++c) {
-        QInputContext* ic = views.at(c)->inputContext();
-        if (ic)
-            ic->update();
-    }
-}
-#endif
-
 void QGraphicsWebViewPrivate::_q_pageDestroyed()
 {
     page = 0;
@@ -381,6 +364,8 @@ bool QGraphicsWebView::event(QEvent* event)
     // Re-implemented in order to allows fixing event-related bugs in patch releases.
 
     if (d->page) {
+        if (event->type() == QEvent::PaletteChange)
+            d->page->setPalette(palette());
 #ifndef QT_NO_CONTEXTMENU
         if (event->type() == QEvent::GraphicsSceneContextMenu) {
             if (!isEnabled())
@@ -487,7 +472,7 @@ void QGraphicsWebView::setPage(QWebPage* page)
             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()));
+            this, SLOT(updateMicroFocus()));
 #endif
 }