Changeset 72650 in webkit

Timestamp:

Nov 24, 2010 1:34:56 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-24 Jan Erik Hanssen <​jhanssen@sencha.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Html autofocus not working with QGraphicsWebView
​https://bugs.webkit.org/show_bug.cgi?id=43169

QGraphicsScene does not propagate Qt::ActivateWindowFocusReason focus
events when there are no active items.

• Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::QGraphicsWebViewPrivate): (QGraphicsWebView::QGraphicsWebView): (QGraphicsWebView::eventFilter): (QGraphicsWebView::itemChange):
• Api/qgraphicswebview.h:
• tests/qgraphicswebview/tst_qgraphicswebview.cpp: (FocusPage::FocusPage): (FocusPage::event): (FocusPage::gotFocus): (tst_QGraphicsWebView::receivesFocusInOnShow):

Location:

trunk/WebKit/qt

Files:

• Api/qgraphicswebview.cpp (modified) (5 diffs)
• Api/qgraphicswebview.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• tests/qgraphicswebview/tst_qgraphicswebview.cpp (modified) (2 diffs)

trunk/WebKit/qt/Api/qgraphicswebview.cpp

@@ -54 +54 @@
         : q(parent)
         , page(0)
-        , resizesToContents(false) {}
+        , resizesToContents(false)
+        , currentScene(0) {}
 
     virtual ~QGraphicsWebViewPrivate();
@@ -76 +77 @@
     QWebPage* page;
     bool resizesToContents;
+    QGraphicsScene* currentScene;
 
     QGraphicsItemOverlay* overlay() const
@@ -253 +255 @@
     QObject::connect(this, SIGNAL(scaleChanged()), this, SLOT(_q_scaleChanged()));
 #endif
+
+    if (scene()) {
+        d->currentScene = scene();
+        d->currentScene->installEventFilter(this);
+    }
 }
 
@@ -305 +312 @@
     page()->mainFrame()->render(painter, QWebFrame::AllLayers, option->exposedRect.toRect());
 #endif
+}
+
+/*! \reimp
+*/
+bool QGraphicsWebView::eventFilter(QObject* object, QEvent* event)
+{
+    if (object == d->currentScene
+        && (event->type() == QEvent::FocusIn
+            || event->type() == QEvent::FocusOut)) {
+        QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
+        if (focusEvent->reason() == Qt::ActiveWindowFocusReason)
+            d->page->event(event);
+    }
+    return false;
 }
 
@@ -342 +363 @@
             QApplication::sendEvent(this, &event);
             return value;
+        }
+    case ItemSceneHasChanged: {
+            QGraphicsScene* newScene = qVariantValue<QGraphicsScene*>(value);
+            if (d->currentScene)
+                d->currentScene->removeEventFilter(this);
+            d->currentScene = newScene;
+            if (d->currentScene)
+                d->currentScene->installEventFilter(this);
         }
     default:

trunk/WebKit/qt/Api/qgraphicswebview.h

@@ -141 +141 @@
     virtual bool sceneEvent(QEvent*);
 
+    virtual bool eventFilter(QObject*, QEvent*);
+
 private:
     Q_PRIVATE_SLOT(d, void _q_doLoadFinished(bool success))

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-11-24  Jan Erik Hanssen  <jhanssen@sencha.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Html autofocus not working with QGraphicsWebView
+        https://bugs.webkit.org/show_bug.cgi?id=43169
+
+        QGraphicsScene does not propagate Qt::ActivateWindowFocusReason focus
+        events when there are no active items.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::QGraphicsWebViewPrivate):
+        (QGraphicsWebView::QGraphicsWebView):
+        (QGraphicsWebView::eventFilter):
+        (QGraphicsWebView::itemChange):
+        * Api/qgraphicswebview.h:
+        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+        (FocusPage::FocusPage):
+        (FocusPage::event):
+        (FocusPage::gotFocus):
+        (tst_QGraphicsWebView::receivesFocusInOnShow):
+
 2010-11-23  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp

@@ -37 +37 @@
     void crashOnSetScaleBeforeSetUrl();
     void widgetsRenderingThroughCache();
+    void receivesFocusInOnShow();
 };
 
@@ -260 +261 @@
 }
 
+class FocusPage : public QWebPage {
+public:
+    FocusPage(QObject* parent = 0);
+
+    bool gotFocus() const;
+
+protected:
+    bool event(QEvent* e);
+
+private:
+    bool m_focus;
+};
+
+FocusPage::FocusPage(QObject *parent)
+    : QWebPage(parent), m_focus(false)
+{
+}
+
+bool FocusPage::event(QEvent *e)
+{
+    if (e->type() == QEvent::FocusIn)
+        m_focus = true;
+    return QWebPage::event(e);
+}
+
+bool FocusPage::gotFocus() const
+{
+    return m_focus;
+}
+
+void tst_QGraphicsWebView::receivesFocusInOnShow()
+{
+    QGraphicsWebView webView;
+    webView.setHtml("<body><input type=text autofocus=autofocus></input></body>");
+    FocusPage page;
+    webView.setPage(&page);
+
+    for (int i = 0; i < 3; ++i) {
+        QGraphicsView view;
+        QGraphicsScene* scene = new QGraphicsScene(&view);
+        view.setScene(scene);
+        scene->addItem(&webView);
+        view.setGeometry(QRect(0, 0, 500, 500));
+
+        view.show();
+        QTest::qWaitForWindowShown(&view);
+
+        QVERIFY(page.gotFocus());
+
+        scene->removeItem(&webView);
+    }
+}