[webkit-changes] [118919] trunk/Source/WebKit2

Wed, 30 May 2012 06:56:16 -0700

Title: [118919] trunk/Source/WebKit2
Revision
118919
Author
[email protected]
Date
2012-05-30 06:56:09 -0700 (Wed, 30 May 2012)

Log Message

[Qt] Do renames in ViewportInteractionEngine as agreed upon
https://bugs.webkit.org/show_bug.cgi?id=87845

Reviewed by Simon Hausmann.

Mostly moving methods around and renaming them to be more
consistent and avoid terminology clashes.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewFlickablePrivate::didChangeViewportProperties):
(QQuickWebViewFlickablePrivate::pageDidRequestScroll):
(QQuickWebViewFlickablePrivate::didChangeContentsSize):
* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::boundPosition):
(WebKit):
(WebKit::QtViewportInteractionEngine::QtViewportInteractionEngine):
(WebKit::QtViewportInteractionEngine::setPageItemRectVisible):
(WebKit::QtViewportInteractionEngine::animatePageItemRectVisible):
(WebKit::QtViewportInteractionEngine::flickMoveStarted):
(WebKit::QtViewportInteractionEngine::flickMoveEnded):
(WebKit::QtViewportInteractionEngine::pageItemPositionChanged):
(WebKit::QtViewportInteractionEngine::pageContentPositionRequest):
(WebKit::QtViewportInteractionEngine::scaleAnimationValueChanged):
(WebKit::QtViewportInteractionEngine::computePosRangeForPageItemAtScale):
(WebKit::QtViewportInteractionEngine::focusEditableArea):
(WebKit::QtViewportInteractionEngine::zoomToAreaGestureEnded):
(WebKit::QtViewportInteractionEngine::nearestValidBounds):
(WebKit::QtViewportInteractionEngine::cancelScrollAnimation):
(WebKit::QtViewportInteractionEngine::pinchGestureEnded):
(WebKit::QtViewportInteractionEngine::pageItemSizeChanged):
* UIProcess/qt/QtViewportInteractionEngine.h:
(WebKit::QtViewportInteractionEngine::setDevicePixelRatio):
(QtViewportInteractionEngine):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (118918 => 118919)


--- trunk/Source/WebKit2/ChangeLog	2012-05-30 13:55:12 UTC (rev 118918)
+++ trunk/Source/WebKit2/ChangeLog	2012-05-30 13:56:09 UTC (rev 118919)
@@ -1,3 +1,39 @@
+2012-05-30  Kenneth Rohde Christiansen  <[email protected]>
+
+        [Qt] Do renames in ViewportInteractionEngine as agreed upon
+        https://bugs.webkit.org/show_bug.cgi?id=87845
+
+        Reviewed by Simon Hausmann.
+
+        Mostly moving methods around and renaming them to be more
+        consistent and avoid terminology clashes.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewFlickablePrivate::didChangeViewportProperties):
+        (QQuickWebViewFlickablePrivate::pageDidRequestScroll):
+        (QQuickWebViewFlickablePrivate::didChangeContentsSize):
+        * UIProcess/qt/QtViewportInteractionEngine.cpp:
+        (WebKit::boundPosition):
+        (WebKit):
+        (WebKit::QtViewportInteractionEngine::QtViewportInteractionEngine):
+        (WebKit::QtViewportInteractionEngine::setPageItemRectVisible):
+        (WebKit::QtViewportInteractionEngine::animatePageItemRectVisible):
+        (WebKit::QtViewportInteractionEngine::flickMoveStarted):
+        (WebKit::QtViewportInteractionEngine::flickMoveEnded):
+        (WebKit::QtViewportInteractionEngine::pageItemPositionChanged):
+        (WebKit::QtViewportInteractionEngine::pageContentPositionRequest):
+        (WebKit::QtViewportInteractionEngine::scaleAnimationValueChanged):
+        (WebKit::QtViewportInteractionEngine::computePosRangeForPageItemAtScale):
+        (WebKit::QtViewportInteractionEngine::focusEditableArea):
+        (WebKit::QtViewportInteractionEngine::zoomToAreaGestureEnded):
+        (WebKit::QtViewportInteractionEngine::nearestValidBounds):
+        (WebKit::QtViewportInteractionEngine::cancelScrollAnimation):
+        (WebKit::QtViewportInteractionEngine::pinchGestureEnded):
+        (WebKit::QtViewportInteractionEngine::pageItemSizeChanged):
+        * UIProcess/qt/QtViewportInteractionEngine.h:
+        (WebKit::QtViewportInteractionEngine::setDevicePixelRatio):
+        (QtViewportInteractionEngine):
+
 2012-05-30  Mariusz Grzegorczyk  <[email protected]>, Ryuan Choi  <[email protected]>
 
         [EFL][WK2] Fix WebKit2-EFL build

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (118918 => 118919)


