summaryrefslogtreecommitdiffstats
path: root/LayoutTests/platform
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-05-26 14:10:43 +0100
committerSteve Block <steveblock@google.com>2010-05-27 11:16:17 +0100
commitf2cb3699566c53396dabf80b6a64e7daadedddd2 (patch)
treedce8199aaa3c976cf77f3b384bbab173e747770b /LayoutTests/platform
parent2ed19bf34c42971099d247a777a38932da0278e9 (diff)
downloadexternal_webkit-f2cb3699566c53396dabf80b6a64e7daadedddd2.zip
external_webkit-f2cb3699566c53396dabf80b6a64e7daadedddd2.tar.gz
external_webkit-f2cb3699566c53396dabf80b6a64e7daadedddd2.tar.bz2
Merge WebKit at r60074: Update Android-specific expected LayoutTests results
Refactored Geolocation tests, see http://trac.webkit.org/changeset/59926 - android-v8/fast/dom/Geolocation/callback-exception-expected.txt New Geolocation test, see http://trac.webkit.org/changeset/59859 - android-v8/fast/dom/Geolocation/notimer-after-unload-expected.txt Change-Id: Ife6cd9850d0419adadf5813b17f4a2813090ff30
Diffstat (limited to 'LayoutTests/platform')
-rw-r--r--LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-exception-expected.txt2
-rw-r--r--LayoutTests/platform/android-v8/fast/dom/Geolocation/notimer-after-unload-expected.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-exception-expected.txt b/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-exception-expected.txt
index 0723716..eece14f 100644
--- a/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-exception-expected.txt
+++ b/LayoutTests/platform/android-v8/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/platform/android-v8/fast/dom/Geolocation/notimer-after-unload-expected.txt b/LayoutTests/platform/android-v8/fast/dom/Geolocation/notimer-after-unload-expected.txt
new file mode 100644
index 0000000..77f5ce9
--- /dev/null
+++ b/LayoutTests/platform/android-v8/fast/dom/Geolocation/notimer-after-unload-expected.txt
@@ -0,0 +1,2 @@
+ALERT: unload-called
+You should have seen one unload alert appear.