Changeset 139215 in webkit

Timestamp:

Jan 9, 2013, 11:36:21 AM (12 years ago)

Author:

abecsi@webkit.org

Message:

[Qt][WK2] Fix a typo in in the double-tap-to-zoom logic

Rubber-stamped by Csaba Osztrogonác.

The qMin for the upper boundary of the scale was accidentally
changed to qMax in r139189, change it back to fix the Qt API tests.

• UIProcess/qt/PageViewportControllerClientQt.cpp:

(WebKit::PageViewportControllerClientQt::zoomToAreaGestureEnded):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/qt/PageViewportControllerClientQt.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-09  Andras Becsi  <andras.becsi@digia.com>
+
+        [Qt][WK2] Fix a typo in in the double-tap-to-zoom logic
+
+        Rubber-stamped by Csaba Osztrogonác.
+
+        The qMin for the upper boundary of the scale was accidentally
+        changed to qMax in r139189, change it back to fix the Qt API tests.
+
+        * UIProcess/qt/PageViewportControllerClientQt.cpp:
+        (WebKit::PageViewportControllerClientQt::zoomToAreaGestureEnded):
+
 2013-01-09  Andras Becsi  <andras.becsi@digia.com>
 

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

@@ -229 +229 @@
     const qreal minViewportScale = qreal(2.5);
     qreal targetScale = viewportRect.size().width() / endArea.size().width();
-    targetScale = m_controller->innerBoundedViewportScale(qMax(minViewportScale, targetScale));
+    targetScale = m_controller->innerBoundedViewportScale(qMin(minViewportScale, targetScale));
     qreal currentScale = m_pageItem->contentsScale();