--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-05-30 13:55:12 UTC (rev 118918)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-05-30 13:56:09 UTC (rev 118919)
@@ -877,7 +877,7 @@
     // This needs to be revised at some point.
     interactionEngine->reset();
 
-    interactionEngine->setContentToDevicePixelRatio(attr.devicePixelRatio);
+    interactionEngine->setDevicePixelRatio(attr.devicePixelRatio);
 
     interactionEngine->setAllowsUserScaling(!!attr.userScalable);
     interactionEngine->setCSSScaleBounds(attr.minimumScale, attr.maximumScale);
@@ -890,7 +890,7 @@
 
     // If the web app successively changes the viewport on purpose
     // it wants to be in control and we should disable animations.
-    interactionEngine->setItemRectVisible(interactionEngine->nearestValidBounds());
+    interactionEngine->setPageItemRectVisible(interactionEngine->nearestValidBounds());
 }
 
 void QQuickWebViewFlickablePrivate::updateViewportSize()
@@ -957,7 +957,7 @@
 
 void QQuickWebViewFlickablePrivate::pageDidRequestScroll(const QPoint& pos)
 {
-    interactionEngine->pagePositionRequest(pos);
+    interactionEngine->pageContentPositionRequest(pos);
 }
 
 void QQuickWebViewFlickablePrivate::didChangeContentsSize(const QSize& newSize)
@@ -981,7 +981,7 @@
 
     // Emit for testing purposes, so that it can be verified that
     // we didn't do scale adjustment.
-    interactionEngine->setItemRectVisible(interactionEngine->nearestValidBounds());
+    interactionEngine->setPageItemRectVisible(interactionEngine->nearestValidBounds());
     emit q->experimental()->test()->contentsScaleCommitted();
 }

Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (118918 => 118919)


--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-05-30 13:55:12 UTC (rev 118918)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-05-30 13:56:09 UTC (rev 118919)
@@ -113,6 +113,12 @@
     return value * m_devicePixelRatio;
 }
 
+static inline QPointF boundPosition(const QPointF minPosition, const QPointF& position, const QPointF& maxPosition)
+{
+    return QPointF(qBound(minPosition.x(), position.x(), maxPosition.x()),
+                   qBound(minPosition.y(), position.y(), maxPosition.y()));
+}
+
 inline QRectF QtViewportInteractionEngine::itemRectFromCSS(const QRectF& cssRect) const
 {
     QRectF itemRect;
@@ -137,10 +143,10 @@
 {
     reset();
 
-    connect(m_pageItem, SIGNAL(widthChanged()), SLOT(itemSizeChanged()), Qt::DirectConnection);
-    connect(m_pageItem, SIGNAL(heightChanged()), SLOT(itemSizeChanged()), Qt::DirectConnection);
-    connect(m_viewportItem, SIGNAL(movementStarted()), SLOT(flickableMoveStarted()), Qt::DirectConnection);
-    connect(m_viewportItem, SIGNAL(movementEnded()), SLOT(flickableMoveEnded()), Qt::DirectConnection);
+    connect(m_pageItem, SIGNAL(widthChanged()), SLOT(pageSizeChanged()), Qt::DirectConnection);
+    connect(m_pageItem, SIGNAL(heightChanged()), SLOT(pageSizeChanged()), Qt::DirectConnection);
+    connect(m_viewportItem, SIGNAL(movementStarted()), SLOT(flickMoveStarted()), Qt::DirectConnection);
+    connect(m_viewportItem, SIGNAL(movementEnded()), SLOT(flickMoveEnded()), Qt::DirectConnection);
 
     connect(m_scaleAnimation, SIGNAL(valueChanged(QVariant)),
             SLOT(scaleAnimationValueChanged(QVariant)), Qt::DirectConnection);
@@ -168,10 +174,10 @@
     return innerBoundedCSSScale(cssScale);
 }
 
-void QtViewportInteractionEngine::setItemRectVisible(const QRectF& itemRect)
+void QtViewportInteractionEngine::setPageItemRectVisible(const QRectF& itemRect)
 {
     ASSERT_WITH_MESSAGE(m_suspendCount,
-        "setItemRectVisible has to be guarded using a ViewportUpdateDeferrer.");
+        "setPageItemRectVisible has to be guarded using a ViewportUpdateDeferrer.");
 
     if (itemRect.isEmpty())
         return;
@@ -193,7 +199,7 @@
     return (-t * (t - 2)) * 1.25 - (t * t) * 0.25;
 }
 
