* Remove the todo from QWebPage and move the code to QWebView.

Signed-off-by: Simon
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29165 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index a80e85143e1874495f96d0fa8b9184f8919f4dba..32cf3871d2dfe8a2ce2c0869872905fc76db1c1b 100644 (file)
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -940,10 +940,6 @@ void QWebPagePrivate::wheelEvent(QWheelEvent *ev)
     }
 
     ev->setAccepted(accepted);
-
-    // ### QWebPage
-//     if (!ev->isAccepted())
-//         QWidget::wheelEvent(ev);
 }
 
 void QWebPagePrivate::keyPressEvent(QKeyEvent *ev)
@@ -1115,14 +1111,10 @@ void QWebPagePrivate::focusInEvent(QFocusEvent *ev)
 {
     if (ev->reason() != Qt::PopupFocusReason) 
         mainFrame->d->frame->page()->focusController()->setFocusedFrame(mainFrame->d->frame);
-    // ### QWebPage
-    //QWidget::focusInEvent(ev);
 }
 
 void QWebPagePrivate::focusOutEvent(QFocusEvent *ev)
 {
-    // ### QWebPage
-    //QWidget::focusOutEvent(ev);
     if (ev->reason() != Qt::PopupFocusReason) {
         mainFrame->d->frame->selectionController()->clear();
         mainFrame->d->frame->setIsActive(false);

diff --git a/WebKit/qt/Api/qwebview.cpp b/WebKit/qt/Api/qwebview.cpp
index 1439d33a496142fb5ca0ccf48a1860266f223a47..e1abf1a09b888665f71245358cff21cf7a6acaea 100644 (file)
--- a/WebKit/qt/Api/qwebview.cpp
+++ b/WebKit/qt/Api/qwebview.cpp
@@ -424,6 +424,9 @@ void QWebView::contextMenuEvent(QContextMenuEvent* ev)
 void QWebView::wheelEvent(QWheelEvent* ev)
 {
     d->page->event(ev);
+
+    if (!ev->isAccepted())
+        return QWidget::wheelEvent(ev);
 }
 
 void QWebView::keyPressEvent(QKeyEvent* ev)
@@ -439,10 +442,12 @@ void QWebView::keyReleaseEvent(QKeyEvent* ev)
 void QWebView::focusInEvent(QFocusEvent* ev)
 {
     d->page->event(ev);
+    QWidget::focusInEvent(ev);
 }
 
 void QWebView::focusOutEvent(QFocusEvent* ev)
 {
+    QWidget::focusOutEvent(ev);
     d->page->event(ev);
 }
 

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 78bb6cce4e4c46a2c228b7281967ac664a41797b..db9c1236a1c4df0d9abf7eb5d5871a7ebd619f1a 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2008-01-04  Holger Hans Peter Freyther  <holger.freyther@trolltech.com>
+
+        Reviewed by Simon.
+
+        * Remove the todo from QWebPage and move the code to QWebView.
+        
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::wheelEvent):
+        (QWebPagePrivate::focusInEvent):
+        * Api/qwebview.cpp:
+        (QWebView::wheelEvent):
+        (QWebView::focusInEvent):
+
 2008-01-04  Holger Hans Peter Freyther  <holger.freyther@trolltech.com>
 
         Reviewed by Simon.