[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 12:06:02 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7f7b64908cf11ca79205ee93075c39c870fd95dd
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Aug 14 05:05:32 2010 +0000
2010-08-13 Adam Barth <abarth at webkit.org>
Update test expectations to account for the HTML5 entity parser. There
are two main differences:
1) The value of lang and rang have changed.
2) We now parse FOO<BAR as FOO<BAR.
* fast/parser/entities-in-html-expected.txt:
* fast/parser/entities-in-xhtml-expected.txt:
* http/tests/security/xssAuditor/link-onclick-entities-expected.txt:
* http/tests/security/xssAuditor/script-tag-with-source-entities-expected.txt:
- This test expectation is wrong. It's on my list to redesign how
the XSS auditor works now that we have better parsing tools.
Rather than skip the test on all platforms, I'm updating the
expectation.
* platform/mac/fast/text/word-space-expected.txt:
* platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt:
* platform/mac/tables/mozilla/other/wa_table_tr_align-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65355 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5892cf0..8a562f9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,23 @@
+2010-08-13 Adam Barth <abarth at webkit.org>
+
+ Update test expectations to account for the HTML5 entity parser. There
+ are two main differences:
+
+ 1) The value of lang and rang have changed.
+ 2) We now parse FOO<BAR as FOO<BAR.
+
+ * fast/parser/entities-in-html-expected.txt:
+ * fast/parser/entities-in-xhtml-expected.txt:
+ * http/tests/security/xssAuditor/link-onclick-entities-expected.txt:
+ * http/tests/security/xssAuditor/script-tag-with-source-entities-expected.txt:
+ - This test expectation is wrong. It's on my list to redesign how
+ the XSS auditor works now that we have better parsing tools.
+ Rather than skip the test on all platforms, I'm updating the
+ expectation.
+ * platform/mac/fast/text/word-space-expected.txt:
+ * platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt:
+ * platform/mac/tables/mozilla/other/wa_table_tr_align-expected.txt:
+
2010-08-12 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/LayoutTests/fast/parser/entities-in-html-expected.txt b/LayoutTests/fast/parser/entities-in-html-expected.txt
index a53bec8..3e16a9c 100644
--- a/LayoutTests/fast/parser/entities-in-html-expected.txt
+++ b/LayoutTests/fast/parser/entities-in-html-expected.txt
@@ -259,8 +259,8 @@ decimal hexadecimal entity name &#nnn; &#xhhh; &entity;
8969 2309 rceil ⌉ ⌉ ⌉
8970 230A lfloor ⌊ ⌊ ⌊
8971 230B rfloor ⌋ ⌋ ⌋
-12296 3008 lang 〈 〈 〈
-12297 3009 rang 〉 〉 〉
+12296 3008 lang 〈 〈 ⟨
+12297 3009 rang 〉 〉 ⟩
9674 25CA loz ◊ ◊ ◊
9824 2660 spades ♠ ♠ ♠
9827 2663 clubs ♣ ♣ ♣
diff --git a/LayoutTests/fast/parser/entities-in-xhtml-expected.txt b/LayoutTests/fast/parser/entities-in-xhtml-expected.txt
index 987eba4..c3a3efb 100644
--- a/LayoutTests/fast/parser/entities-in-xhtml-expected.txt
+++ b/LayoutTests/fast/parser/entities-in-xhtml-expected.txt
@@ -259,8 +259,8 @@ decimal hexadecimal entity name &#nnn; &#xhhh; &entity;
8969 2309 rceil ⌉ ⌉ ⌉
8970 230A lfloor ⌊ ⌊ ⌊
8971 230B rfloor ⌋ ⌋ ⌋
-12296 3008 lang 〈 〈 〈
-12297 3009 rang 〉 〉 〉
+12296 3008 lang 〈 〈 ⟨
+12297 3009 rang 〉 〉 ⟩
9674 25CA loz ◊ ◊ ◊
9824 2660 spades ♠ ♠ ♠
9827 2663 clubs ♣ ♣ ♣
diff --git a/LayoutTests/http/tests/security/xssAuditor/link-onclick-entities-expected.txt b/LayoutTests/http/tests/security/xssAuditor/link-onclick-entities-expected.txt
index 513e2f8..8b13789 100644
--- a/LayoutTests/http/tests/security/xssAuditor/link-onclick-entities-expected.txt
+++ b/LayoutTests/http/tests/security/xssAuditor/link-onclick-entities-expected.txt
@@ -1,3 +1 @@
-CONSOLE MESSAGE: line 1: Refused to execute a JavaScript script. Source code of script found within request.
-
diff --git a/LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-entities-expected.txt b/LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-entities-expected.txt
index 513e2f8..315f106 100644
--- a/LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-entities-expected.txt
+++ b/LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-entities-expected.txt
@@ -1,3 +1,2 @@
-CONSOLE MESSAGE: line 1: Refused to execute a JavaScript script. Source code of script found within request.
-
+ALERT: /XSS/
diff --git a/LayoutTests/platform/mac/fast/text/word-space-expected.txt b/LayoutTests/platform/mac/fast/text/word-space-expected.txt
index 510772b..e43c7b2 100644
--- a/LayoutTests/platform/mac/fast/text/word-space-expected.txt
+++ b/LayoutTests/platform/mac/fast/text/word-space-expected.txt
@@ -6,13 +6,13 @@ layer at (0,0) size 800x600
RenderBlock {P} at (0,0) size 784x36
RenderText {#text} at (0,0) size 53x18
text run at (0,0) width 53: "Test for "
- RenderInline {I} at (0,0) size 767x36
+ RenderInline {I} at (0,0) size 758x36
RenderInline {A} at (0,0) size 301x18 [color=#0000EE]
RenderText {#text} at (53,0) size 301x18
text run at (53,0) width 301: "http://bugs.webkit.org/show_bug.cgi?id=15259"
- RenderText {#text} at (354,0) size 767x36
+ RenderText {#text} at (354,0) size 758x36
text run at (354,0) width 4: " "
- text run at (358,0) width 409: "REGRESSION:Text overflows if a empty <td> is followed by a"
+ text run at (358,0) width 400: "REGRESSION:Text overflows if a empty <td> is followed by a"
text run at (0,18) width 134: "<td align=\"center\">"
RenderText {#text} at (134,18) size 4x18
text run at (134,18) width 4: "."
diff --git a/LayoutTests/platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt b/LayoutTests/platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt
index c9dd0e5..5bc5483 100644
--- a/LayoutTests/platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt
@@ -136,11 +136,11 @@ layer at (0,0) size 785x2358
text run at (106,11) width 312: "table with header cells spanning multiple rows"
RenderText {#text} at (418,11) size 4x18
text run at (418,11) width 4: " "
- RenderInline {FONT} at (0,0) size 596x31
- RenderInline {I} at (0,0) size 596x31
- RenderText {#text} at (422,13) size 596x31
- text run at (422,13) width 185: "(using <TH ROWSPAN=integer"
- text run at (11,29) width 62: "value> tag)"
+ RenderInline {FONT} at (0,0) size 625x31
+ RenderInline {I} at (0,0) size 625x31
+ RenderText {#text} at (422,13) size 625x31
+ text run at (422,13) width 214: "(using <TH ROWSPAN=integer value>"
+ text run at (11,29) width 22: "tag)"
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,608) size 769x136
RenderBlock (anonymous) at (0,0) size 769x18
@@ -496,10 +496,10 @@ layer at (0,0) size 785x2358
text run at (106,11) width 295: "table with data cells spanning multiple rows"
RenderText {#text} at (401,11) size 4x18
text run at (401,11) width 4: " "
- RenderInline {FONT} at (0,0) size 618x31
- RenderInline {I} at (0,0) size 618x31
- RenderText {#text} at (405,13) size 618x31
- text run at (405,13) width 224: "(using <TD ROWSPAN=integer value>"
+ RenderInline {FONT} at (0,0) size 607x31
+ RenderInline {I} at (0,0) size 607x31
+ RenderText {#text} at (405,13) size 607x31
+ text run at (405,13) width 213: "(using <TD ROWSPAN=integer value>"
text run at (11,29) width 22: "tag)"
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,1185) size 769x136
@@ -887,11 +887,11 @@ layer at (0,0) size 785x2358
text run at (106,11) width 410: "table with nested header & data cells spanning multiple rows"
RenderText {#text} at (516,11) size 4x18
text run at (516,11) width 4: " "
- RenderInline {FONT} at (0,0) size 582x31
- RenderInline {I} at (0,0) size 582x31
- RenderText {#text} at (520,13) size 582x31
- text run at (520,13) width 73: "(using <TH"
- text run at (11,29) width 364: "ROWSPAN=integer value> <TD ROWSPAN=integer value> tag)"
+ RenderInline {FONT} at (0,0) size 571x31
+ RenderInline {I} at (0,0) size 571x31
+ RenderText {#text} at (520,13) size 571x31
+ text run at (520,13) width 62: "(using <TH"
+ text run at (11,29) width 353: "ROWSPAN=integer value> <TD ROWSPAN=integer value> tag)"
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,1762) size 769x36
RenderBR {BR} at (0,0) size 0x18
diff --git a/LayoutTests/platform/mac/tables/mozilla/other/wa_table_tr_align-expected.txt b/LayoutTests/platform/mac/tables/mozilla/other/wa_table_tr_align-expected.txt
index c5c6006..d706231 100644
--- a/LayoutTests/platform/mac/tables/mozilla/other/wa_table_tr_align-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/other/wa_table_tr_align-expected.txt
@@ -142,11 +142,11 @@ layer at (0,0) size 785x1308
text run at (109,11) width 602: "Table displaying Header \"CENTER \"& Data \"LEFT\" default horizontal row alignment"
RenderText {#text} at (711,11) size 4x18
text run at (711,11) width 4: " "
- RenderInline {FONT} at (0,0) size 401x31
- RenderInline {I} at (0,0) size 401x31
- RenderText {#text} at (715,13) size 401x31
+ RenderInline {FONT} at (0,0) size 396x31
+ RenderInline {I} at (0,0) size 396x31
+ RenderText {#text} at (715,13) size 396x31
text run at (715,13) width 34: "(using"
- text run at (348,29) width 67: "<TR> tag)"
+ text run at (353,29) width 56: "<TR> tag)"
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,631) size 769x70
RenderTable {TABLE} at (0,0) size 346x70 [bgcolor=#FFE4C4] [border: (1px outset #808080)]
@@ -188,11 +188,11 @@ layer at (0,0) size 785x1308
text run at (112,11) width 596: "Tables displaying Header & Data \"LEFT|CENTER|RIGHT\" horizontal row alignment"
RenderText {#text} at (708,11) size 4x18
text run at (708,11) width 4: " "
- RenderInline {FONT} at (0,0) size 490x31
- RenderInline {I} at (0,0) size 490x31
- RenderText {#text} at (712,13) size 490x31
+ RenderInline {FONT} at (0,0) size 485x31
+ RenderInline {I} at (0,0) size 485x31
+ RenderText {#text} at (712,13) size 485x31
text run at (712,13) width 34: "(using"
- text run at (256,29) width 251: "<TR ALIGN=LEFT|CENTER|RIGHT> tag)"
+ text run at (261,29) width 240: "<TR ALIGN=LEFT|CENTER|RIGHT> tag)"
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,812) size 769x146
RenderTable {TABLE} at (0,0) size 346x146 [bgcolor=#FFE4C4] [border: (1px outset #808080)]
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list