[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

Wed Mar 17 18:30:14 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit cde977824a88f1019a47fd57e3583bdb7e2a26d8
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 21:25:15 2010 +0000

    Fix my layouttest failures by resetting cookies before and after these new tests.
    https://bugs.webkit.org/show_bug.cgi?id=26391
    
    Reviewed by Alexey Proskuryakov.
    
    * http/tests/cookies/third-party-cookie-relaxing.html:
    * http/tests/plugins/resources/third-party-cookie-accept-policy-iframe.html:
    * http/tests/plugins/third-party-cookie-accept-policy.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55742 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d4e3d86..873c2db 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2010-03-09  Brady Eidson  <beidson at apple.com>
 
+        Reviewed by Alexey Proskuryakov.
+
+        Fix my layouttest failures by resetting cookies before and after these new tests.    
+        https://bugs.webkit.org/show_bug.cgi?id=26391
+
+        * http/tests/cookies/third-party-cookie-relaxing.html:
+        * http/tests/plugins/resources/third-party-cookie-accept-policy-iframe.html:
+        * http/tests/plugins/third-party-cookie-accept-policy.html:
+
+2010-03-09  Brady Eidson  <beidson at apple.com>
+
         Reviewed by Darin Adler.
 
         Plug-ins don't always respect the cookie accept policy.
diff --git a/LayoutTests/http/tests/cookies/third-party-cookie-relaxing.html b/LayoutTests/http/tests/cookies/third-party-cookie-relaxing.html
index 803830b..64dcc21 100644
--- a/LayoutTests/http/tests/cookies/third-party-cookie-relaxing.html
+++ b/LayoutTests/http/tests/cookies/third-party-cookie-relaxing.html
@@ -1,10 +1,14 @@
 <html>
 <head>
+<script src="resources/cookies-test-pre.js"></script>
 <script>
 
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+    layoutTestController.setAlwaysAcceptCookies(true);
+    clearCookies();
+    layoutTestController.setAlwaysAcceptCookies(false);
 }
 
 window.onmessage = function(evt)
@@ -75,8 +79,12 @@ var functions = new Array(
 function runNextTestOrFinish()
 {
     if (currentFunction >= functions.length) {
-        if (window.layoutTestController)
+        if (window.layoutTestController) {
             layoutTestController.notifyDone();
+            layoutTestController.setAlwaysAcceptCookies(true);
+            clearCookies();
+            layoutTestController.setAlwaysAcceptCookies(false);
+        }
         return;
     }
     
diff --git a/LayoutTests/http/tests/plugins/resources/third-party-cookie-accept-policy-iframe.html b/LayoutTests/http/tests/plugins/resources/third-party-cookie-accept-policy-iframe.html
index c9cb3cf..9e05ead 100644
--- a/LayoutTests/http/tests/plugins/resources/third-party-cookie-accept-policy-iframe.html
+++ b/LayoutTests/http/tests/plugins/resources/third-party-cookie-accept-policy-iframe.html
@@ -30,8 +30,12 @@ function trySetCookie()
 function completeTest()
 {
    alert("Cookies should still be clear, and are: '" + document.cookie + "'");
-   if (window.layoutTestController)
+   if (window.layoutTestController) {
        layoutTestController.notifyDone();
+       layoutTestController.setAlwaysAcceptCookies(true);
+       clearCookies();
+       layoutTestController.setAlwaysAcceptCookies(false);   
+   }
 }
 
 </script>
diff --git a/LayoutTests/http/tests/plugins/third-party-cookie-accept-policy.html b/LayoutTests/http/tests/plugins/third-party-cookie-accept-policy.html
index bab585c..72163b6 100644
--- a/LayoutTests/http/tests/plugins/third-party-cookie-accept-policy.html
+++ b/LayoutTests/http/tests/plugins/third-party-cookie-accept-policy.html
@@ -1,10 +1,14 @@
 <html>
 <head>
+<script src="../cookies/resources/cookies-test-pre.js"></script>    
 <script>
 
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+    layoutTestController.setAlwaysAcceptCookies(true);
+    clearCookies();
+    layoutTestController.setAlwaysAcceptCookies(false);
 }
 
 </script>

-- 
WebKit Debian packaging

