Skip to content

Commit 6580458

Browse files
author
Adam Barth
committed
2010-07-15 Adam Barth <abarth@webkit.org>
 Reviewed by Eric Seidel. Update LegacyHTMLTreeBuilder to insert whitespace between </head> and <body> https://bugs.webkit.org/show_bug.cgi?id=42431 Insert these whitespace text nodes into the HTML element between <head> and <body>, as required by HTML5. Previously, we just dropped them on the floor. * html/LegacyHTMLTreeBuilder.cpp: (WebCore::LegacyHTMLTreeBuilder::handleError): 2010-07-15 Adam Barth <abarth@webkit.org> Reviewed by Eric Seidel. Update LegacyHTMLTreeBuilder to insert whitespace between </head> and <body> https://bugs.webkit.org/show_bug.cgi?id=42431 Update expected results. These results match the HTML5 parser. * editing/deleting/delete-br-in-last-table-cell-expected.txt: * fast/innerHTML/005-expected.txt: * html5lib/resources/webkit01.dat: * html5lib/runner-expected.txt: * http/tests/webarchive/cross-origin-stylesheet-crash-expected.webarchive: * http/tests/webarchive/test-css-url-encoding-expected.webarchive: * http/tests/webarchive/test-css-url-encoding-shift-jis-expected.webarchive: * http/tests/webarchive/test-css-url-encoding-utf-8-expected.webarchive: * platform/mac/css2.1/t1204-root-e-expected.txt: * platform/mac/fast/css/empty-generated-content-expected.txt: * traversal/exception-forwarding-expected.txt: * traversal/script-tests/exception-forwarding.js: * webarchive/adopt-attribute-styled-body-webarchive-expected.webarchive: * webarchive/adopt-attribute-styled-node-webarchive-expected.webarchive: * webarchive/adopt-inline-styled-node-webarchive-expected.webarchive: * webarchive/archive-empty-frame-dom-expected.webarchive: * webarchive/archive-with-unencoded-url-expected.webarchive: * webarchive/test-body-background-expected.webarchive: * webarchive/test-css-import-expected.webarchive: * webarchive/test-css-url-resources-in-stylesheets-expected.webarchive: * webarchive/test-css-url-resources-inline-styles-expected.webarchive: * webarchive/test-duplicate-resources-expected.webarchive: * webarchive/test-frameset-expected.webarchive: * webarchive/test-img-src-expected.webarchive: * webarchive/test-input-src-expected.webarchive: * webarchive/test-link-href-expected.webarchive: * webarchive/test-link-rel-icon-expected.webarchive: * webarchive/test-object-data-expected.webarchive: * webarchive/test-script-src-expected.webarchive: * webarchive/test-table-background-expected.webarchive: * webarchive/test-td-background-expected.webarchive: Canonical link: https://commits.webkit.org/54357@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63517 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 7ec833a commit 6580458

34 files changed

Lines changed: 164 additions & 42 deletions

‎LayoutTests/ChangeLog‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,44 @@
1+
2010-07-15 Adam Barth <abarth@webkit.org>
2+
3+
Reviewed by Eric Seidel.
4+
5+
Update LegacyHTMLTreeBuilder to insert whitespace between </head> and <body>
6+
https://bugs.webkit.org/show_bug.cgi?id=42431
7+
8+
Update expected results. These results match the HTML5 parser.
9+
10+
* editing/deleting/delete-br-in-last-table-cell-expected.txt:
11+
* fast/innerHTML/005-expected.txt:
12+
* html5lib/resources/webkit01.dat:
13+
* html5lib/runner-expected.txt:
14+
* http/tests/webarchive/cross-origin-stylesheet-crash-expected.webarchive:
15+
* http/tests/webarchive/test-css-url-encoding-expected.webarchive:
16+
* http/tests/webarchive/test-css-url-encoding-shift-jis-expected.webarchive:
17+
* http/tests/webarchive/test-css-url-encoding-utf-8-expected.webarchive:
18+
* platform/mac/css2.1/t1204-root-e-expected.txt:
19+
* platform/mac/fast/css/empty-generated-content-expected.txt:
20+
* traversal/exception-forwarding-expected.txt:
21+
* traversal/script-tests/exception-forwarding.js:
22+
* webarchive/adopt-attribute-styled-body-webarchive-expected.webarchive:
23+
* webarchive/adopt-attribute-styled-node-webarchive-expected.webarchive:
24+
* webarchive/adopt-inline-styled-node-webarchive-expected.webarchive:
25+
* webarchive/archive-empty-frame-dom-expected.webarchive:
26+
* webarchive/archive-with-unencoded-url-expected.webarchive:
27+
* webarchive/test-body-background-expected.webarchive:
28+
* webarchive/test-css-import-expected.webarchive:
29+
* webarchive/test-css-url-resources-in-stylesheets-expected.webarchive:
30+
* webarchive/test-css-url-resources-inline-styles-expected.webarchive:
31+
* webarchive/test-duplicate-resources-expected.webarchive:
32+
* webarchive/test-frameset-expected.webarchive:
33+
* webarchive/test-img-src-expected.webarchive:
34+
* webarchive/test-input-src-expected.webarchive:
35+
* webarchive/test-link-href-expected.webarchive:
36+
* webarchive/test-link-rel-icon-expected.webarchive:
37+
* webarchive/test-object-data-expected.webarchive:
38+
* webarchive/test-script-src-expected.webarchive:
39+
* webarchive/test-table-background-expected.webarchive:
40+
* webarchive/test-td-background-expected.webarchive:
41+
142
2010-07-15 Geoffrey Garen <ggaren@apple.com>
243

344
Reviewed by Maciej Stachowiak.

‎LayoutTests/editing/deleting/delete-br-in-last-table-cell-expected.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ deleteCommand();
2121
<#text>
2222
</#text>
2323
</HEAD>
24+
<#text>
25+
26+
</#text>
2427
<BODY>
2528
<#text>
2629
</#text>

‎LayoutTests/fast/innerHTML/005-expected.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ Content:
22
<head>
33
<meta name="description" content="This tests html output">
44
<title>html innerHTML test</title>
5-
</head><body>
5+
</head>
6+
<body>
67
<span>Content:</span>
78
<pre id="content">placeholder</pre>
89
<div></div>

‎LayoutTests/html5lib/resources/webkit01.dat‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,3 +408,25 @@ console.log("FOO<span>BAR</span>BAZ");
408408
| <nobr>
409409
| "a"
410410
| <nobr>
411+
412+
#data
413+
<head></head>
414+
<body></body>
415+
#errors
416+
#document
417+
| <html>
418+
| <head>
419+
| "
420+
"
421+
| <body>
422+
423+
#data
424+
<head></head> <style></style>ddd
425+
#errors
426+
#document
427+
| <html>
428+
| <head>
429+
| <style>
430+
| " "
431+
| <body>
432+
| "ddd"

‎LayoutTests/html5lib/runner-expected.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4377,7 +4377,7 @@ resources/webkit01.dat:
43774377
31
43784378
33
43794379

4380-
Test 20 of 33 in resources/webkit01.dat failed. Input:
4380+
Test 20 of 35 in resources/webkit01.dat failed. Input:
43814381
<body></br foo="bar"></body>
43824382
Got:
43834383
| <html>
@@ -4391,7 +4391,7 @@ Expected:
43914391
| <body>
43924392
| <br>
43934393

4394-
Test 22 of 33 in resources/webkit01.dat failed. Input:
4394+
Test 22 of 35 in resources/webkit01.dat failed. Input:
43954395
<body></body></br foo="bar">
43964396
Got:
43974397
| <html>
@@ -4405,7 +4405,7 @@ Expected:
44054405
| <body>
44064406
| <br>
44074407

4408-
Test 24 of 33 in resources/webkit01.dat failed. Input:
4408+
Test 24 of 35 in resources/webkit01.dat failed. Input:
44094409
<html><body></body></html><!-- Hi there -->
44104410
Got:
44114411
| <html>
@@ -4418,7 +4418,7 @@ Expected:
44184418
| <body>
44194419
| <!-- Hi there -->
44204420

4421-
Test 26 of 33 in resources/webkit01.dat failed. Input:
4421+
Test 26 of 35 in resources/webkit01.dat failed. Input:
44224422
<html><body></body></html>x<!-- Hi there --></html><!-- Again -->
44234423
Got:
44244424
| <html>
@@ -4435,7 +4435,7 @@ Expected:
44354435
| <!-- Hi there -->
44364436
| <!-- Again -->
44374437

4438-
Test 27 of 33 in resources/webkit01.dat failed. Input:
4438+
Test 27 of 35 in resources/webkit01.dat failed. Input:
44394439
<html><body></body></html>x<!-- Hi there --></body></html><!-- Again -->
44404440
Got:
44414441
| <html>
@@ -4452,7 +4452,7 @@ Expected:
44524452
| <!-- Hi there -->
44534453
| <!-- Again -->
44544454

4455-
Test 28 of 33 in resources/webkit01.dat failed. Input:
4455+
Test 28 of 35 in resources/webkit01.dat failed. Input:
44564456
<html><body><ruby><div><rp>xx</rp></div></ruby></body></html>
44574457
Got:
44584458
| <html>
@@ -4471,7 +4471,7 @@ Expected:
44714471
| <rp>
44724472
| "xx"
44734473

4474-
Test 29 of 33 in resources/webkit01.dat failed. Input:
4474+
Test 29 of 35 in resources/webkit01.dat failed. Input:
44754475
<html><body><ruby><div><rt>xx</rt></div></ruby></body></html>
44764476
Got:
44774477
| <html>
@@ -4490,7 +4490,7 @@ Expected:
44904490
| <rt>
44914491
| "xx"
44924492

4493-
Test 30 of 33 in resources/webkit01.dat failed. Input:
4493+
Test 30 of 35 in resources/webkit01.dat failed. Input:
44944494
<html><frameset><!--1--><noframes>A</noframes><!--2--></frameset><!--3--><noframes>B</noframes><!--4--></html><!--5--><noframes>C</noframes><!--6-->
44954495
Got:
44964496
| <html>
@@ -4520,7 +4520,7 @@ Expected:
45204520
| <!-- 5 -->
45214521
| <!-- 6 -->
45224522

4523-
Test 31 of 33 in resources/webkit01.dat failed. Input:
4523+
Test 31 of 35 in resources/webkit01.dat failed. Input:
45244524
<select><option>A<select><option>B<select><option>C<select><option>D<select><option>E<select><option>F<select><option>G<select>
45254525
Got:
45264526
| <html>
@@ -4564,7 +4564,7 @@ Expected:
45644564
| <option>
45654565
| "G"
45664566

4567-
Test 33 of 33 in resources/webkit01.dat failed. Input:
4567+
Test 33 of 35 in resources/webkit01.dat failed. Input:
45684568
<div><b></div><div><nobr>a<nobr>
45694569
Got:
45704570
| <html>

‎LayoutTests/http/tests/webarchive/cross-origin-stylesheet-crash-expected.webarchive‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ if (window.layoutTestController)
1111
layoutTestController.dumpDOMAsWebArchive();
1212
&lt;/script&gt;
1313
&lt;link rel="stylesheet" href="http://localhost:8000/webarchive/resources/localhost-stylesheet.css" type="text/css"&gt;
14-
&lt;/head&gt;&lt;body&gt;
14+
&lt;/head&gt;
15+
&lt;body&gt;
1516
This HTML links to an external stylesheet from a different security origin.&lt;br&gt;
1617
Making a webarchive of this page should not crash.
1718

‎LayoutTests/http/tests/webarchive/test-css-url-encoding-expected.webarchive‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
if (window.layoutTestController)
1414
layoutTestController.dumpDOMAsWebArchive();
1515
&lt;/script&gt;
16-
&lt;/head&gt;&lt;body&gt;
16+
&lt;/head&gt;
17+
&lt;body&gt;
1718
&lt;div&gt;
1819
Test for &lt;a href="https://bugs.webkit.org/show_bug.cgi?id=11850"&gt;Bug 11850:
1920
Webarchive fails to save images referenced in CSS&lt;/a&gt;

‎LayoutTests/http/tests/webarchive/test-css-url-encoding-shift-jis-expected.webarchive‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
if (window.layoutTestController)
1616
layoutTestController.dumpDOMAsWebArchive();
1717
&lt;/script&gt;
18-
&lt;/head&gt;&lt;body&gt;
18+
&lt;/head&gt;
19+
&lt;body&gt;
1920
&lt;div&gt;
2021
Test for &lt;a href="https://bugs.webkit.org/show_bug.cgi?id=11850"&gt;Bug 11850:
2122
Webarchive fails to save images referenced in CSS&lt;/a&gt;

‎LayoutTests/http/tests/webarchive/test-css-url-encoding-utf-8-expected.webarchive‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
if (window.layoutTestController)
1616
layoutTestController.dumpDOMAsWebArchive();
1717
&lt;/script&gt;
18-
&lt;/head&gt;&lt;body&gt;
18+
&lt;/head&gt;
19+
&lt;body&gt;
1920
&lt;div&gt;
2021
Test for &lt;a href="https://bugs.webkit.org/show_bug.cgi?id=11850"&gt;Bug 11850:
2122
Webarchive fails to save images referenced in CSS&lt;/a&gt;

‎LayoutTests/platform/mac/css2.1/t1204-root-e-expected.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ layer at (0,0) size 800x94
55
RenderBlock (anonymous) at (0,0) size 800x0
66
RenderInline (generated) at (0,0) size 0x0
77
RenderText at (0,0) size 0x0
8+
RenderText {#text} at (0,0) size 0x0
89
RenderBody {BODY} at (8,16) size 784x70
910
RenderBlock {P} at (0,0) size 784x18
1011
RenderText {#text} at (0,0) size 216x18

0 commit comments

Comments
 (0)