[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
jorlow at chromium.org
jorlow at chromium.org
Sun Feb 20 23:25:29 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit ecde3d150d407e9b5ef073fc4657ec306de0527c
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 20 12:46:23 2011 +0000
2011-01-20 Jeremy Orlow <jorlow at chromium.org>
[Chromium] Update baselines and add exception.
* platform/chromium-mac/fast/dom/wrapper-classes-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/xss-DENIED-frame-name-expected.txt:
* platform/chromium-win/fast/dom/wrapper-classes-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/xss-DENIED-frame-name-expected.txt:
* platform/chromium/test_expectations.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76228 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d99c8b8..b545e53 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-20 Jeremy Orlow <jorlow at chromium.org>
+
+ [Chromium] Update baselines and add exception.
+
+ * platform/chromium-mac/fast/dom/wrapper-classes-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/xss-DENIED-frame-name-expected.txt:
+ * platform/chromium-win/fast/dom/wrapper-classes-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/xss-DENIED-frame-name-expected.txt:
+ * platform/chromium/test_expectations.txt:
+
2011-01-20 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r76215.
diff --git a/LayoutTests/platform/chromium-mac/fast/dom/wrapper-classes-expected.txt b/LayoutTests/platform/chromium-mac/fast/dom/wrapper-classes-expected.txt
index b6c6d25..a2f59e3 100644
--- a/LayoutTests/platform/chromium-mac/fast/dom/wrapper-classes-expected.txt
+++ b/LayoutTests/platform/chromium-mac/fast/dom/wrapper-classes-expected.txt
@@ -323,9 +323,9 @@ FAIL tagJSWrapperConstructorClass('isindex') should be HTMLIsIndexElementConstru
PASS tagJSWrapperClass('kbd') is 'HTMLElement'
FAIL tagJSWrapperPrototypeClass('kbd') should be HTMLElementPrototype. Was Object.
FAIL tagJSWrapperConstructorClass('kbd') should be HTMLElementConstructor. Was Function.
-PASS tagJSWrapperClass('keygen') is 'HTMLSelectElement'
-FAIL tagJSWrapperPrototypeClass('keygen') should be HTMLSelectElementPrototype. Was Object.
-FAIL tagJSWrapperConstructorClass('keygen') should be HTMLSelectElementConstructor. Was Function.
+PASS tagJSWrapperClass('keygen') is 'HTMLKeygenElement'
+FAIL tagJSWrapperPrototypeClass('keygen') should be HTMLKeygenElementPrototype. Was Object.
+FAIL tagJSWrapperConstructorClass('keygen') should be HTMLKeygenElementConstructor. Was Function.
PASS tagJSWrapperClass('label') is 'HTMLLabelElement'
FAIL tagJSWrapperPrototypeClass('label') should be HTMLLabelElementPrototype. Was Object.
FAIL tagJSWrapperConstructorClass('label') should be HTMLLabelElementConstructor. Was Function.
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 fb72c2a..edeb945 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 94f6484..343f657 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 7e09a8b..d0d9edc 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/fast/dom/wrapper-classes-expected.txt b/LayoutTests/platform/chromium-win/fast/dom/wrapper-classes-expected.txt
index b6c6d25..a2f59e3 100644
--- a/LayoutTests/platform/chromium-win/fast/dom/wrapper-classes-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/dom/wrapper-classes-expected.txt
@@ -323,9 +323,9 @@ FAIL tagJSWrapperConstructorClass('isindex') should be HTMLIsIndexElementConstru
PASS tagJSWrapperClass('kbd') is 'HTMLElement'
FAIL tagJSWrapperPrototypeClass('kbd') should be HTMLElementPrototype. Was Object.
FAIL tagJSWrapperConstructorClass('kbd') should be HTMLElementConstructor. Was Function.
-PASS tagJSWrapperClass('keygen') is 'HTMLSelectElement'
-FAIL tagJSWrapperPrototypeClass('keygen') should be HTMLSelectElementPrototype. Was Object.
-FAIL tagJSWrapperConstructorClass('keygen') should be HTMLSelectElementConstructor. Was Function.
+PASS tagJSWrapperClass('keygen') is 'HTMLKeygenElement'
+FAIL tagJSWrapperPrototypeClass('keygen') should be HTMLKeygenElementPrototype. Was Object.
+FAIL tagJSWrapperConstructorClass('keygen') should be HTMLKeygenElementConstructor. Was Function.
PASS tagJSWrapperClass('label') is 'HTMLLabelElement'
FAIL tagJSWrapperPrototypeClass('label') should be HTMLLabelElementPrototype. Was Object.
FAIL tagJSWrapperConstructorClass('label') should be HTMLLabelElementConstructor. Was Function.
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 fb72c2a..edeb945 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 94f6484..343f657 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/xss-DENIED-frame-name-expected.txt b/LayoutTests/platform/chromium-win/http/tests/security/xss-DENIED-frame-name-expected.txt
index aa5574a..fe5804f 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.
-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 ac3f45e..6ae88f3 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2761,6 +2761,8 @@ BUGCR63921 LINUX WIN : fast/canvas/canvas-fillPath-shadow.html = TEXT
BUGCR63921 LINUX WIN : fast/canvas/canvas-fillPath-gradient-shadow.html = TEXT
BUGCR63921 LINUX WIN : fast/canvas/canvas-fillPath-pattern-shadow.html = TEXT
BUGCR63921 LINUX WIN : fast/canvas/canvas-fillPath-alpha-shadow.html = TEXT
+BUGCR63921 LINUX WIN : fast/canvas/canvas-strokeRect-alpha-shadow.html = TEXT
+BUGCR63921 LINUX WIN : fast/canvas/canvas-strokePath-alpha-shadow.html = TEXT
// Mainly flaky with mac debug, but also intermittent crashes seen on linux release
BUGCR64129 MAC LINUX : fast/files/revoke-blob-url.html = CRASH PASS
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list