-void QtViewportInteractionEngine::animateItemRectVisible(const QRectF& itemRect)
+void QtViewportInteractionEngine::animatePageItemRectVisible(const QRectF& itemRect)
 {
     ASSERT(m_scaleAnimation->state() == QAbstractAnimation::Stopped);
 
@@ -201,8 +207,8 @@
     if (scrollAnimationActive())
         return;
 
-    QRectF currentItemRectVisible = m_viewportItem->mapRectToWebContent(m_viewportItem->boundingRect());
-    if (itemRect == currentItemRectVisible)
+    QRectF currentPageItemRectVisible = m_viewportItem->mapRectToWebContent(m_viewportItem->boundingRect());
+    if (itemRect == currentPageItemRectVisible)
         return;
 
     QEasingCurve easingCurve;
@@ -211,34 +217,34 @@
     m_scaleAnimation->setDuration(kScaleAnimationDurationMillis);
     m_scaleAnimation->setEasingCurve(easingCurve);
 
-    m_scaleAnimation->setStartValue(currentItemRectVisible);
+    m_scaleAnimation->setStartValue(currentPageItemRectVisible);
     m_scaleAnimation->setEndValue(itemRect);
 
     m_scaleAnimation->start();
 }
 
-void QtViewportInteractionEngine::flickableMoveStarted()
+void QtViewportInteractionEngine::flickMoveStarted()
 {
     Q_ASSERT(m_viewportItem->isMoving());
     m_scrollUpdateDeferrer = adoptPtr(new ViewportUpdateDeferrer(this, ViewportUpdateDeferrer::DeferUpdateAndSuspendContent));
 
     m_lastScrollPosition = m_viewportItem->contentPos();
-    connect(m_viewportItem, SIGNAL(contentXChanged()), SLOT(flickableMovingPositionUpdate()));
-    connect(m_viewportItem, SIGNAL(contentYChanged()), SLOT(flickableMovingPositionUpdate()));
+    connect(m_viewportItem, SIGNAL(contentXChanged()), SLOT(pageItemPositionChanged()));
+    connect(m_viewportItem, SIGNAL(contentYChanged()), SLOT(pageItemPositionChanged()));
 }
 
-void QtViewportInteractionEngine::flickableMoveEnded()
+void QtViewportInteractionEngine::flickMoveEnded()
 {
     Q_ASSERT(!m_viewportItem->isMoving());
     // This method is called on the end of the pan or pan kinetic animation.
     m_scrollUpdateDeferrer.clear();
 
     m_lastScrollPosition = QPointF();
-    disconnect(m_viewportItem, SIGNAL(contentXChanged()), this, SLOT(flickableMovingPositionUpdate()));
-    disconnect(m_viewportItem, SIGNAL(contentYChanged()), this, SLOT(flickableMovingPositionUpdate()));
+    disconnect(m_viewportItem, SIGNAL(contentXChanged()), this, SLOT(pageItemPositionChanged()));
+    disconnect(m_viewportItem, SIGNAL(contentYChanged()), this, SLOT(pageItemPositionChanged()));
 }
 
-void QtViewportInteractionEngine::flickableMovingPositionUpdate()
+void QtViewportInteractionEngine::pageItemPositionChanged()
 {
     QPointF newPosition = m_viewportItem->contentPos();
 
@@ -247,6 +253,23 @@
     m_lastScrollPosition = newPosition;
 }
 
+void QtViewportInteractionEngine::pageContentPositionRequest(const QPoint& cssPosition)
+{
+    // Ignore the request if suspended. Can only happen due to delay in event delivery.
+    if (m_suspendCount)
+        return;
+
+    qreal endItemScale = m_pageItem->contentsScale(); // Stay at same scale.
+
+    QRectF endPosRange = computePosRangeForPageItemAtScale(endItemScale);
+    QPointF endPosition = boundPosition(endPosRange.topLeft(), cssPosition * endItemScale, endPosRange.bottomRight());
+
+    QRectF endVisibleContentRect(endPosition / endItemScale, m_viewportItem->boundingRect().size() / endItemScale);
+
+    ViewportUpdateDeferrer guard(this);
+    setPageItemRectVisible(endVisibleContentRect);
+}
+
 void QtViewportInteractionEngine::scaleAnimationStateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State /*oldState*/)
 {
     switch (newState) {
@@ -263,29 +286,11 @@
     }
 }
 
