diff options
| author | Steve Block <steveblock@google.com> | 2010-05-26 10:11:43 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-27 11:14:42 +0100 |
| commit | e78cbe89e6f337f2f1fe40315be88f742b547151 (patch) | |
| tree | d778000b84a04f24bbad50c7fa66244365e960e9 /LayoutTests/fast | |
| parent | 7b582e96e4e909ed7dba1e07153d20fbddaec3f7 (diff) | |
| download | external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.zip external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.gz external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.bz2 | |
Merge WebKit at r60074: Initial merge by git
Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
Diffstat (limited to 'LayoutTests/fast')
60 files changed, 197 insertions, 170 deletions
diff --git a/LayoutTests/fast/dom/Geolocation/argument-types.html b/LayoutTests/fast/dom/Geolocation/argument-types.html index f6b0ad4..feefcd3 100644 --- a/LayoutTests/fast/dom/Geolocation/argument-types.html +++ b/LayoutTests/fast/dom/Geolocation/argument-types.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/argument-types.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/argument-types.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/callback-exception-expected.txt b/LayoutTests/fast/dom/Geolocation/callback-exception-expected.txt index ca77390..17ab503 100644 --- a/LayoutTests/fast/dom/Geolocation/callback-exception-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/callback-exception-expected.txt @@ -4,10 +4,10 @@ Tests that when an exception is thrown in the success callback, the error callba On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS position.coords.latitude is mockLatitude PASS position.coords.longitude is mockLongitude PASS position.coords.accuracy is mockAccuracy +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/callback-exception.html b/LayoutTests/fast/dom/Geolocation/callback-exception.html index e5f9a7c..25155c9 100644 --- a/LayoutTests/fast/dom/Geolocation/callback-exception.html +++ b/LayoutTests/fast/dom/Geolocation/callback-exception.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/callback-exception.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/callback-exception.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/enabled.html b/LayoutTests/fast/dom/Geolocation/enabled.html index bd6381a..e08bcb7 100644 --- a/LayoutTests/fast/dom/Geolocation/enabled.html +++ b/LayoutTests/fast/dom/Geolocation/enabled.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/enabled.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/enabled.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/error-expected.txt b/LayoutTests/fast/dom/Geolocation/error-expected.txt index ea5d7d8..9582059 100644 --- a/LayoutTests/fast/dom/Geolocation/error-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/error-expected.txt @@ -3,13 +3,13 @@ Tests Geolocation error callback using the mock service. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS error.code is mockCode PASS error.message is mockMessage PASS error.UNKNOWN_ERROR is undefined PASS error.PERMISSION_DENIED is 1 PASS error.POSITION_UNAVAILABLE is 2 PASS error.TIMEOUT is 3 +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/error.html b/LayoutTests/fast/dom/Geolocation/error.html index 19718c7..1035d95 100644 --- a/LayoutTests/fast/dom/Geolocation/error.html +++ b/LayoutTests/fast/dom/Geolocation/error.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/error.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/error.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/maximum-age-expected.txt b/LayoutTests/fast/dom/Geolocation/maximum-age-expected.txt index 71b1980..344bd45 100644 --- a/LayoutTests/fast/dom/Geolocation/maximum-age-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/maximum-age-expected.txt @@ -3,7 +3,6 @@ Tests that the PositionOptions.maximumAge parameter is correctly applied. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS position.coords.latitude is mockLatitude PASS position.coords.longitude is mockLongitude @@ -19,6 +18,7 @@ PASS position.coords.accuracy is mockAccuracy PASS error.code is mockCode PASS error.message is mockMessage +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/maximum-age.html b/LayoutTests/fast/dom/Geolocation/maximum-age.html index 2d871e0..1640193 100644 --- a/LayoutTests/fast/dom/Geolocation/maximum-age.html +++ b/LayoutTests/fast/dom/Geolocation/maximum-age.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/maximum-age.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/maximum-age.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/notimer-after-unload-expected.txt b/LayoutTests/fast/dom/Geolocation/notimer-after-unload-expected.txt new file mode 100644 index 0000000..4dbf1b5 --- /dev/null +++ b/LayoutTests/fast/dom/Geolocation/notimer-after-unload-expected.txt @@ -0,0 +1,3 @@ +main frame - has 1 onunload handler(s) +ALERT: unload-called +You should have seen one unload alert appear. diff --git a/LayoutTests/fast/dom/Geolocation/notimer-after-unload.html b/LayoutTests/fast/dom/Geolocation/notimer-after-unload.html new file mode 100644 index 0000000..ffcee5d --- /dev/null +++ b/LayoutTests/fast/dom/Geolocation/notimer-after-unload.html @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> +<html> +<head> +<link rel="stylesheet" href="../../js/resources/js-test-style.css"> +<script src="../../js/resources/js-test-pre.js"></script> +</head> +<body> +<p id="description"></p> +<div id="console"></div> +<script src="script-tests/notimer-after-unload.js"></script> +<script src="../../js/resources/js-test-post.js"></script> +</body> +</html> diff --git a/LayoutTests/fast/dom/Geolocation/ongoing-request-leak-expected.txt b/LayoutTests/fast/dom/Geolocation/ongoing-request-leak-expected.txt new file mode 100644 index 0000000..3fb979f --- /dev/null +++ b/LayoutTests/fast/dom/Geolocation/ongoing-request-leak-expected.txt @@ -0,0 +1 @@ +Exercises a condition where the DOMWindow may leak if Geolocation requests are ongoing when the page is navigated away or closed. Complete. diff --git a/LayoutTests/fast/dom/Geolocation/ongoing-request-leak.html b/LayoutTests/fast/dom/Geolocation/ongoing-request-leak.html new file mode 100644 index 0000000..dab385e --- /dev/null +++ b/LayoutTests/fast/dom/Geolocation/ongoing-request-leak.html @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> +<html> +<head> +<link rel="stylesheet" href="../../js/resources/js-test-style.css"> +<script src="../../js/resources/js-test-pre.js"></script> +</head> +<body> +<p id="description"></p> +<div id="console"></div> +<script src="script-tests/ongoing-request-leak.js"></script> +<script src="../../js/resources/js-test-post.js"></script> +</body> +</html> diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-already-clear-watch-expected.txt b/LayoutTests/fast/dom/Geolocation/permission-denied-already-clear-watch-expected.txt index 63195b2..9ff44ac 100644 --- a/LayoutTests/fast/dom/Geolocation/permission-denied-already-clear-watch-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/permission-denied-already-clear-watch-expected.txt @@ -3,12 +3,12 @@ Tests that when Geolocation permission has been denied prior to a call to watchP On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS error.code is error.PERMISSION_DENIED PASS error.message is "User denied Geolocation" PASS error.code is error.PERMISSION_DENIED PASS error.message is "User denied Geolocation" +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-already-clear-watch.html b/LayoutTests/fast/dom/Geolocation/permission-denied-already-clear-watch.html index 2db2637..4800a62 100644 --- a/LayoutTests/fast/dom/Geolocation/permission-denied-already-clear-watch.html +++ b/LayoutTests/fast/dom/Geolocation/permission-denied-already-clear-watch.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/permission-denied-already-clear-watch.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/permission-denied-already-clear-watch.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-already-error-expected.txt b/LayoutTests/fast/dom/Geolocation/permission-denied-already-error-expected.txt index e013242..531e6d8 100644 --- a/LayoutTests/fast/dom/Geolocation/permission-denied-already-error-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/permission-denied-already-error-expected.txt @@ -3,12 +3,12 @@ Tests that when Geolocation permission has been denied prior to a call to a Geol On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS error.code is error.PERMISSION_DENIED PASS error.message is "User denied Geolocation" PASS error.code is error.PERMISSION_DENIED PASS error.message is "User denied Geolocation" +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-already-error.html b/LayoutTests/fast/dom/Geolocation/permission-denied-already-error.html index dc166c9..d6df9b5 100644 --- a/LayoutTests/fast/dom/Geolocation/permission-denied-already-error.html +++ b/LayoutTests/fast/dom/Geolocation/permission-denied-already-error.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/permission-denied-already-error.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/permission-denied-already-error.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-already-success-expected.txt b/LayoutTests/fast/dom/Geolocation/permission-denied-already-success-expected.txt index f617a5f..55e95c5 100644 --- a/LayoutTests/fast/dom/Geolocation/permission-denied-already-success-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/permission-denied-already-success-expected.txt @@ -3,12 +3,12 @@ Tests that when Geolocation permission has been denied prior to a call to a Geol On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS error.code is error.PERMISSION_DENIED PASS error.message is "User denied Geolocation" PASS error.code is error.PERMISSION_DENIED PASS error.message is "User denied Geolocation" +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-already-success.html b/LayoutTests/fast/dom/Geolocation/permission-denied-already-success.html index 4b086a7..0db36ec 100644 --- a/LayoutTests/fast/dom/Geolocation/permission-denied-already-success.html +++ b/LayoutTests/fast/dom/Geolocation/permission-denied-already-success.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/permission-denied-already-success.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/permission-denied-already-success.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-expected.txt b/LayoutTests/fast/dom/Geolocation/permission-denied-expected.txt index 680aa63..65496b7 100644 --- a/LayoutTests/fast/dom/Geolocation/permission-denied-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/permission-denied-expected.txt @@ -3,9 +3,9 @@ Tests Geolocation when permission is denied, using the mock service. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS error.code is error.PERMISSION_DENIED PASS error.message is "User denied Geolocation" +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-stops-watches-expected.txt b/LayoutTests/fast/dom/Geolocation/permission-denied-stops-watches-expected.txt index d8f50ca..ef4c687 100644 --- a/LayoutTests/fast/dom/Geolocation/permission-denied-stops-watches-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/permission-denied-stops-watches-expected.txt @@ -3,9 +3,9 @@ Tests that when Geolocation permission is denied, watches are stopped, as well a On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS error.code is error.PERMISSION_DENIED PASS error.message is "User denied Geolocation" +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-stops-watches.html b/LayoutTests/fast/dom/Geolocation/permission-denied-stops-watches.html index 92f3a48..4f0f785 100644 --- a/LayoutTests/fast/dom/Geolocation/permission-denied-stops-watches.html +++ b/LayoutTests/fast/dom/Geolocation/permission-denied-stops-watches.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/permission-denied-stops-watches.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/permission-denied-stops-watches.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied.html b/LayoutTests/fast/dom/Geolocation/permission-denied.html index 6012079..bd38d20 100644 --- a/LayoutTests/fast/dom/Geolocation/permission-denied.html +++ b/LayoutTests/fast/dom/Geolocation/permission-denied.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/permission-denied.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/permission-denied.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/position-string-expected.txt b/LayoutTests/fast/dom/Geolocation/position-string-expected.txt index b042998..045f496 100644 --- a/LayoutTests/fast/dom/Geolocation/position-string-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/position-string-expected.txt @@ -3,12 +3,12 @@ Tests formatting of position.toString(). On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS position.coords.latitude is mockLatitude PASS position.coords.longitude is mockLongitude PASS position.coords.accuracy is mockAccuracy PASS position.toString() is "[object Geoposition]" PASS position.coords.toString() is "[object Coordinates]" +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/position-string.html b/LayoutTests/fast/dom/Geolocation/position-string.html index e75a4f5..b15cb38 100644 --- a/LayoutTests/fast/dom/Geolocation/position-string.html +++ b/LayoutTests/fast/dom/Geolocation/position-string.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/position-string.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/position-string.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/reentrant-error-expected.txt b/LayoutTests/fast/dom/Geolocation/reentrant-error-expected.txt index 7420919..993beac 100644 --- a/LayoutTests/fast/dom/Geolocation/reentrant-error-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/reentrant-error-expected.txt @@ -3,12 +3,12 @@ Tests that reentrant calls to Geolocation methods from the error callback are OK On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS error.code is mockCode PASS error.message is mockMessage PASS error.code is mockCode PASS error.message is mockMessage +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/reentrant-error.html b/LayoutTests/fast/dom/Geolocation/reentrant-error.html index f3300af..ea00371 100644 --- a/LayoutTests/fast/dom/Geolocation/reentrant-error.html +++ b/LayoutTests/fast/dom/Geolocation/reentrant-error.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/reentrant-error.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/reentrant-error.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/reentrant-success-expected.txt b/LayoutTests/fast/dom/Geolocation/reentrant-success-expected.txt index ad63fa3..d85f161 100644 --- a/LayoutTests/fast/dom/Geolocation/reentrant-success-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/reentrant-success-expected.txt @@ -3,7 +3,6 @@ Tests that reentrant calls to Geolocation methods from the success callback are On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS position.coords.latitude is mockLatitude PASS position.coords.longitude is mockLongitude PASS position.coords.accuracy is mockAccuracy @@ -11,6 +10,7 @@ PASS position.coords.accuracy is mockAccuracy PASS position.coords.latitude is mockLatitude PASS position.coords.longitude is mockLongitude PASS position.coords.accuracy is mockAccuracy +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/reentrant-success.html b/LayoutTests/fast/dom/Geolocation/reentrant-success.html index f09cf28..d69cf85 100644 --- a/LayoutTests/fast/dom/Geolocation/reentrant-success.html +++ b/LayoutTests/fast/dom/Geolocation/reentrant-success.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/reentrant-success.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/reentrant-success.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/resources/js-test-post.js b/LayoutTests/fast/dom/Geolocation/resources/js-test-post.js deleted file mode 100644 index 558f149..0000000 --- a/LayoutTests/fast/dom/Geolocation/resources/js-test-post.js +++ /dev/null @@ -1,4 +0,0 @@ -shouldBeTrue("successfullyParsed"); -if (!isAsynchronous) { - debug('<br /><span class="pass">TEST COMPLETE</span>'); -} diff --git a/LayoutTests/fast/dom/Geolocation/resources/TEMPLATE.html b/LayoutTests/fast/dom/Geolocation/script-tests/TEMPLATE.html index fcb8be1..1951c43 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/TEMPLATE.html +++ b/LayoutTests/fast/dom/Geolocation/script-tests/TEMPLATE.html @@ -8,6 +8,6 @@ <p id="description"></p> <div id="console"></div> <script src="YOUR_JS_FILE_HERE"></script> -<script src="resources/js-test-post.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/resources/argument-types.js b/LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js index 956e3d6..2b559d8 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/argument-types.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js @@ -114,6 +114,6 @@ test('navigator.geolocation.getCurrentPosition(emptyFunction, undefined, {timeou test('navigator.geolocation.getCurrentPosition(emptyFunction, undefined, {timeout:-Infinity})', false); test('navigator.geolocation.getCurrentPosition(emptyFunction, undefined, {timeout:"string"})', false); -var isAsynchronous = false; -var successfullyParsed = true; +window.jsTestIsAsync = false; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/callback-exception.js b/LayoutTests/fast/dom/Geolocation/script-tests/callback-exception.js index d5cd682..7a86648 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/callback-exception.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/callback-exception.js @@ -18,19 +18,14 @@ navigator.geolocation.getCurrentPosition(function(p) { // Yield to allow for the error callback to be invoked. The timer // must be started before the exception is thrown. - window.setTimeout(completeTest, 0); + window.setTimeout(finishJSTest, 0); throw new Error('Exception in success callback'); }, function(e) { testFailed('Error callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); -function completeTest() -{ - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); -} window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/enabled.js b/LayoutTests/fast/dom/Geolocation/script-tests/enabled.js index 4e99984..6cb7bad 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/enabled.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/enabled.js @@ -14,5 +14,5 @@ shouldBeTrue("hasGeolocationProperty()"); shouldBeTrue("'geolocation' in navigator"); shouldBeTrue("navigator.hasOwnProperty('geolocation')"); -var isAsynchronous = false; -var successfullyParsed = true; +window.jsTestIsAsync = false; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/error.js b/LayoutTests/fast/dom/Geolocation/script-tests/error.js index c76570b..4c818ca 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/error.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/error.js @@ -8,8 +8,7 @@ window.layoutTestController.setMockGeolocationError(mockCode, mockMessage); var error; navigator.geolocation.getCurrentPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { error = e shouldBe('error.code', 'mockCode'); @@ -18,10 +17,9 @@ navigator.geolocation.getCurrentPosition(function(p) { shouldBe('error.PERMISSION_DENIED', '1'); shouldBe('error.POSITION_UNAVAILABLE', '2'); shouldBe('error.TIMEOUT', '3'); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/maximum-age.js b/LayoutTests/fast/dom/Geolocation/script-tests/maximum-age.js index f48aa0d..207fb64 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/maximum-age.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/maximum-age.js @@ -34,7 +34,7 @@ navigator.geolocation.getCurrentPosition(function(p) { testZeroMaximumAge(); }, function(e) { testFailed('Error callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); function testZeroMaximumAge() { @@ -46,7 +46,7 @@ function testZeroMaximumAge() { testNonZeroMaximumAge(); }, function(e) { testFailed('Error callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); } @@ -59,7 +59,7 @@ function testNonZeroMaximumAge() { testZeroMaximumAgeError(); }, function(e) { testFailed('Error callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, {maximumAge: 1000}); } @@ -67,15 +67,14 @@ function testZeroMaximumAgeError() { // The default maximumAge is zero, so we expect the error from the service. navigator.geolocation.getCurrentPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { checkError(e); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); } window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/script-tests/notimer-after-unload.js b/LayoutTests/fast/dom/Geolocation/script-tests/notimer-after-unload.js new file mode 100644 index 0000000..278e027 --- /dev/null +++ b/LayoutTests/fast/dom/Geolocation/script-tests/notimer-after-unload.js @@ -0,0 +1,21 @@ +description("Tests that no timers will trigger for navigator.geolocation object after onunload."); + +if (window.layoutTestController) layoutTestController.setGeolocationPermission(true); + +document.body.onload = function() { + location = "data:text/html,You should have seen one unload alert appear.<script>window.setTimeout('if (window.layoutTestController) layoutTestController.notifyDone();', 100);</" + "script>"; +} + +document.body.onunload = function() { + navigator.geolocation.getCurrentPosition( + function(p) {alert('FAIL: Unexpected Geolocation success callback.');}, + function(e) {alert('FAIL: Unexpected Geolocation error callback.' + e.code + e.message);}, + {timeout: 0, maximumAge:0} + ); + alert("unload-called"); +} + +window.jsTestIsAsync = true; +window.successfullyParsed = true; + +if (window.layoutTestController) layoutTestController.waitUntilDone(); diff --git a/LayoutTests/fast/dom/Geolocation/script-tests/ongoing-request-leak.js b/LayoutTests/fast/dom/Geolocation/script-tests/ongoing-request-leak.js new file mode 100644 index 0000000..08e6b21 --- /dev/null +++ b/LayoutTests/fast/dom/Geolocation/script-tests/ongoing-request-leak.js @@ -0,0 +1,13 @@ +description("Exercises a condition where the DOMWindow may leak if Geolocation requests are ongoing when the page is navigated away or closed. The page should reoload."); + +if (window.layoutTestController) layoutTestController.setGeolocationPermission(true); +if (window.layoutTestController) layoutTestController.setMockGeolocationPosition(51.478, -0.166, 100.0); + +navigator.geolocation.watchPosition(function() {}, null); + +document.body.onload = function() { + location = "data:text/html,Exercises a condition where the DOMWindow may leak if Geolocation requests are ongoing when the page is navigated away or closed. Complete.<script>if (window.layoutTestController) layoutTestController.notifyDone();</" + "script>"; +} + +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-clear-watch.js b/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-clear-watch.js index 1e980a5..410f042 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-clear-watch.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-clear-watch.js @@ -7,7 +7,7 @@ window.layoutTestController.setMockGeolocationPosition(51.478, -0.166, 100); var error; navigator.geolocation.getCurrentPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { error = e shouldBe('error.code', 'error.PERMISSION_DENIED'); @@ -21,22 +21,17 @@ function continueTest() // Make another request, with permission already denied. var watchId = navigator.geolocation.watchPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { error = e shouldBe('error.code', 'error.PERMISSION_DENIED'); shouldBe('error.message', '"User denied Geolocation"'); navigator.geolocation.clearWatch(watchId); - window.setTimeout(completeTest, 0); + window.setTimeout(finishJSTest, 0); }); } -function completeTest() -{ - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); -} window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-error.js b/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-error.js index 77c8259..9cea5ba 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-error.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-error.js @@ -7,7 +7,7 @@ window.layoutTestController.setMockGeolocationPosition(51.478, -0.166, 100); var error; navigator.geolocation.getCurrentPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { error = e shouldBe('error.code', 'error.PERMISSION_DENIED'); @@ -23,16 +23,15 @@ function continueTest() navigator.geolocation.getCurrentPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { error = e shouldBe('error.code', 'error.PERMISSION_DENIED'); shouldBe('error.message', '"User denied Geolocation"'); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); } window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-success.js b/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-success.js index 966c64d..fdc74e6 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-success.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-success.js @@ -7,7 +7,7 @@ window.layoutTestController.setMockGeolocationPosition(51.478, -0.166, 100); var error; navigator.geolocation.getCurrentPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { error = e shouldBe('error.code', 'error.PERMISSION_DENIED'); @@ -21,16 +21,15 @@ function continueTest() // Make another request, with permission already denied. navigator.geolocation.getCurrentPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { error = e shouldBe('error.code', 'error.PERMISSION_DENIED'); shouldBe('error.message', '"User denied Geolocation"'); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); } window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-stops-watches.js b/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-stops-watches.js index 89e5004..244deda 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-stops-watches.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-stops-watches.js @@ -9,11 +9,11 @@ var error; var errorCallbackInvoked = false; navigator.geolocation.watchPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { if (errorCallbackInvoked) { testFailed('Error callback invoked unexpectedly : ' + error.message); - window.layoutTestController.notifyDone(); + finishJSTest(); } errorCallbackInvoked = true; @@ -24,15 +24,10 @@ navigator.geolocation.watchPosition(function(p) { // Update the mock Geolocation service to report a new position, then // yield to allow a chance for the success callback to be invoked. window.layoutTestController.setMockGeolocationPosition(55.478, -0.166, 100); - window.setTimeout(completeTest, 0); + window.setTimeout(finishJSTest, 0); }); -function completeTest() -{ - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); -} window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/permission-denied.js b/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied.js index 1915469..aafcaf1 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/permission-denied.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied.js @@ -6,15 +6,14 @@ window.layoutTestController.setMockGeolocationPosition(51.478, -0.166, 100); var error; navigator.geolocation.getCurrentPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { error = e shouldBe('error.code', 'error.PERMISSION_DENIED'); shouldBe('error.message', '"User denied Geolocation"'); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/position-string.js b/LayoutTests/fast/dom/Geolocation/script-tests/position-string.js index 6365fca..d4931ee 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/position-string.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/position-string.js @@ -18,13 +18,12 @@ navigator.geolocation.getCurrentPosition(function(p) { shouldBe('position.coords.accuracy', 'mockAccuracy'); shouldBe('position.toString()', '"[object Geoposition]"'); shouldBe('position.coords.toString()', '"[object Coordinates]"'); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { testFailed('Error callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/reentrant-error.js b/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-error.js index 32858bf..e3361de 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/reentrant-error.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-error.js @@ -9,11 +9,11 @@ var error; var errorCallbackInvoked = false; navigator.geolocation.getCurrentPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { if (errorCallbackInvoked) { testFailed('Error callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); } errorCallbackInvoked = true; @@ -32,16 +32,15 @@ function continueTest() { navigator.geolocation.getCurrentPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { error = e; shouldBe('error.code', 'mockCode'); shouldBe('error.message', 'mockMessage'); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); } window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/reentrant-success.js b/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-success.js index 12dfe39..4b83ea7 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/reentrant-success.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-success.js @@ -14,7 +14,7 @@ var successCallbackInvoked = false; navigator.geolocation.getCurrentPosition(function(p) { if (successCallbackInvoked) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); } successCallbackInvoked = true; @@ -26,7 +26,7 @@ navigator.geolocation.getCurrentPosition(function(p) { continueTest(); }, function(e) { testFailed('Error callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); function continueTest() { @@ -39,14 +39,13 @@ function continueTest() { shouldBe('position.coords.latitude', 'mockLatitude'); shouldBe('position.coords.longitude', 'mockLongitude'); shouldBe('position.coords.accuracy', 'mockAccuracy'); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { testFailed('Error callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); } window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/success.js b/LayoutTests/fast/dom/Geolocation/script-tests/success.js index c5f566f..acb6b8d 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/success.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/success.js @@ -15,13 +15,12 @@ navigator.geolocation.getCurrentPosition(function(p) { shouldBe('position.coords.latitude', 'mockLatitude'); shouldBe('position.coords.longitude', 'mockLongitude'); shouldBe('position.coords.accuracy', 'mockAccuracy'); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { testFailed('Error callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }); window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/timeout-clear-watch.js b/LayoutTests/fast/dom/Geolocation/script-tests/timeout-clear-watch.js index e9d247a..63e0569 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/timeout-clear-watch.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/timeout-clear-watch.js @@ -5,23 +5,18 @@ window.layoutTestController.setMockGeolocationPosition(51.478, -0.166, 100.0); var error; var watchId = navigator.geolocation.watchPosition(function() { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { error = e shouldBe('error.code', 'error.TIMEOUT'); shouldBe('error.message', '"Timeout expired"'); navigator.geolocation.clearWatch(watchId); - window.setTimeout(completeTest, 0); + window.setTimeout(finishJSTest, 0); }, { timeout: 0 }); -function completeTest() -{ - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); -} window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/timeout-zero.js b/LayoutTests/fast/dom/Geolocation/script-tests/timeout-zero.js index 8a930d9..9867084 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/timeout-zero.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/timeout-zero.js @@ -5,17 +5,16 @@ layoutTestController.setMockGeolocationPosition(51.478, -0.166, 100.0); var error; navigator.geolocation.getCurrentPosition(function(p) { testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { error = e shouldBe('error.code', 'error.TIMEOUT'); shouldBe('error.message', '"Timeout expired"'); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, { timeout: 0 }); window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/timeout.js b/LayoutTests/fast/dom/Geolocation/script-tests/timeout.js index d4fa1a7..49cab29 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/timeout.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/timeout.js @@ -15,15 +15,14 @@ navigator.geolocation.getCurrentPosition(function(p) { shouldBe('position.coords.latitude', 'mockLatitude'); shouldBe('position.coords.longitude', 'mockLongitude'); shouldBe('position.coords.accuracy', 'mockAccuracy'); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, function(e) { testFailed('Error callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); }, { timeout: 1000 }); window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/resources/watch.js b/LayoutTests/fast/dom/Geolocation/script-tests/watch.js index dbf4272..8249f2e 100644 --- a/LayoutTests/fast/dom/Geolocation/resources/watch.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/watch.js @@ -41,12 +41,11 @@ navigator.geolocation.watchPosition(function(p) { break; case 3: checkPosition(p); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - window.layoutTestController.notifyDone(); + finishJSTest(); break; default: testFailed('Success callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); } }, function(e) { switch (state++) { @@ -56,10 +55,10 @@ navigator.geolocation.watchPosition(function(p) { break; default: testFailed('Error callback invoked unexpectedly'); - window.layoutTestController.notifyDone(); + finishJSTest(); } }); window.layoutTestController.waitUntilDone(); -var isAsynchronous = true; -var successfullyParsed = true; +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Geolocation/success-expected.txt b/LayoutTests/fast/dom/Geolocation/success-expected.txt index a063801..7511597 100644 --- a/LayoutTests/fast/dom/Geolocation/success-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/success-expected.txt @@ -3,10 +3,10 @@ Tests Geolocation success callback using the mock service. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS position.coords.latitude is mockLatitude PASS position.coords.longitude is mockLongitude PASS position.coords.accuracy is mockAccuracy +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/success.html b/LayoutTests/fast/dom/Geolocation/success.html index ecd7a25..563f009 100644 --- a/LayoutTests/fast/dom/Geolocation/success.html +++ b/LayoutTests/fast/dom/Geolocation/success.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/success.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/success.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/timeout-clear-watch-expected.txt b/LayoutTests/fast/dom/Geolocation/timeout-clear-watch-expected.txt index e97fccd..5005b39 100644 --- a/LayoutTests/fast/dom/Geolocation/timeout-clear-watch-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/timeout-clear-watch-expected.txt @@ -3,9 +3,9 @@ Tests that when a watch times out and is cleared from the error callback, there On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS error.code is error.TIMEOUT PASS error.message is "Timeout expired" +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/timeout-clear-watch.html b/LayoutTests/fast/dom/Geolocation/timeout-clear-watch.html index 45c7735..b5508a0 100644 --- a/LayoutTests/fast/dom/Geolocation/timeout-clear-watch.html +++ b/LayoutTests/fast/dom/Geolocation/timeout-clear-watch.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/timeout-clear-watch.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/timeout-clear-watch.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/timeout-expected.txt b/LayoutTests/fast/dom/Geolocation/timeout-expected.txt index c673cd2..cd55796 100644 --- a/LayoutTests/fast/dom/Geolocation/timeout-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/timeout-expected.txt @@ -3,10 +3,10 @@ Tests that when timeout is non-zero, the success callback is called as expected. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS position.coords.latitude is mockLatitude PASS position.coords.longitude is mockLongitude PASS position.coords.accuracy is mockAccuracy +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/timeout-zero-expected.txt b/LayoutTests/fast/dom/Geolocation/timeout-zero-expected.txt index f083301..526f274 100644 --- a/LayoutTests/fast/dom/Geolocation/timeout-zero-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/timeout-zero-expected.txt @@ -3,9 +3,9 @@ Tests that when timeout is zero (and maximumAge is too), the error callback is c On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS error.code is error.TIMEOUT PASS error.message is "Timeout expired" +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/timeout-zero.html b/LayoutTests/fast/dom/Geolocation/timeout-zero.html index 955398e..c0a2c5b 100644 --- a/LayoutTests/fast/dom/Geolocation/timeout-zero.html +++ b/LayoutTests/fast/dom/Geolocation/timeout-zero.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/timeout-zero.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/timeout-zero.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/timeout.html b/LayoutTests/fast/dom/Geolocation/timeout.html index f8eaafe..601b299 100644 --- a/LayoutTests/fast/dom/Geolocation/timeout.html +++ b/LayoutTests/fast/dom/Geolocation/timeout.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/timeout.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/timeout.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/dom/Geolocation/watch-expected.txt b/LayoutTests/fast/dom/Geolocation/watch-expected.txt index 0f923dc..a043455 100644 --- a/LayoutTests/fast/dom/Geolocation/watch-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/watch-expected.txt @@ -3,7 +3,6 @@ Tests that watchPosition correctly reports position updates and errors from the On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS successfullyParsed is true PASS position.coords.latitude is mockLatitude PASS position.coords.longitude is mockLongitude PASS position.coords.accuracy is mockAccuracy @@ -19,6 +18,7 @@ PASS position.coords.latitude is mockLatitude PASS position.coords.longitude is mockLongitude PASS position.coords.accuracy is mockAccuracy +PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/dom/Geolocation/watch.html b/LayoutTests/fast/dom/Geolocation/watch.html index 6568883..bf0b120 100644 --- a/LayoutTests/fast/dom/Geolocation/watch.html +++ b/LayoutTests/fast/dom/Geolocation/watch.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="resources/watch.js"></script> -<script src="resources/js-test-post.js"></script> +<script src="script-tests/watch.js"></script> +<script src="../../js/resources/js-test-post.js"></script> </body> </html> |