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

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit fd267ebe7bc7d52145d2e303012c1f6e3a92db55
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 06:46:43 2010 +0000

    2010-08-24  Adam Barth  <abarth at webkit.org>
    
            Unskip XSSAuditor test and fix the source of flakiness.  I'll make the
            test pass again in the XSSAuditor redesign.
    
            * http/tests/security/xssAuditor/dom-write-innerHTML-expected.txt:
            * http/tests/security/xssAuditor/dom-write-innerHTML.html:
            * platform/mac/Skipped:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65987 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 37de9f9..522989c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-24  Adam Barth  <abarth at webkit.org>
+
+        Unskip XSSAuditor test and fix the source of flakiness.  I'll make the
+        test pass again in the XSSAuditor redesign.
+
+        * http/tests/security/xssAuditor/dom-write-innerHTML-expected.txt:
+        * http/tests/security/xssAuditor/dom-write-innerHTML.html:
+        * platform/mac/Skipped:
+
 2010-08-24  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/http/tests/security/xssAuditor/dom-write-innerHTML-expected.txt b/LayoutTests/http/tests/security/xssAuditor/dom-write-innerHTML-expected.txt
index 8b13789..315f106 100644
--- a/LayoutTests/http/tests/security/xssAuditor/dom-write-innerHTML-expected.txt
+++ b/LayoutTests/http/tests/security/xssAuditor/dom-write-innerHTML-expected.txt
@@ -1 +1,2 @@
+ALERT: /XSS/
 
diff --git a/LayoutTests/http/tests/security/xssAuditor/dom-write-innerHTML.html b/LayoutTests/http/tests/security/xssAuditor/dom-write-innerHTML.html
index 95120d4..c32444c 100644
--- a/LayoutTests/http/tests/security/xssAuditor/dom-write-innerHTML.html
+++ b/LayoutTests/http/tests/security/xssAuditor/dom-write-innerHTML.html
@@ -5,6 +5,12 @@
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.setXSSAuditorEnabled(true);
+    layoutTestController.waitUntilDone();
+}
+
+window.onload = function() {
+    // Give the img onerror handler a chance to fire.
+    setTimeout("layoutTestController.notifyDone()", 100);
 }
 </script>
 </head>
@@ -12,4 +18,4 @@ if (window.layoutTestController) {
 <iframe src="http://localhost:8000/security/xssAuditor/resources/echo-dom-write-innerHTML.html?q=<img src='about:blank' onerror='alert(/XSS/)'>">
 </iframe>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 1deece3..05261aa 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -292,8 +292,3 @@ animations/play-state.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=43332
 inspector/dom-breakpoints.html
-
-# This test has become flaky after turning on the HTML5 fragment parser.  I'll
-# investigate.  --abarth (2010/8/24)
-http/tests/security/xssAuditor/dom-write-location-inline-event.html
-

-- 
WebKit Debian packaging