Index: third_party/WebKit/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-past-extent-diagonally.html |
diff --git a/third_party/WebKit/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-propagated-diagonally.html b/third_party/WebKit/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-past-extent-diagonally.html |
similarity index 62% |
rename from third_party/WebKit/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-propagated-diagonally.html |
rename to third_party/WebKit/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-past-extent-diagonally.html |
index ce8b3fd678d420a90d6c6c883aa15e99353c5be7..bfb488365be24aca65627a252c392cfa7fab80d4 100644 |
--- a/third_party/WebKit/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-propagated-diagonally.html |
+++ b/third_party/WebKit/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-past-extent-diagonally.html |
@@ -49,15 +49,30 @@ if (window.testRunner) |
function runTest() |
{ |
if (window.eventSender) { |
- description('This tests that a gesture scroll is propagated from an ' + |
- 'inner div to an outer div when the inner div has ' + |
- 'remaining scroll offset on one axis, but not on the other.'); |
+ description('This tests that a gesture scroll isn\'t propagated from an ' + |
+ 'inner div to an outer div when the inner div has ' + |
+ 'remaining scroll offset on one axis but not on the other, unless ' + |
+ 'the outer div starts at its scroll extent'); |
if (checkTestDependencies()) { |
eventSender.gestureScrollBegin(10, 10); |
eventSender.gestureScrollUpdate(-15, -20); |
eventSender.gestureScrollEnd(0, 0); |
shouldBe("horizontal.scrollLeft", "15"); |
+ shouldBe("vertical.scrollTop", "0"); |
+ |
+ // Scroll to extents. |
+ eventSender.gestureScrollBegin(10, 10); |
+ eventSender.gestureScrollUpdate(-1000, -1000); |
+ eventSender.gestureScrollEnd(0, 0); |
+ shouldBe("horizontal.scrollLeft", "600"); |
+ shouldBe("vertical.scrollTop", "0"); |
+ |
+ eventSender.gestureScrollBegin(10, 10); |
+ eventSender.gestureScrollUpdate(-15, -20); |
+ eventSender.gestureScrollEnd(0, 0); |
+ shouldBe("horizontal.scrollLeft", "600"); |
shouldBe("vertical.scrollTop", "20"); |
+ |
if (window.testRunner) |
testRunner.notifyDone(); |
} else { |