[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 11:45:35 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e0a8b11148ab376450ac32dc05c9cd88316da777
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 5 23:52:00 2010 +0000
2010-08-05 Adam Barth <abarth at webkit.org>
Reviewed by Darin Adler.
js-test-pre.js's escapeHTML should escape null characters so we can see them
https://bugs.webkit.org/show_bug.cgi?id=43579
* fast/canvas/canvas-getContext-invalid-expected.txt:
* fast/js/null-char-in-string-expected.txt:
* fast/js/resources/js-test-pre.js:
(escapeHTML):
* fast/js/switch-behaviour-expected.txt:
* storage/domstorage/complex-values-expected.txt:
* websocket/tests/bad-sub-protocol-control-chars-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64796 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index eaeec79..f835baa 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-05 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Darin Adler.
+
+ js-test-pre.js's escapeHTML should escape null characters so we can see them
+ https://bugs.webkit.org/show_bug.cgi?id=43579
+
+ * fast/canvas/canvas-getContext-invalid-expected.txt:
+ * fast/js/null-char-in-string-expected.txt:
+ * fast/js/resources/js-test-pre.js:
+ (escapeHTML):
+ * fast/js/switch-behaviour-expected.txt:
+ * storage/domstorage/complex-values-expected.txt:
+ * websocket/tests/bad-sub-protocol-control-chars-expected.txt:
+
2010-08-05 Ilya Tikhonovsky <loislo at chromium.org>
Unreviewed build fix for chromium.
diff --git a/LayoutTests/fast/canvas/canvas-getContext-invalid-expected.txt b/LayoutTests/fast/canvas/canvas-getContext-invalid-expected.txt
index 34b149d..b485e0f 100644
--- a/LayoutTests/fast/canvas/canvas-getContext-invalid-expected.txt
+++ b/LayoutTests/fast/canvas/canvas-getContext-invalid-expected.txt
@@ -6,7 +6,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS canvas.getContext('') is null
PASS canvas.getContext('2d#') is null
PASS canvas.getContext('This is clearly not a valid context name.') is null
-PASS canvas.getContext('2d�') is null
+PASS canvas.getContext('2d\0') is null
PASS canvas.getContext('2ｄ') is null
PASS canvas.getContext('2D') is null
PASS successfullyParsed is true
diff --git a/LayoutTests/fast/js/null-char-in-string-expected.txt b/LayoutTests/fast/js/null-char-in-string-expected.txt
index 6d28e64..b807f04 100644
--- a/LayoutTests/fast/js/null-char-in-string-expected.txt
+++ b/LayoutTests/fast/js/null-char-in-string-expected.txt
@@ -3,7 +3,7 @@ This test checks that null characters are allowed in JavaScript strings, rather
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS String("�").length is 1
+PASS String("\0").length is 1
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/js/resources/js-test-pre.js b/LayoutTests/fast/js/resources/js-test-pre.js
index 93c3cb6..aaab749 100644
--- a/LayoutTests/fast/js/resources/js-test-pre.js
+++ b/LayoutTests/fast/js/resources/js-test-pre.js
@@ -23,7 +23,7 @@ function debug(msg)
function escapeHTML(text)
{
- return text.replace(/&/g, "&").replace(/</g, "<");
+ return text.replace(/&/g, "&").replace(/</g, "<").replace(/\0/g, "\\0");
}
function testPassed(msg)
diff --git a/LayoutTests/fast/js/switch-behaviour-expected.txt b/LayoutTests/fast/js/switch-behaviour-expected.txt
index 4fedb19..3553a4f 100644
--- a/LayoutTests/fast/js/switch-behaviour-expected.txt
+++ b/LayoutTests/fast/js/switch-behaviour-expected.txt
@@ -3,7 +3,7 @@ This test covers the correctness and behaviour of switch statements.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS characterSwitch('�') is "�"
+PASS characterSwitch('\0') is "\0"
PASS characterSwitch('A') is "A"
PASS characterSwitch('a') is "a"
PASS characterSwitch('1') is "1"
@@ -19,7 +19,7 @@ PASS characterSwitch(-1) is "default"
PASS characterSwitch(-1000000000) is "default"
PASS characterSwitch(1000000000) is "default"
PASS characterSwitch({}) is "default"
-PASS sparseCharacterSwitch('�') is "�"
+PASS sparseCharacterSwitch('\0') is "\0"
PASS sparseCharacterSwitch('A') is "A"
PASS sparseCharacterSwitch('a') is "a"
PASS sparseCharacterSwitch('1') is "1"
@@ -35,7 +35,7 @@ PASS sparseCharacterSwitch(-1) is "default"
PASS sparseCharacterSwitch(-1000000000) is "default"
PASS sparseCharacterSwitch(1000000000) is "default"
PASS sparseCharacterSwitch({}) is "default"
-PASS stringSwitch('�') is "�"
+PASS stringSwitch('\0') is "\0"
PASS stringSwitch('A') is "A"
PASS stringSwitch('a') is "a"
PASS stringSwitch('1') is "1"
@@ -53,7 +53,7 @@ PASS stringSwitch(-1) is "default"
PASS stringSwitch(-1000000000) is "default"
PASS stringSwitch(1000000000) is "default"
PASS stringSwitch({}) is "default"
-PASS numberSwitch('�') is "default"
+PASS numberSwitch('\0') is "default"
PASS numberSwitch('A') is "default"
PASS numberSwitch('a') is "default"
PASS numberSwitch('1') is "default"
@@ -71,7 +71,7 @@ PASS numberSwitch(-1) is -1
PASS numberSwitch(-1000000000) is "default"
PASS numberSwitch(1000000000) is "default"
PASS numberSwitch({}) is "default"
-PASS sparseNumberSwitch('�') is "default"
+PASS sparseNumberSwitch('\0') is "default"
PASS sparseNumberSwitch('A') is "default"
PASS sparseNumberSwitch('a') is "default"
PASS sparseNumberSwitch('1') is "default"
@@ -89,7 +89,7 @@ PASS sparseNumberSwitch(-1) is -1
PASS sparseNumberSwitch(-1000000000) is -1000000000
PASS sparseNumberSwitch(1000000000) is 1000000000
PASS sparseNumberSwitch({}) is "default"
-PASS generalSwitch('�') is "�"
+PASS generalSwitch('\0') is "\0"
PASS generalSwitch('A') is "A"
PASS generalSwitch('a') is "a"
PASS generalSwitch('1') is "1"
diff --git a/LayoutTests/storage/domstorage/complex-values-expected.txt b/LayoutTests/storage/domstorage/complex-values-expected.txt
index 9a75e42..e1665e6 100644
--- a/LayoutTests/storage/domstorage/complex-values-expected.txt
+++ b/LayoutTests/storage/domstorage/complex-values-expected.txt
@@ -82,25 +82,25 @@ PASS storage.getItem('foo9') is "2"
storage.foo10 = k
PASS typeof storage['foo10'] is "string"
-PASS storage['foo10'] is "ÿ찡�hello"
+PASS storage['foo10'] is "ÿ찡\0hello"
PASS typeof storage.foo10 is "string"
-PASS storage.foo10 is "ÿ찡�hello"
+PASS storage.foo10 is "ÿ찡\0hello"
PASS typeof storage.getItem('foo10') is "string"
-PASS storage.getItem('foo10') is "ÿ찡�hello"
+PASS storage.getItem('foo10') is "ÿ찡\0hello"
storage['foo11'] = k
PASS typeof storage['foo11'] is "string"
-PASS storage['foo11'] is "ÿ찡�hello"
+PASS storage['foo11'] is "ÿ찡\0hello"
PASS typeof storage.foo11 is "string"
-PASS storage.foo11 is "ÿ찡�hello"
+PASS storage.foo11 is "ÿ찡\0hello"
PASS typeof storage.getItem('foo11') is "string"
-PASS storage.getItem('foo11') is "ÿ찡�hello"
+PASS storage.getItem('foo11') is "ÿ찡\0hello"
storage.setItem('foo12', k)
PASS typeof storage['foo12'] is "string"
-PASS storage['foo12'] is "ÿ찡�hello"
+PASS storage['foo12'] is "ÿ찡\0hello"
PASS typeof storage.foo12 is "string"
-PASS storage.foo12 is "ÿ찡�hello"
+PASS storage.foo12 is "ÿ찡\0hello"
PASS typeof storage.getItem('foo12') is "string"
-PASS storage.getItem('foo12') is "ÿ찡�hello"
+PASS storage.getItem('foo12') is "ÿ찡\0hello"
Testing localStorage
@@ -182,25 +182,25 @@ PASS storage.getItem('foo9') is "2"
storage.foo10 = k
PASS typeof storage['foo10'] is "string"
-PASS storage['foo10'] is "ÿ찡�hello"
+PASS storage['foo10'] is "ÿ찡\0hello"
PASS typeof storage.foo10 is "string"
-PASS storage.foo10 is "ÿ찡�hello"
+PASS storage.foo10 is "ÿ찡\0hello"
PASS typeof storage.getItem('foo10') is "string"
-PASS storage.getItem('foo10') is "ÿ찡�hello"
+PASS storage.getItem('foo10') is "ÿ찡\0hello"
storage['foo11'] = k
PASS typeof storage['foo11'] is "string"
-PASS storage['foo11'] is "ÿ찡�hello"
+PASS storage['foo11'] is "ÿ찡\0hello"
PASS typeof storage.foo11 is "string"
-PASS storage.foo11 is "ÿ찡�hello"
+PASS storage.foo11 is "ÿ찡\0hello"
PASS typeof storage.getItem('foo11') is "string"
-PASS storage.getItem('foo11') is "ÿ찡�hello"
+PASS storage.getItem('foo11') is "ÿ찡\0hello"
storage.setItem('foo12', k)
PASS typeof storage['foo12'] is "string"
-PASS storage['foo12'] is "ÿ찡�hello"
+PASS storage['foo12'] is "ÿ찡\0hello"
PASS typeof storage.foo12 is "string"
-PASS storage.foo12 is "ÿ찡�hello"
+PASS storage.foo12 is "ÿ찡\0hello"
PASS typeof storage.getItem('foo12') is "string"
-PASS storage.getItem('foo12') is "ÿ찡�hello"
+PASS storage.getItem('foo12') is "ÿ찡\0hello"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt b/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
index 2839a86..41899b5 100644
--- a/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
+++ b/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
@@ -5,7 +5,7 @@ Test WebSocket bad sub-protocol names by control characters.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "�") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "\0") threw exception Error: SYNTAX_ERR: DOM Exception 12.
PASS new WebSocket("ws://127.0.0.1:8880/simple", " ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
PASS new WebSocket("ws://127.0.0.1:8880/simple", "
") threw exception SyntaxError: Parse error.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list