Changeset 62623 in webkit
- Timestamp:
- Jul 6, 2010 10:05:28 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r62622 r62623 1 2010-07-06 Eric Seidel <eric@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 Fix <nobr><nobr> case in HTMLTreeBuilder 6 https://bugs.webkit.org/show_bug.cgi?id=41735 7 8 * html5lib/runner-expected-html5.txt: 9 1 10 2010-07-06 Kent Tamura <tkent@chromium.org> 2 11 -
trunk/LayoutTests/html5lib/resources/webkit01.dat
r62603 r62623 394 394 | <li> 395 395 | <li> 396 397 #data 398 <div><b></div><div><nobr>a<nobr> 399 #errors 400 #document 401 | <html> 402 | <head> 403 | <body> 404 | <div> 405 | <b> 406 | <div> 407 | <b> 408 | <nobr> 409 | "a" 410 | <nobr> -
trunk/LayoutTests/html5lib/runner-expected-html5.txt
r62621 r62623 367 367 17 368 368 18 369 20370 21371 369 22 372 370 … … 429 427 | " 430 428 foo" 431 432 Test 20 of 23 in resources/tests3.dat failed. Input:433 <!doctype html><nobr><nobr><nobr>434 Got:435 | <!DOCTYPE html>436 | <html>437 | <head>438 | <body>439 | <nobr>440 | <nobr>441 | <nobr>442 Expected:443 | <!DOCTYPE html>444 | <html>445 | <head>446 | <body>447 | <nobr>448 | <nobr>449 | <nobr>450 451 Test 21 of 23 in resources/tests3.dat failed. Input:452 <!doctype html><nobr><nobr></nobr><nobr>453 Got:454 | <!DOCTYPE html>455 | <html>456 | <head>457 | <body>458 | <nobr>459 | <nobr>460 | <nobr>461 Expected:462 | <!DOCTYPE html>463 | <html>464 | <head>465 | <body>466 | <nobr>467 | <nobr>468 | <nobr>469 429 470 430 Test 22 of 23 in resources/tests3.dat failed. Input: -
trunk/LayoutTests/html5lib/runner-expected.txt
r62613 r62623 4698 4698 30 4699 4699 31 4700 4701 Test 15 of 32 in resources/webkit01.dat failed. Input: 4700 33 4701 4702 Test 15 of 33 in resources/webkit01.dat failed. Input: 4702 4703 <p>Test</p<p>Test2</p> 4703 4704 Got: … … 4715 4716 | "TestTest2" 4716 4717 4717 Test 17 of 3 2in resources/webkit01.dat failed. Input:4718 Test 17 of 33 in resources/webkit01.dat failed. Input: 4718 4719 <A>test< /A> 4719 4720 Got: … … 4731 4732 | "test< /A>" 4732 4733 4733 Test 20 of 3 2in resources/webkit01.dat failed. Input:4734 Test 20 of 33 in resources/webkit01.dat failed. Input: 4734 4735 <body></br foo="bar"></body> 4735 4736 Got: … … 4745 4746 | <br> 4746 4747 4747 Test 22 of 3 2in resources/webkit01.dat failed. Input:4748 Test 22 of 33 in resources/webkit01.dat failed. Input: 4748 4749 <body></body></br foo="bar"> 4749 4750 Got: … … 4759 4760 | <br> 4760 4761 4761 Test 24 of 3 2in resources/webkit01.dat failed. Input:4762 Test 24 of 33 in resources/webkit01.dat failed. Input: 4762 4763 <html><body></body></html><!-- Hi there --> 4763 4764 Got: … … 4772 4773 | <!-- Hi there --> 4773 4774 4774 Test 26 of 3 2in resources/webkit01.dat failed. Input:4775 Test 26 of 33 in resources/webkit01.dat failed. Input: 4775 4776 <html><body></body></html>x<!-- Hi there --></html><!-- Again --> 4776 4777 Got: … … 4789 4790 | <!-- Again --> 4790 4791 4791 Test 27 of 3 2in resources/webkit01.dat failed. Input:4792 Test 27 of 33 in resources/webkit01.dat failed. Input: 4792 4793 <html><body></body></html>x<!-- Hi there --></body></html><!-- Again --> 4793 4794 Got: … … 4806 4807 | <!-- Again --> 4807 4808 4808 Test 28 of 3 2in resources/webkit01.dat failed. Input:4809 Test 28 of 33 in resources/webkit01.dat failed. Input: 4809 4810 <html><body><ruby><div><rp>xx</rp></div></ruby></body></html> 4810 4811 Got: … … 4825 4826 | "xx" 4826 4827 4827 Test 29 of 3 2in resources/webkit01.dat failed. Input:4828 Test 29 of 33 in resources/webkit01.dat failed. Input: 4828 4829 <html><body><ruby><div><rt>xx</rt></div></ruby></body></html> 4829 4830 Got: … … 4844 4845 | "xx" 4845 4846 4846 Test 30 of 3 2in resources/webkit01.dat failed. Input:4847 Test 30 of 33 in resources/webkit01.dat failed. Input: 4847 4848 <html><frameset><!--1--><noframes>A</noframes><!--2--></frameset><!--3--><noframes>B</noframes><!--4--></html><!--5--><noframes>C</noframes><!--6--> 4848 4849 Got: … … 4874 4875 | <!-- 6 --> 4875 4876 4876 Test 31 of 3 2in resources/webkit01.dat failed. Input:4877 Test 31 of 33 in resources/webkit01.dat failed. Input: 4877 4878 <select><option>A<select><option>B<select><option>C<select><option>D<select><option>E<select><option>F<select><option>G<select> 4878 4879 Got: … … 4917 4918 | <option> 4918 4919 | "G" 4920 4921 Test 33 of 33 in resources/webkit01.dat failed. Input: 4922 <div><b></div><div><nobr>a<nobr> 4923 Got: 4924 | <html> 4925 | <head> 4926 | <body> 4927 | <div> 4928 | <b> 4929 | <b> 4930 | <div> 4931 | <nobr> 4932 | "a" 4933 | <nobr> 4934 Expected: 4935 | <html> 4936 | <head> 4937 | <body> 4938 | <div> 4939 | <b> 4940 | <div> 4941 | <b> 4942 | <nobr> 4943 | "a" 4944 | <nobr> 4919 4945 resources/doctype01.dat: PASS 4920 4946 -
trunk/LayoutTests/html5lib/webkit-resumer-expected.txt
r62520 r62623 814 814 1363.125 815 815 1364.126 816 1392.1 817 1393.2 818 1394.3 819 1395.4 820 1396.5 821 1397.6 822 1398.7 823 1399.8 824 1400.9 825 1401.10 826 1402.11 827 1403.12 828 1404.13 829 1405.14 830 1406.15 831 1407.16 832 1408.17 833 1409.18 834 1410.19 835 1411.20 836 1412.21 837 1413.22 838 1414.23 839 1415.24 840 1416.25 841 1417.26 842 1418.27 843 1419.28 844 1420.29 845 1421.30 846 1422.31 -
trunk/WebCore/ChangeLog
r62621 r62623 1 2010-07-06 Eric Seidel <eric@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 Fix <nobr><nobr> case in HTMLTreeBuilder 6 https://bugs.webkit.org/show_bug.cgi?id=41735 7 8 We were both not handling <nobr> correctly, as well as 9 never hitting the <nobr> case because our formatting 10 elements check was overzealous. 11 12 * html/HTMLTreeBuilder.cpp: 13 (WebCore::HTMLTreeBuilder::processStartTagForInBody): 14 1 15 2010-07-06 Adam Barth <abarth@webkit.org> 2 16 -
trunk/WebCore/html/HTMLTreeBuilder.cpp
r62621 r62623 185 185 } 186 186 187 bool isNonAnchor FormattingTag(const AtomicString& tagName)187 bool isNonAnchorNonNobrFormattingTag(const AtomicString& tagName) 188 188 { 189 189 return tagName == bTag … … 193 193 || tagName == fontTag 194 194 || tagName == iTag 195 || tagName == nobrTag196 195 || tagName == sTag 197 196 || tagName == smallTag … … 200 199 || tagName == ttTag 201 200 || tagName == uTag; 201 } 202 203 bool isNonAnchorFormattingTag(const AtomicString& tagName) 204 { 205 return tagName == nobrTag 206 || isNonAnchorNonNobrFormattingTag(tagName); 202 207 } 203 208 … … 652 657 return; 653 658 } 654 if (isNonAnchor FormattingTag(token.name())) {659 if (isNonAnchorNonNobrFormattingTag(token.name())) { 655 660 m_tree.reconstructTheActiveFormattingElements(); 656 661 m_tree.insertFormattingElement(token); … … 659 664 if (token.name() == nobrTag) { 660 665 m_tree.reconstructTheActiveFormattingElements(); 661 notImplemented(); 666 if (m_tree.openElements()->inScope(nobrTag)) { 667 parseError(token); 668 processFakeEndTag(nobrTag); 669 m_tree.reconstructTheActiveFormattingElements(); 670 } 662 671 m_tree.insertFormattingElement(token); 663 672 return;
Note: See TracChangeset
for help on using the changeset viewer.