[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[steveblock at google.com]

The following commit has been merged in the debian/experimental branch:
commit 91f4c1007f47fc4b526a86823b01bcbfa2d33808
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 17:13:22 2010 +0000

    2010-08-17  Steve Block  <steveblock at google.com>
    
            Reviewed by Jeremy Orlow.
    
            [Qt] fast/dom/Geolocation/disconnected-frame-permission-denied.html fails
            https://bugs.webkit.org/show_bug.cgi?id=44059
    
            * fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt:
            * fast/dom/Geolocation/script-tests/disconnected-frame-permission-denied.js:
            (onIframeLoaded):
            ():
            * platform/chromium/test_expectations.txt:
            * platform/qt/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65513 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9c92cda..2b4d696 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-17  Steve Block  <steveblock at google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        [Qt] fast/dom/Geolocation/disconnected-frame-permission-denied.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=44059
+
+        * fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt:
+        * fast/dom/Geolocation/script-tests/disconnected-frame-permission-denied.js:
+        (onIframeLoaded):
+        ():
+        * platform/chromium/test_expectations.txt:
+        * platform/qt/Skipped:
+
 2010-08-17  Mahesh Kulkarni  <mahesh.kulkarni at nokia.com>
 
         Reviewed by Steve Block.
diff --git a/LayoutTests/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt b/LayoutTests/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt
index f4e936f..74c0521 100644
--- a/LayoutTests/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt
+++ b/LayoutTests/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt
@@ -6,6 +6,10 @@ 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/fast/dom/Geolocation/script-tests/disconnected-frame-permission-denied.js b/LayoutTests/fast/dom/Geolocation/script-tests/disconnected-frame-permission-denied.js
index 4dc68af..a3f9eca 100644
--- a/LayoutTests/fast/dom/Geolocation/script-tests/disconnected-frame-permission-denied.js
+++ b/LayoutTests/fast/dom/Geolocation/script-tests/disconnected-frame-permission-denied.js
@@ -1,15 +1,30 @@
 description("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.");
 
-if (window.layoutTestController)
+// Prime the Geolocation instance by denying permission. This makes sure that we execute the
+// same code path for both preemptive and non-preemtive permissions policies.
+if (window.layoutTestController) {
     layoutTestController.setGeolocationPermission(false);
+    layoutTestController.setMockGeolocationPosition(51.478, -0.166, 100);
+} else
+    debug('This test can not be run without the LayoutTestController');
 
+var error;
 function onIframeLoaded() {
     iframeGeolocation = iframe.contentWindow.navigator.geolocation;
-    iframe.src = 'data:text/html,This frame should be visible when the test completes';
+    iframeGeolocation.getCurrentPosition(function() {
+        testFailed('Success callback invoked unexpectedly');
+        finishJSTest();
+    }, function(e) {
+        error = e;
+        shouldBe('error.code', 'error.PERMISSION_DENIED');
+        shouldBe('error.message', '"User denied Geolocation"');
+        debug('');
+        iframe.src = 'data:text/html,This frame should be visible when the test completes';
+    });
 }
 
-var error;
 function onIframeUnloaded() {
+    // Make another request, with permission already denied.
     iframeGeolocation.getCurrentPosition(function () {
         testFailed('Success callback invoked unexpectedly');
         finishJSTest();
@@ -17,6 +32,7 @@ function onIframeUnloaded() {
         error = e;
         shouldBe('error.code', 'error.PERMISSION_DENIED');
         shouldBe('error.message', '"User denied Geolocation"');
+        debug('');
         finishJSTest();
     });
 }
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 233c7b3..1268b25 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3199,9 +3199,6 @@ BUGYUTAK WIN LINUX : svg/W3C-SVG-1.1/animate-elem-80-t.svg = TEXT
 // Due to http://trac.webkit.org/changeset/65395
 BUGWK44051 : editing/pasteboard/drop-text-events.html = TEXT
 
-// Due to http://trac.webkit.org/changeset/65416
-BUGWK44059 : fast/dom/Geolocation/disconnected-frame-permission-denied.html = FAIL
-
 // Probably http://trac.webkit.org/changeset/65381
 // This test causes the next one to run to ASSERT
 BUGWK44079 DEBUG SKIP : fast/events/popup-allowed-from-gesture-initiated-form-submit.html = PASS
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index d1adbd9..39194a5 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5489,7 +5489,3 @@ fast/dom/Geolocation/delayed-permission-denied-for-multiple-requests.html
 
 # BlodBuilder is not enabled
 http/tests/local/blob/send-data-blob.html
-
-# [Qt] fast/dom/Geolocation/disconnected-frame-permission-denied.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=44059
-fast/dom/Geolocation/disconnected-frame-permission-denied.html

-- 
WebKit Debian packaging