[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

Thu Apr 8 00:52:45 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit 66832c4ff36deb5665624bd29f5f438d369fb0ad
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 2 19:54:01 2010 +0000

    2010-01-02  Daniel Bates  <dbates at webkit.org>
    
            Reviewed by Adam Barth.
    
            https://bugs.webkit.org/show_bug.cgi?id=33107
    
            Removes the use of window.setTimeout from the XSSAuditor tests:
            get-from-iframe.html and post-from-iframe.html by having the
            script echo-intertag.pl (called by these tests) call
            layoutTestController.notifyDone().
    
            * http/tests/security/xssAuditor/get-from-iframe.html: Removes call of window.setTimeout.
            * http/tests/security/xssAuditor/post-from-iframe.html: Ditto.
            * http/tests/security/xssAuditor/resources/echo-intertag.pl: If the query argument
            notifyDone is found, then the script will generate a JavaScript script to call
            layoutTestController.notifyDone().
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52687 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d0dda9c..374f6b2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-01-02  Daniel Bates  <dbates at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33107
+
+        Removes the use of window.setTimeout from the XSSAuditor tests:
+        get-from-iframe.html and post-from-iframe.html by having the
+        script echo-intertag.pl (called by these tests) call
+        layoutTestController.notifyDone().
+
+        * http/tests/security/xssAuditor/get-from-iframe.html: Removes call of window.setTimeout.
+        * http/tests/security/xssAuditor/post-from-iframe.html: Ditto.
+        * http/tests/security/xssAuditor/resources/echo-intertag.pl: If the query argument
+        notifyDone is found, then the script will generate a JavaScript script to call
+        layoutTestController.notifyDone().
+
 2010-01-01  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/LayoutTests/http/tests/security/xssAuditor/get-from-iframe.html b/LayoutTests/http/tests/security/xssAuditor/get-from-iframe.html
index 654acb6..f283da2 100644
--- a/LayoutTests/http/tests/security/xssAuditor/get-from-iframe.html
+++ b/LayoutTests/http/tests/security/xssAuditor/get-from-iframe.html
@@ -10,14 +10,8 @@ if (window.layoutTestController) {
 }
 window.onload = function()
 {
-    sendRequestFromIFrame("http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl","q=<script>alert(/XSS/)<\/script>","GET");
-    window.setTimeout(done, 100);
+    sendRequestFromIFrame("http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl","notifyDone=1&q=<script>alert(/XSS/)<\/script>","GET");
 };
-function done()
-{
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
-}
 </script>
 </head>
 <body>
diff --git a/LayoutTests/http/tests/security/xssAuditor/post-from-iframe.html b/LayoutTests/http/tests/security/xssAuditor/post-from-iframe.html
index 50ca200..04afd0c 100644
--- a/LayoutTests/http/tests/security/xssAuditor/post-from-iframe.html
+++ b/LayoutTests/http/tests/security/xssAuditor/post-from-iframe.html
@@ -10,14 +10,8 @@ if (window.layoutTestController) {
 }
 window.onload = function()
 {
-    sendRequestFromIFrame("http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl","q=<script>alert(/XSS/)<\/script>","POST");
-    window.setTimeout(done, 100);
+    sendRequestFromIFrame("http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl","notifyDone=1&q=<script>alert(/XSS/)<\/script>","POST");
 };
-function done()
-{
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
-}
 </script>
 </head>
 <body>
diff --git a/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl b/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl
index fe7957b..cd7631f 100755
--- a/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl
+++ b/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl
@@ -10,5 +10,11 @@ print "<!DOCTYPE html>\n";
 print "<html>\n";
 print "<body>\n";
 print $cgi->param('q');
+if ($cgi->param('notifyDone')) {
+    print "<script>\n";
+    print "if (window.layoutTestController)\n";
+    print "    layoutTestController.notifyDone();\n";
+    print "</script>\n";
+}
 print "</body>\n";
 print "</html>\n";

-- 
WebKit Debian packaging

