| Index: LayoutTests/fast/scroll-behavior/subframe-scrollTo.html
|
| diff --git a/LayoutTests/fast/scroll-behavior/subframe-scrollTo.html b/LayoutTests/fast/scroll-behavior/subframe-scrollTo.html
|
| index b9f3827236ae51c0b8aaea3b2cd5c22c0201472e..cdc3875631ec3d28d4be9baccca7d591af2ff29f 100644
|
| --- a/LayoutTests/fast/scroll-behavior/subframe-scrollTo.html
|
| +++ b/LayoutTests/fast/scroll-behavior/subframe-scrollTo.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")
|
| + var subframe = document.getElementById("subframe");
|
| if (testCase.js) {
|
| - subframe.contentWindow.scrollTo(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.scrollTo(scrollToOptions);
|
| } else {
|
| subframe.contentWindow.scrollTo(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},
|
|
|