-static inline QPointF boundPosition(const QPointF minPosition, const QPointF& position, const QPointF& maxPosition)
+void QtViewportInteractionEngine::scaleAnimationValueChanged(QVariant value)
 {
-    return QPointF(qBound(minPosition.x(), position.x(), maxPosition.x()),
-                   qBound(minPosition.y(), position.y(), maxPosition.y()));
+    setPageItemRectVisible(value.toRectF());
 }
 
-void QtViewportInteractionEngine::pagePositionRequest(const QPoint& pagePosition)
-{
-    // Ignore the request if suspended. Can only happen due to delay in event delivery.
-    if (m_suspendCount)
-        return;
-
-    qreal endItemScale = m_pageItem->contentsScale(); // Stay at same scale.
-
-    QRectF endPosRange = computePosRangeForItemAtScale(endItemScale);
-    QPointF endPosition = boundPosition(endPosRange.topLeft(), pagePosition * endItemScale, endPosRange.bottomRight());
-
-    QRectF endVisibleContentRect(endPosition / endItemScale, m_viewportItem->boundingRect().size() / endItemScale);
-
-    ViewportUpdateDeferrer guard(this);
-    setItemRectVisible(endVisibleContentRect);
-}
-
 void QtViewportInteractionEngine::touchBegin()
 {
     m_hadUserInteraction = true;
@@ -300,7 +305,7 @@
     m_touchUpdateDeferrer.clear();
 }
 
-QRectF QtViewportInteractionEngine::computePosRangeForItemAtScale(qreal itemScale) const
+QRectF QtViewportInteractionEngine::computePosRangeForPageItemAtScale(qreal itemScale) const
 {
     const QSizeF contentItemSize = m_pageItem->contentsSize() * itemScale;
     const QSizeF viewportItemSize = m_viewportItem->boundingRect().size();
@@ -339,13 +344,13 @@
     const QPointF viewportHotspot = QPointF(x, /* FIXME: visibleCenter */ viewportRect.center().y());
 
     QPointF endPosition = hotspot * endItemScale - viewportHotspot;
-    QRectF endPosRange = computePosRangeForItemAtScale(endItemScale);
+    QRectF endPosRange = computePosRangeForPageItemAtScale(endItemScale);
 
     endPosition = boundPosition(endPosRange.topLeft(), endPosition, endPosRange.bottomRight());
 
     QRectF endVisibleContentRect(endPosition / endItemScale, viewportRect.size() / endItemScale);
 
-    animateItemRectVisible(endVisibleContentRect);
+    animatePageItemRectVisible(endVisibleContentRect);
 }
 
 void QtViewportInteractionEngine::zoomToAreaGestureEnded(const QPointF& touchPoint, const QRectF& targetArea)
@@ -377,7 +382,7 @@
 
     QPointF endPosition = hotspot * endCSSScale - viewportHotspot;
 
-    QRectF endPosRange = computePosRangeForItemAtScale(endItemScale);
+    QRectF endPosRange = computePosRangeForPageItemAtScale(endItemScale);
     endPosition = boundPosition(endPosRange.topLeft(), endPosition, endPosRange.bottomRight());
 
     QRectF endVisibleContentRect(endPosition / endItemScale, viewportRect.size() / endItemScale);
@@ -414,7 +419,7 @@
         // Recalculate endPosition and bound it according to new scale.
         endPosition.setY(hotspot.y() * endCSSScale - viewportHotspot.y());
         endPosition.setX(lastScale.xPosition);
-        endPosRange = computePosRangeForItemAtScale(endItemScale);
+        endPosRange = computePosRangeForPageItemAtScale(endItemScale);
         endPosition = boundPosition(endPosRange.topLeft(), endPosition, endPosRange.bottomRight());
         endVisibleContentRect = QRectF(endPosition / endItemScale, viewportRect.size() / endItemScale);
         break;
@@ -429,7 +434,7 @@
         break;
     }
 
-    animateItemRectVisible(endVisibleContentRect);
+    animatePageItemRectVisible(endVisibleContentRect);
 }
 
 QRectF QtViewportInteractionEngine::nearestValidBounds() const
@@ -441,7 +446,7 @@
 
     QPointF endPosition = m_viewportItem->mapToWebContent(viewportHotspot) * endItemScale - viewportHotspot;
 
-    QRectF endPosRange = computePosRangeForItemAtScale(endItemScale);
+    QRectF endPosRange = computePosRangeForPageItemAtScale(endItemScale);
     endPosition = boundPosition(endPosRange.topLeft(), endPosition, endPosRange.bottomRight());
 
     QRectF endVisibleContentRect(endPosition / endItemScale, viewportRect.size() / endItemScale);
