[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 e7b5b2f3441bc80e2bb1cc870a79c84b33e9b08d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 24 10:24:02 2010 +0000

    2010-11-24  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r72650.
            http://trac.webkit.org/changeset/72650
            https://bugs.webkit.org/show_bug.cgi?id=50010
    
            breaks focus in scenes focus item other than graphicswebiview
            (Requested by tronical_ on #webkit).
    
            * Api/qgraphicswebview.cpp:
            (QGraphicsWebViewPrivate::QGraphicsWebViewPrivate):
            (QGraphicsWebView::QGraphicsWebView):
            (QGraphicsWebView::itemChange):
            * Api/qgraphicswebview.h:
            * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72653 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index f94ae0e..c8438f3 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -53,8 +53,7 @@ public:
     QGraphicsWebViewPrivate(QGraphicsWebView* parent)
         : q(parent)
         , page(0)
-        , resizesToContents(false)
-        , currentScene(0) {}
+        , resizesToContents(false) {}
 
     virtual ~QGraphicsWebViewPrivate();
 
@@ -76,7 +75,6 @@ public:
     QGraphicsWebView* q;
     QWebPage* page;
     bool resizesToContents;
-    QGraphicsScene* currentScene;
 
     QGraphicsItemOverlay* overlay() const
     {
@@ -254,11 +252,6 @@ QGraphicsWebView::QGraphicsWebView(QGraphicsItem* parent)
 #if ENABLE(TILED_BACKING_STORE)
     QObject::connect(this, SIGNAL(scaleChanged()), this, SLOT(_q_scaleChanged()));
 #endif
-
-    if (scene()) {
-        d->currentScene = scene();
-        d->currentScene->installEventFilter(this);
-    }
 }
 
 /*!
@@ -315,20 +308,6 @@ void QGraphicsWebView::paint(QPainter* painter, const QStyleOptionGraphicsItem*
 
 /*! \reimp
 */
-bool QGraphicsWebView::eventFilter(QObject* object, QEvent* event)
-{
-    if (object == d->currentScene
-        && (event->type() == QEvent::FocusIn
-            || event->type() == QEvent::FocusOut)) {
-        QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
-        if (focusEvent->reason() == Qt::ActiveWindowFocusReason)
-            d->page->event(event);
-    }
-    return false;
-}
-
-/*! \reimp
-*/
 bool QGraphicsWebView::sceneEvent(QEvent* event)
 {
     // Re-implemented in order to allows fixing event-related bugs in patch releases.
@@ -363,14 +342,6 @@ QVariant QGraphicsWebView::itemChange(GraphicsItemChange change, const QVariant&
             QApplication::sendEvent(this, &event);
             return value;
         }
-    case ItemSceneHasChanged: {
-            QGraphicsScene* newScene = qVariantValue<QGraphicsScene*>(value);
-            if (d->currentScene)
-                d->currentScene->removeEventFilter(this);
-            d->currentScene = newScene;
-            if (d->currentScene)
-                d->currentScene->installEventFilter(this);
-        }
     default:
         break;
     }
diff --git a/WebKit/qt/Api/qgraphicswebview.h b/WebKit/qt/Api/qgraphicswebview.h
index a484e9e..8620ac5 100644
--- a/WebKit/qt/Api/qgraphicswebview.h
+++ b/WebKit/qt/Api/qgraphicswebview.h
@@ -140,8 +140,6 @@ protected:
 
     virtual bool sceneEvent(QEvent*);
 
-    virtual bool eventFilter(QObject*, QEvent*);
-
 private:
     Q_PRIVATE_SLOT(d, void _q_doLoadFinished(bool success))
 #if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN))
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 2fe238c..32df9d2 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-24  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r72650.
+        http://trac.webkit.org/changeset/72650
+        https://bugs.webkit.org/show_bug.cgi?id=50010
+
+        breaks focus in scenes focus item other than graphicswebiview
+        (Requested by tronical_ on #webkit).
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::QGraphicsWebViewPrivate):
+        (QGraphicsWebView::QGraphicsWebView):
+        (QGraphicsWebView::itemChange):
+        * Api/qgraphicswebview.h:
+        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+
 2010-11-24  Jan Erik Hanssen  <jhanssen at sencha.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp b/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
index 284efd2..09a21e1 100644
--- a/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
+++ b/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
@@ -36,7 +36,6 @@ private slots:
     void focusInputTypes();
     void crashOnSetScaleBeforeSetUrl();
     void widgetsRenderingThroughCache();
-    void receivesFocusInOnShow();
 };
 
 void tst_QGraphicsWebView::qgraphicswebview()
@@ -260,58 +259,6 @@ void tst_QGraphicsWebView::focusInputTypes()
     delete view;
 }
 
-class FocusPage : public QWebPage {
-public:
-    FocusPage(QObject* parent = 0);
-
-    bool gotFocus() const;
-
-protected:
-    bool event(QEvent* e);
-
-private:
-    bool m_focus;
-};
-
-FocusPage::FocusPage(QObject *parent)
-    : QWebPage(parent), m_focus(false)
-{
-}
-
-bool FocusPage::event(QEvent *e)
-{
-    if (e->type() == QEvent::FocusIn)
-        m_focus = true;
-    return QWebPage::event(e);
-}
-
-bool FocusPage::gotFocus() const
-{
-    return m_focus;
-}
-
-void tst_QGraphicsWebView::receivesFocusInOnShow()
-{
-    QGraphicsWebView webView;
-    webView.setHtml("<body><input type=text autofocus=autofocus></input></body>");
-    FocusPage page;
-    webView.setPage(&page);
-
-    for (int i = 0; i < 3; ++i) {
-        QGraphicsView view;
-        QGraphicsScene* scene = new QGraphicsScene(&view);
-        view.setScene(scene);
-        scene->addItem(&webView);
-        view.setGeometry(QRect(0, 0, 500, 500));
-
-        view.show();
-        QTest::qWaitForWindowShown(&view);
-
-        QVERIFY(page.gotFocus());
-
-        scene->removeItem(&webView);
-    }
-}
 
 
 QTEST_MAIN(tst_QGraphicsWebView)

-- 
WebKit Debian packaging