2011-02-10 Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
authorAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Mon, 14 Feb 2011 17:56:44 +0000 (14:56 -0300)
committerAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Mon, 14 Feb 2011 17:56:44 +0000 (14:56 -0300)
commit830d494b7ea2c5e001a067ff53808fdd0bec8781
tree53085582cfaa97f6396729165a0196338fb4ba98
parentb22b52c362c2e48e4481026f4e8ba15049c09e92
2011-02-10  Ademar de Souza Reis Jr  <ademar.reis@openbossa.org>

        Reviewed by Andreas Kling.

        [Qt] Ensure WebView press delay timer is cancelled when grab is taken
        https://bugs.webkit.org/show_bug.cgi?id=54242

        As reported in:
        http://bugreports.qt.nokia.com/browse/QTBUG-15529

        Flickable steals the grab, but the timer was not stopped and the
        keepGrab flag is set and the mouse grabbed. This means that the WebView
        now has the grab and subsequent clicks on another element are ignored.

        Original patch from Martin Jones <martin.jones@nokia.com>
        reviewed (there) by Joona Petrell
        52068f57f9c32098a90cc217730a530f85590f65

        * declarative/qdeclarativewebview.cpp:
        (GraphicsWebView::sceneEvent):
        * declarative/qdeclarativewebview_p.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Conflicts:

Source/WebKit/qt/ChangeLog
Source/WebKit/qt/declarative/qdeclarativewebview.cpp
WebKit/qt/ChangeLog
WebKit/qt/declarative/qdeclarativewebview.cpp
WebKit/qt/declarative/qdeclarativewebview_p.h