Attachment #82041 for bug #54242

View Details Raw Unified Return to Bug 54242




        Reviewed by NOBODY (OOPS!).

        [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:

2011-02-10  Ademar de Souza Reis Jr  <ademar.reis@openbossa.org>

        Reviewed by NOBODY (OOPS!).

        [Qt] Fix assert in QDeclarativeWebView
        https://bugs.webkit.org/show_bug.cgi?id=54240




        QGraphicsWebView::mouseMoveEvent(event);
}

bool GraphicsWebView::sceneEvent(QEvent *event)
{
    bool rv = QGraphicsWebView::sceneEvent(event);
    if (event->type() == QEvent::UngrabMouse) {
        pressTimer.stop();
        parent->setKeepMouseGrab(false);
    }
    return rv;
}

/*!
    \qmlclass WebView QDeclarativeWebView
    \ingroup qml-view-elements

Lines 70-75 protected: a/Source/WebKit/qt/declarative/qdeclarativewebview_p.h_sec1
- a/Source/WebKit/qt/declarative/qdeclarativewebview_p.h -1 / +2 lines
70	void mouseMoveEvent(QGraphicsSceneMouseEvent* event);	70	void mouseMoveEvent(QGraphicsSceneMouseEvent* event);
71	void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);	71	void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
72	void timerEvent(QTimerEvent* event);	72	void timerEvent(QTimerEvent* event);
		73	bool sceneEvent(QEvent *event);
		74
73	Q_SIGNALS:	75	Q_SIGNALS:
74	void doubleClick(int clickX, int clickY);	76	void doubleClick(int clickX, int clickY);
75	private:	77	private:
76	-

Return to Bug 54242

Lines 141-146 void GraphicsWebView::mouseMoveEvent(QGraphicsSceneMouseEvent* event) a/Source/WebKit/qt/declarative/qdeclarativewebview.cpp_sec1
- a/Source/WebKit/qt/declarative/qdeclarativewebview.cpp +10 lines
141	QGraphicsWebView::mouseMoveEvent(event);	141	QGraphicsWebView::mouseMoveEvent(event);
142	}	142	}
143		143
		144	bool GraphicsWebView::sceneEvent(QEvent *event)
		145	{
		146	bool rv = QGraphicsWebView::sceneEvent(event);
		147	if (event->type() == QEvent::UngrabMouse) {
		148	pressTimer.stop();
		149	parent->setKeepMouseGrab(false);
		150	}
		151	return rv;
		152	}
		153
144	/*!	154	/*!
145	\qmlclass WebView QDeclarativeWebView	155	\qmlclass WebView QDeclarativeWebView
146	\ingroup qml-view-elements	156	\ingroup qml-view-elements

Lines 2-7 a/Source/WebKit/qt/ChangeLog_sec1
- a/Source/WebKit/qt/ChangeLog +22 lines
2		2
3	Reviewed by NOBODY (OOPS!).	3	Reviewed by NOBODY (OOPS!).
4		4
		5	[Qt] Ensure WebView press delay timer is cancelled when grab is taken
		6	https://bugs.webkit.org/show_bug.cgi?id=54242
		7
		8	As reported in:
		9	http://bugreports.qt.nokia.com/browse/QTBUG-15529
		10
		11	Flickable steals the grab, but the timer was not stopped and the
		12	keepGrab flag is set and the mouse grabbed. This means that the WebView
		13	now has the grab and subsequent clicks on another element are ignored.
		14
		15	Original patch from Martin Jones <martin.jones@nokia.com>
		16	reviewed (there) by Joona Petrell
		17	52068f57f9c32098a90cc217730a530f85590f65
		18
		19	* declarative/qdeclarativewebview.cpp:
		20	(GraphicsWebView::sceneEvent):
		21	* declarative/qdeclarativewebview_p.h:
		22
		23	2011-02-10 Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
		24
		25	Reviewed by NOBODY (OOPS!).
		26
5	[Qt] Fix assert in QDeclarativeWebView	27	[Qt] Fix assert in QDeclarativeWebView
6	https://bugs.webkit.org/show_bug.cgi?id=54240	28	https://bugs.webkit.org/show_bug.cgi?id=54240
7		29