Title: [139215] trunk/Source/WebKit2
- Revision
- 139215
- Author
- abe...@webkit.org
- Date
- 2013-01-09 11:36:21 -0800 (Wed, 09 Jan 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (139214 => 139215)
--- trunk/Source/WebKit2/ChangeLog 2013-01-09 19:36:06 UTC (rev 139214)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-09 19:36:21 UTC (rev 139215)
@@ -1,5 +1,17 @@
2013-01-09 Andras Becsi <andras.be...@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.be...@digia.com>
+
[Qt][EFL][WK2] Remove redundant device pixel ratio adjustment from PageViewportController
https://bugs.webkit.org/show_bug.cgi?id=106355
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (139214 => 139215)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2013-01-09 19:36:06 UTC (rev 139214)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2013-01-09 19:36:21 UTC (rev 139215)
@@ -228,7 +228,7 @@
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();
// We want to end up with the target area filling the whole width of the viewport (if possible),
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
