Title: [99197] trunk/Source/WebKit2
- Revision
- 99197
- Author
- [email protected]
- Date
- 2011-11-03 08:40:22 -0700 (Thu, 03 Nov 2011)
Log Message
[Qt] Bounce back limits are wrong in some situations
https://bugs.webkit.org/show_bug.cgi?id=71471
Reviewed by Simon Hausmann.
The valid position points were in viewport coordinates, but we were
requiring valid position points in content coordinates.
* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::QtViewportInteractionEngine::animateContentIntoBoundariesIfNeeded):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (99196 => 99197)
--- trunk/Source/WebKit2/ChangeLog 2011-11-03 15:31:38 UTC (rev 99196)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-03 15:40:22 UTC (rev 99197)
@@ -1,3 +1,16 @@
+2011-11-03 Kenneth Rohde Christiansen <[email protected]>
+
+ [Qt] Bounce back limits are wrong in some situations
+ https://bugs.webkit.org/show_bug.cgi?id=71471
+
+ Reviewed by Simon Hausmann.
+
+ The valid position points were in viewport coordinates, but we were
+ requiring valid position points in content coordinates.
+
+ * UIProcess/qt/QtViewportInteractionEngine.cpp:
+ (WebKit::QtViewportInteractionEngine::animateContentIntoBoundariesIfNeeded):
+
2011-11-03 Fady Samuel <[email protected]>
Removing line in computeViewportAttributes that enforces a minimum scale factor to never allow zooming out more than viewport
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (99196 => 99197)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2011-11-03 15:31:38 UTC (rev 99196)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2011-11-03 15:40:22 UTC (rev 99197)
@@ -225,6 +225,9 @@
QPointF endPosition = m_content->mapFromItem(m_viewport, viewportHotspot) - viewportHotspot / endItemScale;
QRectF endPosRange = computePosRangeForItemScale(endItemScale);
+ // Map from valid bounds in viewport coords to end contents coords.
+ endPosRange.setSize(endPosRange.size() / endItemScale);
+
QPointF minValue = endPosRange.topLeft();
QPointF maxValue = endPosRange.bottomRight();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
