Title: [115193] trunk
- Revision
- 115193
- Author
- [email protected]
- Date
- 2012-04-25 06:32:19 -0700 (Wed, 25 Apr 2012)
Log Message
[Qt] Zoom back can overscroll document edges.
https://bugs.webkit.org/show_bug.cgi?id=84851
Patch by Allan Sandfeld Jensen <[email protected]> on 2012-04-25
Reviewed by Kenneth Rohde Christiansen.
.:
Manual test for overscroll on zoom-back. Needs to be manual since we do not yet
have automatic testing for this type of UI-side behaviour.
* ManualTests/qt/double-tap-overscroll.html: Added.
Source/WebKit2:
* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::QtViewportInteractionEngine::zoomToAreaGestureEnded):
Modified Paths
Added Paths
Diff
Modified: trunk/ChangeLog (115192 => 115193)
--- trunk/ChangeLog 2012-04-25 13:31:15 UTC (rev 115192)
+++ trunk/ChangeLog 2012-04-25 13:32:19 UTC (rev 115193)
@@ -1,3 +1,15 @@
+2012-04-25 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] Zoom back can overscroll document edges.
+ https://bugs.webkit.org/show_bug.cgi?id=84851
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Manual test for overscroll on zoom-back. Needs to be manual since we do not yet
+ have automatic testing for this type of UI-side behaviour.
+
+ * ManualTests/qt/double-tap-overscroll.html: Added.
+
2012-04-24 Yael Aharon <[email protected]>
Fixed background is scrolling in http://www.nieuwecode.nl/ in Qt webkit2
Added: trunk/ManualTests/qt/double-tap-overscroll.html (0 => 115193)
--- trunk/ManualTests/qt/double-tap-overscroll.html (rev 0)
+++ trunk/ManualTests/qt/double-tap-overscroll.html 2012-04-25 13:32:19 UTC (rev 115193)
@@ -0,0 +1,4 @@
+<html>
+ <div style='width:200; height:200; background-color:red;'></div>
+ <p>Double tap the red box twice. The test passes if the viewport remains within document borders.
+</html>
\ No newline at end of file
Modified: trunk/Source/WebKit2/ChangeLog (115192 => 115193)
--- trunk/Source/WebKit2/ChangeLog 2012-04-25 13:31:15 UTC (rev 115192)
+++ trunk/Source/WebKit2/ChangeLog 2012-04-25 13:32:19 UTC (rev 115193)
@@ -1,3 +1,13 @@
+2012-04-25 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] Zoom back can overscroll document edges.
+ https://bugs.webkit.org/show_bug.cgi?id=84851
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * UIProcess/qt/QtViewportInteractionEngine.cpp:
+ (WebKit::QtViewportInteractionEngine::zoomToAreaGestureEnded):
+
2012-04-18 Tor Arne Vestbø <[email protected]>
[Qt] Make the web view's url property follow the active url
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (115192 => 115193)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2012-04-25 13:31:15 UTC (rev 115192)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2012-04-25 13:32:19 UTC (rev 115193)
@@ -415,8 +415,11 @@
case ZoomBack: {
ScaleStackItem lastScale = m_scaleStack.takeLast();
endItemScale = lastScale.scale;
+ // Recalculate endPosition and bound it according to new scale.
endPosition.setY(hotspot.y() * endItemScale - viewportHotspot.y());
endPosition.setX(lastScale.xPosition);
+ endPosRange = computePosRangeForItemAtScale(endItemScale);
+ endPosition = boundPosition(endPosRange.topLeft(), endPosition, endPosRange.bottomRight());
endVisibleContentRect = QRectF(endPosition / endItemScale, viewportRect.size() / endItemScale);
break;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
