Title: [146356] trunk/Source/WebKit2
- Revision
- 146356
- Author
- abe...@webkit.org
- Date
- 2013-03-20 09:49:30 -0700 (Wed, 20 Mar 2013)
Log Message
[Qt][WK2] Clean up sanity checks related to gesture recognition
https://bugs.webkit.org/show_bug.cgi?id=112679
Reviewed by Jocelyn Turcotte.
The only callers of the panGestureActive and pinchGestureActive member
functions of the page viewport controller client are event delivery
related sanity check assers, thus they can be replaced by checking
for the corresponding internal states and therefore the superfluous
members can be removed.
Also update other asserts in the page viewport controller client to
be more accurate about the expected states.
* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::animateContentRectVisible):
(WebKit::PageViewportControllerClientQt::touchBegin):
(WebKit::PageViewportControllerClientQt::panGestureStarted):
(WebKit::PageViewportControllerClientQt::pinchGestureStarted):
* UIProcess/qt/PageViewportControllerClientQt.h:
(PageViewportControllerClientQt):
* UIProcess/qt/QtWebPageEventHandler.cpp:
(WebKit::QtWebPageEventHandler::handleInputEvent):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (146355 => 146356)
--- trunk/Source/WebKit2/ChangeLog 2013-03-20 16:45:17 UTC (rev 146355)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-20 16:49:30 UTC (rev 146356)
@@ -1,5 +1,30 @@
2013-03-20 Andras Becsi <andras.be...@digia.com>
+ [Qt][WK2] Clean up sanity checks related to gesture recognition
+ https://bugs.webkit.org/show_bug.cgi?id=112679
+
+ Reviewed by Jocelyn Turcotte.
+
+ The only callers of the panGestureActive and pinchGestureActive member
+ functions of the page viewport controller client are event delivery
+ related sanity check assers, thus they can be replaced by checking
+ for the corresponding internal states and therefore the superfluous
+ members can be removed.
+ Also update other asserts in the page viewport controller client to
+ be more accurate about the expected states.
+
+ * UIProcess/qt/PageViewportControllerClientQt.cpp:
+ (WebKit::PageViewportControllerClientQt::animateContentRectVisible):
+ (WebKit::PageViewportControllerClientQt::touchBegin):
+ (WebKit::PageViewportControllerClientQt::panGestureStarted):
+ (WebKit::PageViewportControllerClientQt::pinchGestureStarted):
+ * UIProcess/qt/PageViewportControllerClientQt.h:
+ (PageViewportControllerClientQt):
+ * UIProcess/qt/QtWebPageEventHandler.cpp:
+ (WebKit::QtWebPageEventHandler::handleInputEvent):
+
+2013-03-20 Andras Becsi <andras.be...@digia.com>
+
[Qt][WK2] Refactor handling of content suspension to properly cover corner cases
https://bugs.webkit.org/show_bug.cgi?id=111751
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (146355 => 146356)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2013-03-20 16:45:17 UTC (rev 146355)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2013-03-20 16:49:30 UTC (rev 146356)
@@ -125,11 +125,8 @@
void PageViewportControllerClientQt::animateContentRectVisible(const QRectF& contentRect)
{
- ASSERT(m_scaleAnimation->state() == QAbstractAnimation::Stopped);
-
+ ASSERT(!scaleAnimationActive());
ASSERT(!scrollAnimationActive());
- if (scrollAnimationActive())
- return;
QRectF viewportRectInContentCoords = m_viewportItem->mapRectToWebContent(m_viewportItem->boundingRect());
if (contentRect == viewportRectInContentCoords) {
@@ -192,6 +189,10 @@
void PageViewportControllerClientQt::touchBegin()
{
+ // Check for sane event delivery. At this point neither a pan gesture nor a pinch gesture should be active.
+ ASSERT(!m_viewportItem->isDragging());
+ ASSERT(!(m_pinchStartScale > 0));
+
m_controller->setHadUserInteraction(true);
// Prevent resuming the page during transition between gestures while the user is interacting.
@@ -366,15 +367,10 @@
return m_viewportItem->isFlicking();
}
-bool PageViewportControllerClientQt::panGestureActive() const
-{
- return m_controller->hadUserInteraction() && m_viewportItem->isDragging();
-}
-
void PageViewportControllerClientQt::panGestureStarted(const QPointF& position, qint64 eventTimestampMillis)
{
// This can only happen as a result of a user interaction.
- ASSERT(m_controller->hadUserInteraction());
+ ASSERT(m_touchInteraction.inProgress());
m_viewportItem->handleFlickableMousePress(position, eventTimestampMillis);
m_lastPinchCenterInViewportCoordinates = position;
@@ -429,15 +425,10 @@
m_scaleAnimation->stop();
}
-bool PageViewportControllerClientQt::pinchGestureActive() const
-{
- return m_controller->hadUserInteraction() && (m_pinchStartScale > 0);
-}
-
void PageViewportControllerClientQt::pinchGestureStarted(const QPointF& pinchCenterInViewportCoordinates)
{
// This can only happen as a result of a user interaction.
- ASSERT(m_controller->hadUserInteraction());
+ ASSERT(m_touchInteraction.inProgress());
if (!m_controller->allowsUserScaling())
return;
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h (146355 => 146356)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h 2013-03-20 16:45:17 UTC (rev 146355)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h 2013-03-20 16:49:30 UTC (rev 146356)
@@ -63,7 +63,6 @@
bool scrollAnimationActive() const;
void cancelScrollAnimation();
- bool panGestureActive() const;
void panGestureStarted(const QPointF& position, qint64 eventTimestampMillis);
void panGestureRequestUpdate(const QPointF& position, qint64 eventTimestampMillis);
void panGestureEnded(const QPointF& position, qint64 eventTimestampMillis);
@@ -72,7 +71,6 @@
bool scaleAnimationActive() const;
void interruptScaleAnimation();
- bool pinchGestureActive() const;
void pinchGestureStarted(const QPointF& pinchCenterInViewportCoordinates);
void pinchGestureRequestUpdate(const QPointF& pinchCenterInViewportCoordinates, qreal totalScaleFactor);
void pinchGestureEnded();
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp (146355 => 146356)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp 2013-03-20 16:45:17 UTC (rev 146355)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp 2013-03-20 16:49:30 UTC (rev 146356)
@@ -460,8 +460,6 @@
switch (event->type()) {
case QEvent::MouseButtonPress:
case QEvent::TouchBegin:
- ASSERT(!m_viewportController->panGestureActive());
- ASSERT(!m_viewportController->pinchGestureActive());
m_viewportController->touchBegin();
// The page viewport controller might still be animating kinetic scrolling or a scale animation
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
