[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3ade53cf0036e5da1597a8700d3f8e514e311f2d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 8 11:42:27 2010 +0000

    2010-10-08  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
    
            Reviewed by Andreas Kling.
    
            Notify WebPage when QGraphicsWKView gains focus. Set both
            active flag and focused flag, similar to QWebPage behavior.
    
            [Qt] WebKit2 should support focusing
            https://bugs.webkit.org/show_bug.cgi?id=47168
    
            * UIProcess/API/qt/qgraphicswkview.cpp:
            (QGraphicsWKView::focusInEvent): Added.
            (QGraphicsWKView::focusOutEvent): Added.
            * UIProcess/API/qt/qgraphicswkview.h: Added declarations.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69391 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 710ed70..4521fe7 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-08  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Notify WebPage when QGraphicsWKView gains focus. Set both
+        active flag and focused flag, similar to QWebPage behavior.
+
+        [Qt] WebKit2 should support focusing
+        https://bugs.webkit.org/show_bug.cgi?id=47168
+
+        * UIProcess/API/qt/qgraphicswkview.cpp:
+        (QGraphicsWKView::focusInEvent): Added.
+        (QGraphicsWKView::focusOutEvent): Added.
+        * UIProcess/API/qt/qgraphicswkview.h: Added declarations.
+
 2010-10-07  Ivan Krstić  <ike at apple.com>
 
         Reviewed by Mark Rowe.
diff --git a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
index 80fcebc..92c43ca 100644
--- a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
+++ b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
@@ -248,6 +248,18 @@ void QGraphicsWKView::touchEvent(QTouchEvent* ev)
 }
 #endif
 
+void QGraphicsWKView::focusInEvent(QFocusEvent*)
+{
+    page()->d->page->setActive(true);
+    page()->d->page->setFocused(true);
+}
+
+void QGraphicsWKView::focusOutEvent(QFocusEvent*)
+{
+    page()->d->page->setFocused(false);
+    page()->d->page->setActive(false);
+}
+
 QGraphicsWKViewPrivate::QGraphicsWKViewPrivate(QGraphicsWKView* view)
     : q(view)
 {
diff --git a/WebKit2/UIProcess/API/qt/qgraphicswkview.h b/WebKit2/UIProcess/API/qt/qgraphicswkview.h
index 85b4797..64ceaa5 100644
--- a/WebKit2/UIProcess/API/qt/qgraphicswkview.h
+++ b/WebKit2/UIProcess/API/qt/qgraphicswkview.h
@@ -76,6 +76,9 @@ protected:
 
     Q_SLOT void updateCursor(const QCursor&);
 
+    virtual void focusInEvent(QFocusEvent*);
+    virtual void focusOutEvent(QFocusEvent*);
+
 private:
     QGraphicsWKViewPrivate* d;
     friend class QGraphicsWKViewPrivate;

-- 
WebKit Debian packaging