diff options
| author | Steve Block <steveblock@google.com> | 2010-08-24 07:50:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-24 07:50:47 -0700 |
| commit | c570a147a94b126d4172c30914f53dea17b4c8f5 (patch) | |
| tree | 99c11741887d21f65d67c5bbdab58b7ba2a5d4d5 /LayoutTests/platform | |
| parent | c952714bc6809a5ad081baaf9fcc04107b92ea3f (diff) | |
| parent | 6c65f16005b91786c2b7c0791b9ea1dd684d57f4 (diff) | |
| download | external_webkit-c570a147a94b126d4172c30914f53dea17b4c8f5.zip external_webkit-c570a147a94b126d4172c30914f53dea17b4c8f5.tar.gz external_webkit-c570a147a94b126d4172c30914f53dea17b4c8f5.tar.bz2 | |
Merge changes I2e7e2317,Ie6ccde3a,I3e89f231,Id06ff339,I268dfe7d,Icaf70d9f,Ie234f1a0,Iff5c7aaa,I69b75bf0,Ifbf384f4
* changes:
Merge WebKit at r65615 : Update WebKit revision number
Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html
Merge WebKit at r65615 : Android-specific results for Geolocation tests.
Merge WebKit at r65615 : Fix GraphicsContext and ImageBuffer.
Merge WebKit at r65615 : processingUserGesture() is now static.
Merge WebKit at r65615 : UTF8String() becomes utf8().
Merge WebKit at r65615 : Fix include paths for string headers.
Merge WebKit at r65615 : Fix Makefiles.
Merge WebKit at r65615 : Fix conflicts.
Merge WebKit at r65615 : Initial merge by git.
Diffstat (limited to 'LayoutTests/platform')
3 files changed, 27 insertions, 0 deletions
diff --git a/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-expected.txt b/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-expected.txt new file mode 100644 index 0000000..ae10f02 --- /dev/null +++ b/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-expected.txt @@ -0,0 +1,11 @@ +Tests that when a request is made on a Geolocation object and its Frame is disconnected before a callback is made, the error callback is invoked with the correct error message.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS error.code is 2
+PASS error.message is "Geolocation cannot be used in frameless documents"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt b/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt new file mode 100644 index 0000000..18abab4 --- /dev/null +++ b/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt @@ -0,0 +1,15 @@ +Tests that when a request is made on a Geolocation object, permission is denied and its Frame is disconnected before a callback is made, the error callback is invoked with PERMISSION_DENIED.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+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/platform/android/test_expectations.txt b/LayoutTests/platform/android/test_expectations.txt index b3757f5..c05f0e7 100644 --- a/LayoutTests/platform/android/test_expectations.txt +++ b/LayoutTests/platform/android/test_expectations.txt @@ -49,6 +49,7 @@ http/tests/appcache/empty-manifest.html IGNORE_RESULT // flaky http/tests/appcache/fallback.html IGNORE_RESULT // http://b/issue?id=2713004 http/tests/appcache/foreign-iframe-main.html IGNORE_RESULT // flaky - skips states http/tests/appcache/manifest-with-empty-file.html IGNORE_RESULT // flaky +http/tests/appcache/origin-quota.html IGNORE_RESULT // requires clearAllApplicationCaches(), see http://b/issue?id=2944196 storage/database-lock-after-reload.html IGNORE_RESULT // Succeeds but DumpRenderTree does not read result correctly storage/hash-change-with-xhr.html IGNORE_RESULT // Succeeds but DumpRenderTree does not read result correctly storage/open-database-creation-callback-isolated-world.html IGNORE_RESULT // Requires layoutTestController.evaluateScriptInIsolatedWorld() |