[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[yurys at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 4779e651264b0357a7f7426b34b9b64e56808bea
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 24 12:56:15 2011 +0000

    2011-01-24  Yury Semikhatsky  <yurys at chromium.org>
    
            Unreviewed. Update Chromium test expectations.
    
            * platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt:
            * platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt:
            * platform/chromium-mac/http/tests/security/xss-DENIED-frame-name-expected.txt:
            * platform/chromium/test_expectations.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76506 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b1a0054..4c66fcb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-24  Yury Semikhatsky  <yurys at chromium.org>
+
+        Unreviewed. Update Chromium test expectations.
+
+        * platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt:
+        * platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt:
+        * platform/chromium-mac/http/tests/security/xss-DENIED-frame-name-expected.txt:
+        * platform/chromium/test_expectations.txt:
+
 2011-01-24  Peter Varga  <pvarga at inf.u-szeged.hu>
 
         Reviewed by Oliver Hunt.
diff --git a/LayoutTests/platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt b/LayoutTests/platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt
index edeb945..fb72c2a 100644
--- a/LayoutTests/platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt
+++ b/LayoutTests/platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt
@@ -1,6 +1,6 @@
-CONSOLE MESSAGE: line 1: Uncaught TypeError: Cannot read property 'body' of undefined
 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/innocent-victim-with-notify.html from frame with URL http://127.0.0.1:8000/security/aboutBlank/xss-DENIED-navigate-opener-document-write.html. Domains, protocols and ports must match.
 
+CONSOLE MESSAGE: line 1: Uncaught TypeError: Cannot read property 'body' of undefined
 This page opens a window to "", injects malicious code, and then navigates its opener to the victim. The opened window then tries to scripts its opener after document.writeing a new document.
 Code injected into window:
 <script>document.write('<script>function write(target, message) { target.document.body.innerHTML = message; }setTimeout(function() {write(window.opener, \'FAIL: XSS was allowed.\');}, 100);setTimeout(function() {write(window.opener.top.frames[1], \'SUCCESS: Window remained in original SecurityOrigin.\');}, 200);setTimeout(function() { if (window.layoutTestController) layoutTestController.globalFlag = true; }, 300);<\/script>');</script>
diff --git a/LayoutTests/platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt b/LayoutTests/platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt
index 343f657..94f6484 100644
--- a/LayoutTests/platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt
+++ b/LayoutTests/platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt
@@ -1,6 +1,6 @@
-CONSOLE MESSAGE: line 1: Uncaught TypeError: Cannot read property 'body' of undefined
 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/innocent-victim-with-notify.html from frame with URL http://127.0.0.1:8000/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url.html. Domains, protocols and ports must match.
 
+CONSOLE MESSAGE: line 1: Uncaught TypeError: Cannot read property 'body' of undefined
 This page opens a window to "", injects malicious code, and then navigates its opener to the victim. The opened window then tries to scripts its opener after reloading itself as a javascript URL.
 Code injected into window:
 <script>window.location = 'javascript:\'<script>function write(target, message) { target.document.body.innerHTML = message; }setTimeout(function() {write(window.opener, \\\'FAIL: XSS was allowed.\\\');}, 100);setTimeout(function() {write(window.opener.top.frames[1], \\\'SUCCESS: Window remained in original SecurityOrigin.\\\');}, 200);setTimeout(function() { if (window.layoutTestController) layoutTestController.globalFlag = true; }, 300);<\\\/script>\''</script>
diff --git a/LayoutTests/platform/chromium-mac/http/tests/security/xss-DENIED-frame-name-expected.txt b/LayoutTests/platform/chromium-mac/http/tests/security/xss-DENIED-frame-name-expected.txt
index d0d9edc..7e09a8b 100644
--- a/LayoutTests/platform/chromium-mac/http/tests/security/xss-DENIED-frame-name-expected.txt
+++ b/LayoutTests/platform/chromium-mac/http/tests/security/xss-DENIED-frame-name-expected.txt
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 2: Uncaught TypeError: Cannot read property 'prop' of undefined
 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://127.0.0.1:8000/security/xss-DENIED-frame-name.html from frame with URL http://localhost:8000/security/resources/frame-for-parent-name.html. Domains, protocols and ports must match.
 
+CONSOLE MESSAGE: line 2: Uncaught TypeError: Cannot read property 'prop' of undefined
    This test passes if it doesn't alert fail.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 957900f..08d720e 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3091,9 +3091,8 @@ BUGDIMICH : fast/regex/cross-frame-callable.html = TEXT
 BUGTHAKIS LINUX WIN : media/video-display-toggle.html = IMAGE
 
 // New test that was non-deterministic.
-BUGYURYS : userscripts/window-onerror-for-isolated-world-1.html = PASS TEXT
-BUGYURYS MAC : userscripts/window-onerror-for-isolated-world-2.html = PASS TEXT
-BUGYURYS WIN LINUX : userscripts/window-onerror-for-isolated-world-2.html = PASS TEXT TIMEOUT
+BUGYURYS SLOW DEBUG : userscripts/window-onerror-for-isolated-world-1.html = PASS
+BUGYURYS SLOW DEBUG : userscripts/window-onerror-for-isolated-world-2.html = PASS
 BUGYURYS : http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write.html = PASS TEXT
 BUGYURYS : http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url.html = PASS TEXT
 BUGYURYS : http/tests/security/xss-DENIED-frame-name.html = PASS TEXT

-- 
WebKit Debian packaging