Changeset 99568 in webkit

Timestamp:

Nov 8, 2011, 7:34:07 AM (14 years ago)

Author:

kenneth@webkit.org

Message:

Clean up QtViewportInteractionEngine

Reviewed by Simon Hausmann.

• UIProcess/qt/QtViewportInteractionEngine.cpp:

(WebKit::QtViewportInteractionEngine::QtViewportInteractionEngine):
(WebKit::QtViewportInteractionEngine::setItemRectVisible):

Rename the method to make it more obvious what it does. Avoid implicit
conversion to/from QVariant.

(WebKit::QtViewportInteractionEngine::pagePositionRequest):
(WebKit::QtViewportInteractionEngine::ensureContentWithinViewportBoundary):
(WebKit::QtViewportInteractionEngine::itemSizeChanged):

Only call this method on item size changes, and not for every interaction
with the viewport item. Before this change it was even being called during
animations.

• UIProcess/qt/QtViewportInteractionEngine.h:

(WebKit::QtViewportInteractionEngine::scaleAnimationValueChanged):

Rename to make it clean that this is called from the animator.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/qt/QtViewportInteractionEngine.cpp (modified) (6 diffs)
• UIProcess/qt/QtViewportInteractionEngine.h (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-08  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Clean up QtViewportInteractionEngine
+
+        Reviewed by Simon Hausmann.
+
+        * UIProcess/qt/QtViewportInteractionEngine.cpp:
+        (WebKit::QtViewportInteractionEngine::QtViewportInteractionEngine):
+        (WebKit::QtViewportInteractionEngine::setItemRectVisible):
+
+            Rename the method to make it more obvious what it does. Avoid implicit
+            conversion to/from QVariant.
+
+        (WebKit::QtViewportInteractionEngine::pagePositionRequest):
+        (WebKit::QtViewportInteractionEngine::ensureContentWithinViewportBoundary):
+        (WebKit::QtViewportInteractionEngine::itemSizeChanged):
+
+            Only call this method on item size changes, and not for every interaction
+            with the viewport item. Before this change it was even being called during
+            animations.
+
+        * UIProcess/qt/QtViewportInteractionEngine.h:
+        (WebKit::QtViewportInteractionEngine::scaleAnimationValueChanged):
+
+            Rename to make it clean that this is called from the animator.
+
 2011-11-08  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp

@@ -101 +101 @@
 {
     reset();
-    connect(m_content, SIGNAL(xChanged()), this, SLOT(contentViewportChanged()), Qt::DirectConnection);
-    connect(m_content, SIGNAL(yChanged()), this, SLOT(contentViewportChanged()), Qt::DirectConnection);
-    connect(m_content, SIGNAL(widthChanged()), this, SLOT(contentViewportChanged()), Qt::DirectConnection);
-    connect(m_content, SIGNAL(heightChanged()), this, SLOT(contentViewportChanged()), Qt::DirectConnection);
-    connect(m_content, SIGNAL(scaleChanged()), this, SLOT(contentViewportChanged()), Qt::DirectConnection);
-    connect(m_scaleAnimation, SIGNAL(valueChanged(QVariant)), SLOT(updateVisibleRect(QVariant)), Qt::DirectConnection);
-    connect(m_scaleAnimation, SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State))
-            , SLOT(scaleAnimationStateChanged(QAbstractAnimation::State, QAbstractAnimation::State)), Qt::DirectConnection);
+
+    connect(m_content, SIGNAL(widthChanged()), this, SLOT(itemSizeChanged()), Qt::DirectConnection);
+    connect(m_content, SIGNAL(heightChanged()), this, SLOT(itemSizeChanged()), Qt::DirectConnection);
+
+    connect(m_scaleAnimation, SIGNAL(valueChanged(QVariant)),
+            SLOT(scaleAnimationValueChanged(QVariant)), Qt::DirectConnection);
+    connect(m_scaleAnimation, SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)),
+            SLOT(scaleAnimationStateChanged(QAbstractAnimation::State, QAbstractAnimation::State)), Qt::DirectConnection);
 }
 
@@ -131 +131 @@
 }
 
-void QtViewportInteractionEngine::updateVisibleRect(QVariant rect)
-{
-    ViewportUpdateGuard guard(this);
-
-    QRectF visibleRect = rect.toRectF();
-    qreal itemScale = m_viewport->width() / visibleRect.width();
+void QtViewportInteractionEngine::setItemRectVisible(const QRectF& itemRect)
+{
+    ViewportUpdateGuard guard(this);
+
+    qreal itemScale = m_viewport->width() / itemRect.width();
 
     m_content->setScale(itemScale);
@@ -142 +141 @@
     // We need to animate the content but the position represents the viewport hence we need to invert the position here.
     // To animate the position together with the scale we multiply the position with the current scale;
-    m_content->setPos(-visibleRect.topLeft() * itemScale);
+    m_content->setPos(- itemRect.topLeft() * itemScale);
 }
 
@@ -215 +214 @@
     QRectF endVisibleContentRect(endPosition / endItemScale, m_viewport->boundingRect().size() / endItemScale);
 
-    updateVisibleRect(endVisibleContentRect);
+    setItemRectVisible(endVisibleContentRect);
 }
 
@@ -263 +262 @@
         m_scaleAnimation->start();
     } else
-        updateVisibleRect(endVisibleContentRect);
+        setItemRectVisible(endVisibleContentRect);
 }
 
@@ -412 +411 @@
 }
 
-void QtViewportInteractionEngine::contentViewportChanged()
-{
+void QtViewportInteractionEngine::itemSizeChanged()
+{
+    // FIXME: This needs to be done smarter. What happens if it resizes when we were interacting?
     if (m_pendingUpdates)
         return;

trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h

@@ -27 +27 @@
 #include "qwebkitglobal.h"
 #include <QtCore/QObject>
+#include <QtCore/QRectF>
 #include <QtCore/QVariant>
 #include <QtCore/QVariantAnimation>
@@ -66 +67 @@
     void reset();
     void setConstraints(const Constraints&);
+    void setItemRectVisible(const QRectF&);
 
     void pagePositionRequest(const QPoint& pos);
@@ -92 +94 @@
 private Q_SLOTS:
     // Respond to changes of content that are not driven by us, like the page resizing itself.
-    void contentViewportChanged();
-    void updateVisibleRect(QVariant visibleRectVariant);
+    void itemSizeChanged();
+
     void scaleAnimationStateChanged(QAbstractAnimation::State, QAbstractAnimation::State);
+    void scaleAnimationValueChanged(QVariant value) { setItemRectVisible(value.toRectF()); }
 
 private: