Changeset 62901 in webkit
- Timestamp:
- Jul 8, 2010 11:58:41 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r62899 r62901 1 2010-07-08 Eric Seidel <eric@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 Unwrap a few || blocks for easier readability 6 https://bugs.webkit.org/show_bug.cgi?id=41838 7 8 No functional change, thus no tests. 9 10 * html/HTMLTreeBuilder.cpp: 11 (WebCore::HTMLTreeBuilder::adjustedLexerState): 12 (WebCore::HTMLTreeBuilder::processStartTagForInBody): 13 (WebCore::HTMLTreeBuilder::processStartTagForInTable): 14 (WebCore::HTMLTreeBuilder::processStartTag): 15 (WebCore::HTMLTreeBuilder::processEndTagForInBody): 16 (WebCore::HTMLTreeBuilder::processEndTag): 17 (WebCore::HTMLTreeBuilder::processComment): 18 (WebCore::HTMLTreeBuilder::processStartTagForInHead): 19 1 20 2010-07-08 Sam Magnuson <smagnuson@netflix.com> 2 21 -
trunk/WebCore/html/HTMLTreeBuilder.cpp
r62891 r62901 359 359 return HTMLTokenizer::RCDATAState; 360 360 361 if (tagName == styleTag || tagName == iframeTag || tagName == xmpTag || tagName == noembedTag 362 || tagName == noframesTag || (tagName == noscriptTag && isScriptingFlagEnabled(frame))) 361 if (tagName == styleTag 362 || tagName == iframeTag 363 || tagName == xmpTag 364 || tagName == noembedTag 365 || tagName == noframesTag 366 || (tagName == noscriptTag && isScriptingFlagEnabled(frame))) 363 367 return HTMLTokenizer::RAWTEXTState; 364 368 … … 551 555 bool isDdOrDt(const Element* element) 552 556 { 553 return element->hasTagName(ddTag) || element->hasTagName(dtTag); 557 return element->hasTagName(ddTag) 558 || element->hasTagName(dtTag); 554 559 } 555 560 … … 582 587 return; 583 588 } 584 if (token.name() == baseTag || token.name() == "command" || token.name() == linkTag || token.name() == metaTag || token.name() == noframesTag || token.name() == scriptTag || token.name() == styleTag || token.name() == titleTag) { 589 if (token.name() == baseTag 590 || token.name() == "command" 591 || token.name() == linkTag 592 || token.name() == metaTag 593 || token.name() == noframesTag 594 || token.name() == scriptTag 595 || token.name() == styleTag 596 || token.name() == titleTag) { 585 597 bool didProcess = processStartTagForInHead(token); 586 598 ASSERT_UNUSED(didProcess, didProcess); … … 606 618 return; 607 619 } 608 if (token.name() == addressTag || token.name() == articleTag || token.name() == asideTag || token.name() == blockquoteTag || token.name() == centerTag || token.name() == "details" || token.name() == dirTag || token.name() == divTag || token.name() == dlTag || token.name() == fieldsetTag || token.name() == "figure" || token.name() == footerTag || token.name() == headerTag || token.name() == hgroupTag || token.name() == menuTag || token.name() == navTag || token.name() == olTag || token.name() == pTag || token.name() == sectionTag || token.name() == ulTag) { 620 if (token.name() == addressTag 621 || token.name() == articleTag 622 || token.name() == asideTag 623 || token.name() == blockquoteTag 624 || token.name() == centerTag 625 || token.name() == "details" 626 || token.name() == dirTag 627 || token.name() == divTag 628 || token.name() == dlTag 629 || token.name() == fieldsetTag 630 || token.name() == "figure" 631 || token.name() == footerTag 632 || token.name() == headerTag 633 || token.name() == hgroupTag 634 || token.name() == menuTag 635 || token.name() == navTag 636 || token.name() == olTag 637 || token.name() == pTag 638 || token.name() == sectionTag 639 || token.name() == ulTag) { 609 640 processFakePEndTagIfPInScope(); 610 641 m_tree.insertElement(token); … … 691 722 return; 692 723 } 693 if (token.name() == appletTag || token.name() == marqueeTag || token.name() == objectTag) { 724 if (token.name() == appletTag 725 || token.name() == marqueeTag 726 || token.name() == objectTag) { 694 727 m_tree.reconstructTheActiveFormattingElements(); 695 728 m_tree.insertElement(token); … … 712 745 // Note the fall through to the imgTag handling below! 713 746 } 714 if (token.name() == areaTag || token.name() == basefontTag || token.name() == "bgsound" || token.name() == brTag || token.name() == embedTag || token.name() == imgTag || token.name() == inputTag || token.name() == keygenTag || token.name() == wbrTag) { 747 if (token.name() == areaTag 748 || token.name() == basefontTag 749 || token.name() == "bgsound" 750 || token.name() == brTag 751 || token.name() == embedTag 752 || token.name() == imgTag 753 || token.name() == inputTag 754 || token.name() == keygenTag 755 || token.name() == wbrTag) { 715 756 m_tree.reconstructTheActiveFormattingElements(); 716 757 m_tree.insertSelfClosingElement(token); … … 718 759 return; 719 760 } 720 if (token.name() == paramTag || token.name() == sourceTag || token.name() == "track") { 761 if (token.name() == paramTag 762 || token.name() == sourceTag 763 || token.name() == "track") { 721 764 m_tree.insertSelfClosingElement(token); 722 765 return; … … 765 808 m_tree.insertElement(token); 766 809 m_framesetOk = false; 767 if (m_insertionMode == InTableMode || m_insertionMode == InCaptionMode || m_insertionMode == InColumnGroupMode || m_insertionMode == InTableBodyMode || m_insertionMode == InRowMode || m_insertionMode == InCellMode) 810 if (m_insertionMode == InTableMode 811 || m_insertionMode == InCaptionMode 812 || m_insertionMode == InColumnGroupMode 813 || m_insertionMode == InTableBodyMode 814 || m_insertionMode == InRowMode 815 || m_insertionMode == InCellMode) 768 816 m_insertionMode = InSelectInTableMode; 769 817 else … … 866 914 return; 867 915 } 868 if (isTableCellContextTag(token.name()) || token.name() == trTag) { 916 if (isTableCellContextTag(token.name()) 917 || token.name() == trTag) { 869 918 processFakeStartTag(tbodyTag); 870 919 ASSERT(insertionMode() == InTableBodyMode); … … 959 1008 return; 960 1009 } 961 if (token.name() == baseTag || token.name() == linkTag || token.name() == metaTag || token.name() == noframesTag || token.name() == scriptTag || token.name() == styleTag || token.name() == titleTag) { 1010 if (token.name() == baseTag 1011 || token.name() == linkTag 1012 || token.name() == metaTag 1013 || token.name() == noframesTag 1014 || token.name() == scriptTag 1015 || token.name() == styleTag 1016 || token.name() == titleTag) { 962 1017 parseError(token); 963 1018 ASSERT(m_tree.head()); … … 1099 1154 return; 1100 1155 } 1101 if (token.name() == linkTag || token.name() == metaTag || token.name() == noframesTag || token.name() == styleTag) { 1156 if (token.name() == linkTag 1157 || token.name() == metaTag 1158 || token.name() == noframesTag 1159 || token.name() == styleTag) { 1102 1160 bool didProcess = processStartTagForInHead(token); 1103 1161 ASSERT_UNUSED(didProcess, didProcess); … … 1190 1248 return; 1191 1249 } 1192 if (token.name() == inputTag || token.name() == keygenTag || token.name() == textareaTag) { 1250 if (token.name() == inputTag 1251 || token.name() == keygenTag 1252 || token.name() == textareaTag) { 1193 1253 parseError(token); 1194 1254 notImplemented(); // fragment case … … 1540 1600 return; 1541 1601 } 1542 if (token.name() == ddTag || token.name() == dtTag) { 1602 if (token.name() == ddTag 1603 || token.name() == dtTag) { 1543 1604 if (!m_tree.openElements()->inScope(token.name())) { 1544 1605 parseError(token); … … 1572 1633 return; 1573 1634 } 1574 if (token.name() == appletTag || token.name() == marqueeTag || token.name() == objectTag) { 1635 if (token.name() == appletTag 1636 || token.name() == marqueeTag 1637 || token.name() == objectTag) { 1575 1638 if (!m_tree.openElements()->inScope(token.name())) { 1576 1639 parseError(token); … … 1810 1873 return; 1811 1874 } 1812 if (token.name() == tableTag || token.name() == trTag || isTableBodyContextTag(token.name())) { 1875 if (token.name() == tableTag 1876 || token.name() == trTag 1877 || isTableBodyContextTag(token.name())) { 1813 1878 if (!m_tree.openElements()->inTableScope(token.name())) { 1814 1879 ASSERT(m_isParsingFragment); … … 1983 2048 { 1984 2049 ASSERT(token.type() == HTMLToken::Comment); 1985 if (m_insertionMode == InitialMode || m_insertionMode == BeforeHTMLMode || m_insertionMode == AfterAfterBodyMode || m_insertionMode == AfterAfterFramesetMode) { 2050 if (m_insertionMode == InitialMode 2051 || m_insertionMode == BeforeHTMLMode 2052 || m_insertionMode == AfterAfterBodyMode 2053 || m_insertionMode == AfterAfterFramesetMode) { 1986 2054 m_tree.insertCommentOnDocument(token); 1987 2055 return; … … 2223 2291 } 2224 2292 // FIXME: Atomize "command". 2225 if (token.name() == baseTag || token.name() == "command" || token.name() == linkTag || token.name() == metaTag) { 2293 if (token.name() == baseTag 2294 || token.name() == "command" 2295 || token.name() == linkTag 2296 || token.name() == metaTag) { 2226 2297 m_tree.insertSelfClosingElement(token); 2227 2298 // Note: The custom processing for the <meta> tag is done in HTMLMetaElement::process().
Note: See TracChangeset
for help on using the changeset viewer.