@@ -548,7 +553,7 @@
 
     m_viewportItem->cancelFlick();
     ViewportUpdateDeferrer guard(this);
-    setItemRectVisible(nearestValidBounds());
+    setPageItemRectVisible(nearestValidBounds());
 }
 
 void QtViewportInteractionEngine::interruptScaleAnimation()
@@ -610,7 +615,7 @@
 
     m_pinchStartScale = -1;
 
-    animateItemRectVisible(nearestValidBounds());
+    animatePageItemRectVisible(nearestValidBounds());
     m_scaleUpdateDeferrer.clear(); // Clear after starting potential animation, which takes over deferring.
 }
 
@@ -626,13 +631,13 @@
  *
  * FIXME: This is currently called twice if you concurrently change width and height.
  */
-void QtViewportInteractionEngine::itemSizeChanged()
+void QtViewportInteractionEngine::pageItemSizeChanged()
 {
     if (m_suspendCount)
         return;
 
     ViewportUpdateDeferrer guard(this);
-    setItemRectVisible(nearestValidBounds());
+    setPageItemRectVisible(nearestValidBounds());
 }
 
 void QtViewportInteractionEngine::scaleContent(const QPointF& centerInCSSCoordinates, qreal cssScale)

Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h (118918 => 118919)


--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h	2012-05-30 13:55:12 UTC (rev 118918)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h	2012-05-30 13:56:09 UTC (rev 118919)
@@ -58,14 +58,15 @@
     qreal currentCSSScale() const;
 
     void setAllowsUserScaling(bool allow) { m_allowsUserScaling = allow; }
-    void setContentToDevicePixelRatio(qreal ratio) {m_devicePixelRatio = ratio; }
+    void setDevicePixelRatio(qreal ratio) { m_devicePixelRatio = ratio; }
 
-    void setItemRectVisible(const QRectF&);
-    void animateItemRectVisible(const QRectF&);
+    void setPageItemRectVisible(const QRectF&);
+    void animatePageItemRectVisible(const QRectF&);
 
     QRectF nearestValidBounds() const;
 
-    void pagePositionRequest(const QPoint& pos);
+    void pageContentPositionRequest(const QPoint& pos);
+
     void touchBegin();
     void touchEnd();
 
@@ -73,11 +74,9 @@
     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);
-
     void panGestureCancelled();
 
     bool scaleAnimationActive() const;
@@ -98,19 +97,16 @@
 
     void informVisibleContentChange(const QPointF& trajectory = QPointF());
 
-    void visibleContentRectAndScaleChanged();
-
 private Q_SLOTS:
     // Respond to changes of content that are not driven by us, like the page resizing itself.
-    void itemSizeChanged();
+    void pageItemSizeChanged();
+    void pageItemPositionChanged();
 
-    void flickableMovingPositionUpdate();
-
     void scaleAnimationStateChanged(QAbstractAnimation::State, QAbstractAnimation::State);
-    void scaleAnimationValueChanged(QVariant value) { setItemRectVisible(value.toRectF()); }
+    void scaleAnimationValueChanged(QVariant value);
 
-    void flickableMoveStarted(); // Called when panning starts.
-    void flickableMoveEnded(); //   Called when panning (+ kinetic animation) ends.
+    void flickMoveStarted(); // Called when panning starts.
+    void flickMoveEnded(); //   Called when panning (+ kinetic animation) ends.
 
 private:
     friend class ViewportUpdateDeferrer;
@@ -127,6 +123,9 @@
     qreal innerBoundedCSSScale(qreal) const;
     qreal outerBoundedCSSScale(qreal) const;
 
+    QRectF computePosRangeForPageItemAtScale(qreal itemScale) const;
+    void scaleContent(const QPointF& centerInCSSCoordinates, qreal cssScale);
+
     bool m_allowsUserScaling;
     qreal m_minimumScale;
     qreal m_maximumScale;
@@ -134,12 +133,9 @@
 
     QSize m_layoutSize;
 
-    QRectF computePosRangeForItemAtScale(qreal itemScale) const;
-
-    void scaleContent(const QPointF& centerInCSSCoordinates, qreal cssScale);
-
     int m_suspendCount;
     bool m_hasSuspendedContent;
+
     OwnPtr<ViewportUpdateDeferrer> m_scaleUpdateDeferrer;
     OwnPtr<ViewportUpdateDeferrer> m_scrollUpdateDeferrer;
     OwnPtr<ViewportUpdateDeferrer> m_touchUpdateDeferrer;

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to