Title: [100955] trunk/Source/WebKit2
- Revision
- 100955
- Author
- alexis.men...@openbossa.org
- Date
- 2011-11-21 13:45:30 -0800 (Mon, 21 Nov 2011)
Log Message
[Qt][WK2] REGRESSION(100483): It made 2 API tests fail
https://bugs.webkit.org/show_bug.cgi?id=72612
Reviewed by Kenneth Rohde Christiansen.
Make sure that when the view is focused, the page knows about it.
Also set a the view to be the focused item in the failing tests.
* UIProcess/API/qt/qquickwebpage_p.h:
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebView::focusInEvent):
(QQuickWebView::focusOutEvent):
* UIProcess/API/qt/qquickwebview_p.h:
* UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_linkHovered.qml:
* UIProcess/qt/QtWebPageProxy.cpp:
(QtWebPageProxy::isViewFocused):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (100954 => 100955)
--- trunk/Source/WebKit2/ChangeLog 2011-11-21 21:40:34 UTC (rev 100954)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-21 21:45:30 UTC (rev 100955)
@@ -1,3 +1,22 @@
+2011-11-21 Alexis Menard <alexis.men...@openbossa.org>
+
+ [Qt][WK2] REGRESSION(100483): It made 2 API tests fail
+ https://bugs.webkit.org/show_bug.cgi?id=72612
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Make sure that when the view is focused, the page knows about it.
+ Also set a the view to be the focused item in the failing tests.
+
+ * UIProcess/API/qt/qquickwebpage_p.h:
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebView::focusInEvent):
+ (QQuickWebView::focusOutEvent):
+ * UIProcess/API/qt/qquickwebview_p.h:
+ * UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_linkHovered.qml:
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ (QtWebPageProxy::isViewFocused):
+
2011-11-21 Simon Hausmann <simon.hausm...@nokia.com>
[Qt] Speed up debug builds.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h (100954 => 100955)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h 2011-11-21 21:40:34 UTC (rev 100954)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h 2011-11-21 21:45:30 UTC (rev 100955)
@@ -72,6 +72,7 @@
Q_PRIVATE_SLOT(d, void _q_onSceneGraphInitialized());
QQuickWebPagePrivate* d;
+ friend class QQuickWebView;
friend class QQuickWebViewPrivate;
friend class QtWebPageProxy;
};
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (100954 => 100955)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-11-21 21:40:34 UTC (rev 100954)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-11-21 21:45:30 UTC (rev 100955)
@@ -603,6 +603,18 @@
}
}
+void QQuickWebView::focusInEvent(QFocusEvent* event)
+{
+ Q_D(QQuickWebView);
+ d->pageView->event(event);
+}
+
+void QQuickWebView::focusOutEvent(QFocusEvent* event)
+{
+ Q_D(QQuickWebView);
+ d->pageView->event(event);
+}
+
void QQuickWebView::touchEvent(QTouchEvent* event)
{
forceActiveFocus();
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (100954 => 100955)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-11-21 21:40:34 UTC (rev 100954)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-11-21 21:45:30 UTC (rev 100955)
@@ -115,6 +115,8 @@
protected:
virtual void geometryChanged(const QRectF&, const QRectF&);
+ virtual void focusInEvent(QFocusEvent*);
+ virtual void focusOutEvent(QFocusEvent*);
virtual void touchEvent(QTouchEvent* event);
private:
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_linkHovered.qml (100954 => 100955)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_linkHovered.qml 2011-11-21 21:40:34 UTC (rev 100954)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_linkHovered.qml 2011-11-21 21:45:30 UTC (rev 100955)
@@ -7,6 +7,7 @@
id: webView
width: 200
height: 400
+ focus: true
property string lastUrl
property string lastTitle
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (100954 => 100955)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-11-21 21:40:34 UTC (rev 100954)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-11-21 21:45:30 UTC (rev 100955)
@@ -493,7 +493,7 @@
bool QtWebPageProxy::isViewFocused()
{
- return m_qmlWebPage->hasFocus();
+ return m_qmlWebView->hasFocus();
}
bool QtWebPageProxy::isViewVisible()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
