Changeset 63517 in webkit
- Timestamp:
- Jul 15, 2010 10:16:18 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r63515 r63517 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 1 42 2010-07-15 Geoffrey Garen <ggaren@apple.com> 2 43 -
trunk/LayoutTests/editing/deleting/delete-br-in-last-table-cell-expected.txt
r63403 r63517 22 22 </#text> 23 23 </HEAD> 24 <#text> 25 26 </#text> 24 27 <BODY> 25 28 <#text> -
trunk/LayoutTests/fast/innerHTML/005-expected.txt
r14516 r63517 3 3 <meta name="description" content="This tests html output"> 4 4 <title>html innerHTML test</title> 5 </head><body> 5 </head> 6 <body> 6 7 <span>Content:</span> 7 8 <pre id="content">placeholder</pre> -
trunk/LayoutTests/html5lib/resources/webkit01.dat
r62623 r63517 409 409 | "a" 410 410 | <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" -
trunk/LayoutTests/html5lib/runner-expected.txt
r63472 r63517 4378 4378 33 4379 4379 4380 Test 20 of 3 3in resources/webkit01.dat failed. Input:4380 Test 20 of 35 in resources/webkit01.dat failed. Input: 4381 4381 <body></br foo="bar"></body> 4382 4382 Got: … … 4392 4392 | <br> 4393 4393 4394 Test 22 of 3 3in resources/webkit01.dat failed. Input:4394 Test 22 of 35 in resources/webkit01.dat failed. Input: 4395 4395 <body></body></br foo="bar"> 4396 4396 Got: … … 4406 4406 | <br> 4407 4407 4408 Test 24 of 3 3in resources/webkit01.dat failed. Input:4408 Test 24 of 35 in resources/webkit01.dat failed. Input: 4409 4409 <html><body></body></html><!-- Hi there --> 4410 4410 Got: … … 4419 4419 | <!-- Hi there --> 4420 4420 4421 Test 26 of 3 3in resources/webkit01.dat failed. Input:4421 Test 26 of 35 in resources/webkit01.dat failed. Input: 4422 4422 <html><body></body></html>x<!-- Hi there --></html><!-- Again --> 4423 4423 Got: … … 4436 4436 | <!-- Again --> 4437 4437 4438 Test 27 of 3 3in resources/webkit01.dat failed. Input:4438 Test 27 of 35 in resources/webkit01.dat failed. Input: 4439 4439 <html><body></body></html>x<!-- Hi there --></body></html><!-- Again --> 4440 4440 Got: … … 4453 4453 | <!-- Again --> 4454 4454 4455 Test 28 of 3 3in resources/webkit01.dat failed. Input:4455 Test 28 of 35 in resources/webkit01.dat failed. Input: 4456 4456 <html><body><ruby><div><rp>xx</rp></div></ruby></body></html> 4457 4457 Got: … … 4472 4472 | "xx" 4473 4473 4474 Test 29 of 3 3in resources/webkit01.dat failed. Input:4474 Test 29 of 35 in resources/webkit01.dat failed. Input: 4475 4475 <html><body><ruby><div><rt>xx</rt></div></ruby></body></html> 4476 4476 Got: … … 4491 4491 | "xx" 4492 4492 4493 Test 30 of 3 3in resources/webkit01.dat failed. Input:4493 Test 30 of 35 in resources/webkit01.dat failed. Input: 4494 4494 <html><frameset><!--1--><noframes>A</noframes><!--2--></frameset><!--3--><noframes>B</noframes><!--4--></html><!--5--><noframes>C</noframes><!--6--> 4495 4495 Got: … … 4521 4521 | <!-- 6 --> 4522 4522 4523 Test 31 of 3 3in resources/webkit01.dat failed. Input:4523 Test 31 of 35 in resources/webkit01.dat failed. Input: 4524 4524 <select><option>A<select><option>B<select><option>C<select><option>D<select><option>E<select><option>F<select><option>G<select> 4525 4525 Got: … … 4565 4565 | "G" 4566 4566 4567 Test 33 of 3 3in resources/webkit01.dat failed. Input:4567 Test 33 of 35 in resources/webkit01.dat failed. Input: 4568 4568 <div><b></div><div><nobr>a<nobr> 4569 4569 Got: -
trunk/LayoutTests/http/tests/webarchive/cross-origin-stylesheet-crash-expected.webarchive
r50779 r63517 12 12 </script> 13 13 <link rel="stylesheet" href="http://localhost:8000/webarchive/resources/localhost-stylesheet.css" type="text/css"> 14 </head><body> 14 </head> 15 <body> 15 16 This HTML links to an external stylesheet from a different security origin.<br> 16 17 Making a webarchive of this page should not crash. -
trunk/LayoutTests/http/tests/webarchive/test-css-url-encoding-expected.webarchive
r39576 r63517 14 14 layoutTestController.dumpDOMAsWebArchive(); 15 15 </script> 16 </head><body> 16 </head> 17 <body> 17 18 <div> 18 19 Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=11850">Bug 11850: -
trunk/LayoutTests/http/tests/webarchive/test-css-url-encoding-shift-jis-expected.webarchive
r39576 r63517 16 16 layoutTestController.dumpDOMAsWebArchive(); 17 17 </script> 18 </head><body> 18 </head> 19 <body> 19 20 <div> 20 21 Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=11850">Bug 11850: -
trunk/LayoutTests/http/tests/webarchive/test-css-url-encoding-utf-8-expected.webarchive
r39576 r63517 16 16 layoutTestController.dumpDOMAsWebArchive(); 17 17 </script> 18 </head><body> 18 </head> 19 <body> 19 20 <div> 20 21 Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=11850">Bug 11850: -
trunk/LayoutTests/platform/mac/css2.1/t1204-root-e-expected.txt
r25970 r63517 6 6 RenderInline (generated) at (0,0) size 0x0 7 7 RenderText at (0,0) size 0x0 8 RenderText {#text} at (0,0) size 0x0 8 9 RenderBody {BODY} at (8,16) size 784x70 9 10 RenderBlock {P} at (0,0) size 784x18 -
trunk/LayoutTests/platform/mac/fast/css/empty-generated-content-expected.txt
r63403 r63517 3 3 layer at (0,0) size 800x34 4 4 RenderBlock {HTML} at (0,0) size 800x34 5 RenderBlock (anonymous) at (0,0) size 800x0 6 RenderText {#text} at (0,0) size 0x0 5 7 RenderBody {BODY} at (8,8) size 784x18 6 8 RenderText {#text} at (0,0) size 211x18 -
trunk/LayoutTests/traversal/exception-forwarding-expected.txt
r30089 r63517 14 14 PASS w.nextSibling() threw exception Roses. 15 15 PASS w.previousSibling() is null 16 PASS w.nextSibling() is document.body 17 PASS w.previousSibling() is document. body.previousSibling16 PASS w.nextSibling() is document.body.previousSibling 17 PASS w.previousSibling() is document.head 18 18 PASS iteration is 11 19 19 PASS successfullyParsed is true -
trunk/LayoutTests/traversal/script-tests/exception-forwarding.js
r48553 r63517 24 24 shouldThrow("w.nextSibling()"); // 9 25 25 shouldBe("w.previousSibling()", "null"); 26 shouldBe("w.nextSibling()", "document.body "); // 1027 shouldBe("w.previousSibling()", "document. body.previousSibling"); // 1126 shouldBe("w.nextSibling()", "document.body.previousSibling"); // 10 27 shouldBe("w.previousSibling()", "document.head"); // 11 28 28 shouldBe("iteration", "11"); 29 29 -
trunk/LayoutTests/webarchive/adopt-attribute-styled-body-webarchive-expected.webarchive
r43215 r63517 64 64 65 65 </script> 66 </head><body onload="startTest();"> 66 </head> 67 68 <body onload="startTest();"> 67 69 <span id="testSpan">This test takes a body with inline link color styling from a second window, moves it to the document of an iframe, makes sure the 68 70 second window has closed, then makes a WebArchive. The test passes if it doesn't crash. If running the test in Safari then garbage collection might get in the -
trunk/LayoutTests/webarchive/adopt-attribute-styled-node-webarchive-expected.webarchive
r42955 r63517 64 64 65 65 </script> 66 </head><body onload="startTest();"> 66 </head> 67 68 <body onload="startTest();"> 67 69 <span id="testSpan">This test takes a node with mapped style attributes from a different document, moves it to this document, makes sure the other document has closed, 68 70 then makes a WebArchive from this document. The test passes if it doesn't crash. If running the test in Safari then garbage collection might get in the -
trunk/LayoutTests/webarchive/adopt-inline-styled-node-webarchive-expected.webarchive
r42955 r63517 64 64 65 65 </script> 66 </head><body onload="startTest();"> 66 </head> 67 68 <body onload="startTest();"> 67 69 <span id="testSpan">This test takes a node with inline style from a different document, moves it to this document, makes sure the other document has closed, 68 70 then makes a WebArchive from this document. The test passes if it doesn't crash. If running the test in Safari then garbage collection might get in the -
trunk/LayoutTests/webarchive/archive-empty-frame-dom-expected.webarchive
r61234 r63517 12 12 layoutTestController.dumpDOMAsWebArchive(); 13 13 </script> 14 </head><body> 14 </head> 15 <body> 15 16 16 17 <p> -
trunk/LayoutTests/webarchive/archive-with-unencoded-url-expected.webarchive
r35076 r63517 11 11 layoutTestController.dumpDOMAsWebArchive(); 12 12 </script> 13 </head><body> 13 </head> 14 <body> 14 15 <form> 15 16 <input type="image" src="resources/apple.gif?foo|bar"> -
trunk/LayoutTests/webarchive/test-body-background-expected.webarchive
r35076 r63517 11 11 layoutTestController.dumpDOMAsWebArchive(); 12 12 </script> 13 </head><body background="resources/apple.gif"> 13 </head> 14 <body background="resources/apple.gif"> 14 15 15 16 -
trunk/LayoutTests/webarchive/test-css-import-expected.webarchive
r35076 r63517 15 15 @import url('resources/test-css-import.css'); 16 16 </style> 17 </head><body> 17 </head> 18 <body> 18 19 <div class="blue">This text should be blue.</div> 19 20 <div class="red">This text should be red.</div> -
trunk/LayoutTests/webarchive/test-css-url-resources-in-stylesheets-expected.webarchive
r39441 r63517 135 135 136 136 </style> 137 </head><body onload="notifyDone()"> 137 </head> 138 <body onload="notifyDone()"> 138 139 <div><p>This page tests that url() resources referenced in CSS stylesheets are saved in webarchives.</p></div> 139 140 <div class="background">This element should have one Apple logo in the background at the top left.</div> -
trunk/LayoutTests/webarchive/test-css-url-resources-inline-styles-expected.webarchive
r39441 r63517 29 29 } 30 30 </style> 31 </head><body onload="notifyDone()"> 31 </head> 32 <body onload="notifyDone()"> 32 33 <div><p>This page tests that url() resources referenced in CSS stylesheets are saved in webarchives.</p></div> 33 34 <div style="border: solid black 1px; height: 64px; background: url(resources/apple.gif?background) no-repeat top left;">This element should have one Apple logo in the background at the top left.</div> -
trunk/LayoutTests/webarchive/test-duplicate-resources-expected.webarchive
r36704 r63517 11 11 <script src="resources/dump-webarchive.js" language="javascript" type="text/javascript"></script> 12 12 <link rel="stylesheet" href="resources/test-style.css" type="text/css"> 13 </head><body> 13 </head> 14 <body> 14 15 <div> 15 16 <img src="resources/apple.gif"> … … 42 43 <string><html><head> 43 44 <link rel="stylesheet" href="test-style.css" type="text/css"> 44 </head><body> 45 </head> 46 <body> 45 47 <div> 46 48 <img src="apple.gif"> -
trunk/LayoutTests/webarchive/test-frameset-expected.webarchive
r35076 r63517 11 11 layoutTestController.dumpDOMAsWebArchive(); 12 12 </script> 13 </head><frameset rows="*"> 13 </head> 14 <frameset rows="*"> 14 15 <frame src="resources/test-frame.html" name="myframe"> 15 16 </frameset></html></string> … … 31 32 <string><html><head> 32 33 <link rel="stylesheet" href="test-style.css" type="text/css"> 33 </head><body> 34 </head> 35 <body> 34 36 <div> 35 37 <img src="apple.gif"> -
trunk/LayoutTests/webarchive/test-img-src-expected.webarchive
r35076 r63517 11 11 layoutTestController.dumpDOMAsWebArchive(); 12 12 </script> 13 </head><body> 13 </head> 14 <body> 14 15 <img src="resources/apple.gif"> 15 16 -
trunk/LayoutTests/webarchive/test-input-src-expected.webarchive
r35076 r63517 11 11 layoutTestController.dumpDOMAsWebArchive(); 12 12 </script> 13 </head><body> 13 </head> 14 <body> 14 15 <form> 15 16 <input type="image" src="resources/apple.gif"> -
trunk/LayoutTests/webarchive/test-link-href-expected.webarchive
r35076 r63517 12 12 </script> 13 13 <link rel="stylesheet" href="resources/test-style.css" type="text/css"> 14 </head><body> 14 </head> 15 <body> 15 16 <div> 16 17 This text should be red sans-serif. -
trunk/LayoutTests/webarchive/test-link-rel-icon-expected.webarchive
r43499 r63517 18 18 </script> 19 19 <link rel="icon" href="resources/favicon.ico" type="image/x-icon"> 20 </head><body onload="runTest()"> 20 </head> 21 <body onload="runTest()"> 21 22 22 23 -
trunk/LayoutTests/webarchive/test-object-data-expected.webarchive
r35076 r63517 11 11 layoutTestController.dumpDOMAsWebArchive(); 12 12 </script> 13 </head><body> 13 </head> 14 <body> 14 15 <object data="resources/apple.gif" type="image/gif"></object> 15 16 -
trunk/LayoutTests/webarchive/test-script-src-expected.webarchive
r36704 r63517 8 8 <string><html><head> 9 9 <script src="resources/dump-webarchive.js" type="text/javascript"></script> 10 </head><body> 10 </head> 11 <body> 11 12 12 13 -
trunk/LayoutTests/webarchive/test-table-background-expected.webarchive
r35076 r63517 11 11 layoutTestController.dumpDOMAsWebArchive(); 12 12 </script> 13 </head><body> 13 </head> 14 <body> 14 15 <table background="resources/apple.gif" style="width: 52px; height: 64px;"> 15 16 <tbody><tr> -
trunk/LayoutTests/webarchive/test-td-background-expected.webarchive
r35076 r63517 11 11 layoutTestController.dumpDOMAsWebArchive(); 12 12 </script> 13 </head><body> 13 </head> 14 <body> 14 15 <table> 15 16 <tbody><tr> -
trunk/WebCore/ChangeLog
r63516 r63517 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 Insert these whitespace text nodes into the HTML element between <head> 9 and <body>, as required by HTML5. Previously, we just dropped them on 10 the floor. 11 12 * html/LegacyHTMLTreeBuilder.cpp: 13 (WebCore::LegacyHTMLTreeBuilder::handleError): 14 1 15 2010-07-15 Victor Wang <victorw@chromium.org> 2 16 -
trunk/WebCore/html/LegacyHTMLTreeBuilder.cpp
r63472 r63517 284 284 if (previousChild && previousChild->isTextNode()) { 285 285 // Only coalesce text nodes if the text node wouldn't be foster parented. 286 if (!m_current->hasTagName(tableTag) 286 if (!m_current->hasTagName(htmlTag) 287 && !m_current->hasTagName(tableTag) 287 288 && !m_current->hasTagName(trTag) 288 289 && !m_current->hasTagName(theadTag) … … 589 590 if (n->isTextNode()) { 590 591 Text* t = static_cast<Text*>(n); 591 if (t->containsOnlyWhitespace()) 592 if (t->containsOnlyWhitespace()) { 593 if (m_head && !m_inBody) { 594 // We're between </head> and <body>. According to 595 // the HTML5 parsing algorithm, we're supposed to 596 // insert whitespace text nodes into the HTML element. 597 ExceptionCode ec; 598 m_current->appendChild(n, ec); 599 return true; 600 } 592 601 return false; 602 } 593 603 } 594 604 if (!m_haveFrameSet) {
Note: See TracChangeset
for help on using the changeset viewer.