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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 18:32:57 UTC 2010 

The following commit has been merged in the debian/experimental branch:
commit 60c65480618d19c39a82811c58752b160f131d98
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 22:08:22 2010 +0000

    2010-12-13  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r73922.
            http://trac.webkit.org/changeset/73922
            https://bugs.webkit.org/show_bug.cgi?id=50964
    
            Remove rebaseline results due to that 73914 has been rolled
            out (Requested by jianli on #webkit).
    
            * platform/chromium-linux/http/tests/security/xss-DENIED-frame-name-expected.txt: Copied from LayoutTests/platform/chromium-win/http/tests/security/xss-DENIED-frame-name-expected.txt.
            * 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/aboutBlank/xss-DENIED-set-opener-expected.txt:
            * platform/chromium-mac/http/tests/security/xss-DENIED-frame-name-expected.txt:
            * platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt:
            * platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt:
            * platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt:
            * platform/chromium-win/http/tests/security/xss-DENIED-frame-name-expected.txt:
            * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73960 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 70a1422..55f2bbf 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,23 @@
+2010-12-13  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r73922.
+        http://trac.webkit.org/changeset/73922
+        https://bugs.webkit.org/show_bug.cgi?id=50964
+
+        Remove rebaseline results due to that 73914 has been rolled
+        out (Requested by jianli on #webkit).
+
+        * platform/chromium-linux/http/tests/security/xss-DENIED-frame-name-expected.txt: Copied from LayoutTests/platform/chromium-win/http/tests/security/xss-DENIED-frame-name-expected.txt.
+        * 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/aboutBlank/xss-DENIED-set-opener-expected.txt:
+        * platform/chromium-mac/http/tests/security/xss-DENIED-frame-name-expected.txt:
+        * platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt:
+        * platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt:
+        * platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt:
+        * platform/chromium-win/http/tests/security/xss-DENIED-frame-name-expected.txt:
+        * platform/chromium/test_expectations.txt:
+
 2010-12-13  Jon Honeycutt  <jhoneycutt at apple.com>
 
         Remove some empty files that should've been removed as part of r73942.
diff --git a/LayoutTests/platform/chromium-linux/http/tests/security/xss-DENIED-frame-name-expected.txt b/LayoutTests/platform/chromium-linux/http/tests/security/xss-DENIED-frame-name-expected.txt
new file mode 100644
index 0000000..7e09a8b
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/http/tests/security/xss-DENIED-frame-name-expected.txt
@@ -0,0 +1,4 @@
+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-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/aboutBlank/xss-DENIED-set-opener-expected.txt b/LayoutTests/platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt
index cfc9c55..7bcd3a5 100644
--- a/LayoutTests/platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt
+++ b/LayoutTests/platform/chromium-mac/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt
@@ -1,8 +1,8 @@
 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/innocent-victim.html from frame with URL http://127.0.0.1:8000/security/aboutBlank/xss-DENIED-set-opener.html. Domains, protocols and ports must match.
 
-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.html from frame with URL http://127.0.0.1:8000/security/aboutBlank/xss-DENIED-set-opener.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 uses window.open.call to set its opener to the victim. The opened window then tries to scripts its opener.
 Code injected into window:
 <script>function write(target, message) { target.document.body.innerHTML = message; }
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-win/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt b/LayoutTests/platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt
index edeb945..fb72c2a 100644
--- a/LayoutTests/platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt
+++ b/LayoutTests/platform/chromium-win/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-win/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt b/LayoutTests/platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt
index 343f657..94f6484 100644
--- a/LayoutTests/platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt
+++ b/LayoutTests/platform/chromium-win/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-win/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt b/LayoutTests/platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt
index cfc9c55..7bcd3a5 100644
--- a/LayoutTests/platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt
+++ b/LayoutTests/platform/chromium-win/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt
@@ -1,8 +1,8 @@
 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/innocent-victim.html from frame with URL http://127.0.0.1:8000/security/aboutBlank/xss-DENIED-set-opener.html. Domains, protocols and ports must match.
 
-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.html from frame with URL http://127.0.0.1:8000/security/aboutBlank/xss-DENIED-set-opener.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 uses window.open.call to set its opener to the victim. The opened window then tries to scripts its opener.
 Code injected into window:
 <script>function write(target, message) { target.document.body.innerHTML = message; }
diff --git a/LayoutTests/platform/chromium-win/http/tests/security/xss-DENIED-frame-name-expected.txt b/LayoutTests/platform/chromium-win/http/tests/security/xss-DENIED-frame-name-expected.txt
index d0d9edc..aa5574a 100644
--- a/LayoutTests/platform/chromium-win/http/tests/security/xss-DENIED-frame-name-expected.txt
+++ b/LayoutTests/platform/chromium-win/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.
-
-   This test passes if it doesn't alert fail.
+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 63d8ef1..bd100f3 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3263,4 +3263,3 @@ BUG66554 WIN DEBUG : fast/js/kde/encode_decode_uri.html = CRASH PASS
 BUG66683 WIN LINUX : fast/canvas/canvas-draw-canvas-on-canvas-shadow.html = TEXT
 BUG66682 WIN LINUX MAC : editing/spelling/spellcheck-paste.html = TEXT TIMEOUT
 BUG66686 : fast/loader/user-stylesheet-fast-path.html = TEXT
-

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list