Index: LayoutTests/fast/scroll-behavior/subframe-scroll.html |
diff --git a/LayoutTests/fast/scroll-behavior/subframe-scroll.html b/LayoutTests/fast/scroll-behavior/subframe-scroll.html |
index b66fcb2b459b9b6d455d2bdef745a4b9b3410cd5..c7d6997db292d6926c2e62ca74f5a9581c7c27cf 100644 |
--- a/LayoutTests/fast/scroll-behavior/subframe-scroll.html |
+++ b/LayoutTests/fast/scroll-behavior/subframe-scroll.html |
@@ -13,15 +13,28 @@ |
<script type="text/javascript"> |
function getEndPosition(testCase, startPosition) { |
var endPosition = {}; |
- endPosition.x = testCase.x; |
- endPosition.y = testCase.y; |
+ if (testCase.x) |
+ endPosition.x = testCase.x; |
+ else |
+ endPosition.x = startPosition.x; |
+ |
+ if (testCase.y) |
+ endPosition.y = testCase.y; |
+ else |
+ endPosition.y = startPosition.y; |
+ |
return endPosition; |
} |
function jsScroll(testCase) { |
var subframe = document.getElementById("subframe"); |
if (testCase.js) { |
- subframe.contentWindow.scroll(testCase.x, testCase.y, {behavior: testCase.js}); |
+ var scrollToOptions = {behavior: testCase.js}; |
+ if (testCase.x) |
+ scrollToOptions.left = testCase.x; |
+ if (testCase.y) |
+ scrollToOptions.top = testCase.y; |
+ subframe.contentWindow.scroll(scrollToOptions); |
} else { |
subframe.contentWindow.scroll(testCase.x, testCase.y); |
} |
@@ -32,10 +45,15 @@ |
{js: "instant", css: "smooth", x: 2, y: 3}, |
{js: "auto", css: "auto", x: 3, y: 4}, |
{js: "", css: "auto", x: 4, y: 5}, |
+ {js: "auto", css: "auto", x: 3}, |
+ {js: "auto", css: "auto", y: 4}, |
+ {js: "auto", css: "auto"}, |
{js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 15}, |
{js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 25}, |
{js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 35}, |
{js: "", css: "smooth", waitForEnd: true, x: 40, y: 45}, |
+ {js: "auto", css: "smooth", waitForEnd: true, x: 45}, |
+ {js: "auto", css: "smooth", waitForEnd: true, y: 40}, |
{js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 4100}, |
{js: "smooth", css: "smooth", waitForEnd: false, x: 15, y: 20}, |
{js: "auto", css: "smooth", waitForEnd: false, x: 4100, y: 4000}, |