[webkit-changes] [98226] trunk/Source/WebKit2

[commit-queue]

Title: [98226] trunk/Source/WebKit2

Revision

98226

Author

commit-qu...@webkit.org

Date

2011-10-24 02:26:54 -0700 (Mon, 24 Oct 2011)

Log Message

[Qt][WK2] WebView does not get focus when being clicked / touched in MiniBrowser.
https://bugs.webkit.org/show_bug.cgi?id=70613

Make TouchWebView and DesktopWebView take the focus whenever it receives
a MouseClick or a TouchEvent.

Patch by Zeno Albisser <zeno.albis...@nokia.com> on 2011-10-24
Reviewed by Simon Hausmann.

* UIProcess/API/qt/qdesktopwebview.cpp:
(QDesktopWebView::mousePressEvent):
* UIProcess/API/qt/qtouchwebview.cpp:
(QTouchWebView::touchEvent):
* UIProcess/API/qt/qtouchwebview.h:

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp
• trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp
• trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.h

Diff

Modified: trunk/Source/WebKit2/ChangeLog (98225 => 98226)

--- trunk/Source/WebKit2/ChangeLog	2011-10-24 09:25:22 UTC (rev 98225)
+++ trunk/Source/WebKit2/ChangeLog	2011-10-24 09:26:54 UTC (rev 98226)
@@ -1,3 +1,19 @@
+2011-10-24  Zeno Albisser  <zeno.albis...@nokia.com>
+
+        [Qt][WK2] WebView does not get focus when being clicked / touched in MiniBrowser.
+        https://bugs.webkit.org/show_bug.cgi?id=70613
+
+        Make TouchWebView and DesktopWebView take the focus whenever it receives
+        a MouseClick or a TouchEvent.
+
+        Reviewed by Simon Hausmann.
+
+        * UIProcess/API/qt/qdesktopwebview.cpp:
+        (QDesktopWebView::mousePressEvent):
+        * UIProcess/API/qt/qtouchwebview.cpp:
+        (QTouchWebView::touchEvent):
+        * UIProcess/API/qt/qtouchwebview.h:
+
 2011-10-24  Sudarsana Nagineni  <sudarsana.nagin...@linux.intel.com>
 
         [GTK] [WK2] Memory leaks in WebContextGtk.cpp

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp (98225 => 98226)

--- trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp	2011-10-24 09:25:22 UTC (rev 98225)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp	2011-10-24 09:26:54 UTC (rev 98226)
@@ -331,6 +331,7 @@
 
 void QDesktopWebView::mousePressEvent(QMouseEvent* event)
 {
+    forceActiveFocus();
     this->event(event);
 }
 

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp (98225 => 98226)

--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp	2011-10-24 09:25:22 UTC (rev 98225)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp	2011-10-24 09:26:54 UTC (rev 98226)
@@ -118,4 +118,10 @@
     }
 }
 
+void QTouchWebView::touchEvent(QTouchEvent* event)
+{
+    forceActiveFocus();
+    QSGItem::touchEvent(event);
+}
+
 #include "moc_qtouchwebview.cpp"

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.h (98225 => 98226)

--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.h	2011-10-24 09:25:22 UTC (rev 98225)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.h	2011-10-24 09:26:54 UTC (rev 98226)
@@ -25,6 +25,7 @@
 
 #include <QtDeclarative/qsgitem.h>
 
+class QTouchEvent;
 class QTouchWebPage;
 class QTouchWebViewPrivate;
 
@@ -45,6 +46,7 @@
 
 protected:
     virtual void geometryChanged(const QRectF&, const QRectF&);
+    virtual void touchEvent(QTouchEvent* event);
 
 private:
     Q_PRIVATE_SLOT(d, void _q_viewportUpdated());

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes