[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[girish at forwardbias.in]

The following commit has been merged in the debian/experimental branch:
commit 9ae51377f5c0cb57b24bcf2e5e10ecd158e2655c
Author: girish at forwardbias.in <girish at forwardbias.in@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 00:41:48 2011 +0000

    [Qt] QML WebView does not transfer focus to underlying QGraphicsWebView
    
    QML WebView creates QGraphicsWebView as it's child. The WebView is not
    setup as a focus proxy of the QGraphicsWebView. Thus, even though the
    WebView gets focus, the QGraphicsWebView does not get focus.
    In QML, focus proxies or "focus scopes" are created using FocusScope.
    This change makes WebView a FocusScope and sets the focus on the
    QGraphicsWebView.
    
    Reviewed by Simon Hausmann.
    Acked by Aaron Kennedy <aaron.kennedy at nokia.com>
    
    https://bugs.webkit.org/show_bug.cgi?id=51094
    
    * declarative/qdeclarativewebview.cpp:
    (QDeclarativeWebView::init):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75119 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f0da3f0..25bd2c0 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,22 @@
+2011-01-04  Girish Ramakrishnan  <girish at forwardbias.in>
+
+        Reviewed by Simon Hausmann.
+        Acked by Aaron Kennedy <aaron.kennedy at nokia.com>
+
+        [Qt] QML WebView does not transfer focus to underlying QGraphicsWebView
+
+        QML WebView creates QGraphicsWebView as it's child. The WebView is not
+        setup as a focus proxy of the QGraphicsWebView. Thus, even though the
+        WebView gets focus, the QGraphicsWebView does not get focus.
+        In QML, focus proxies or "focus scopes" are created using FocusScope.
+        This change makes WebView a FocusScope and sets the focus on the
+        QGraphicsWebView. 
+
+        https://bugs.webkit.org/show_bug.cgi?id=51094
+
+        * declarative/qdeclarativewebview.cpp:
+        (QDeclarativeWebView::init):
+
 2011-01-05  Yi Shen  <yi.4.shen at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit/qt/declarative/qdeclarativewebview.cpp b/WebKit/qt/declarative/qdeclarativewebview.cpp
index 94f08bd..e26889e 100644
--- a/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -253,10 +253,12 @@ void QDeclarativeWebView::init()
 
     setAcceptedMouseButtons(Qt::LeftButton);
     setFlag(QGraphicsItem::ItemHasNoContents, true);
+    setFlag(QGraphicsItem::ItemIsFocusScope, true);
     setClip(true);
 
     d->view = new GraphicsWebView(this);
     d->view->setResizesToContents(true);
+    d->view->setFocus();
     QWebPage* wp = new QDeclarativeWebPage(this);
     setPage(wp);
     connect(d->view, SIGNAL(geometryChanged()), this, SLOT(updateDeclarativeWebViewSize()));

-- 
WebKit Debian packaging