Changeset 62579 in webkit
- Timestamp:
- Jul 6, 2010 12:29:54 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r62578 r62579 1 2010-07-06 Adam Barth <abarth@webkit.org> 2 3 Address reviewer comments from https://bugs.webkit.org/show_bug.cgi?id=41671 4 5 Deploy isTableBodyContextTag where possible. No behavior change. 6 7 * html/HTMLTreeBuilder.cpp: 8 (WebCore::HTMLTreeBuilder::processStartTagForInBody): 9 (WebCore::HTMLTreeBuilder::processStartTag): 10 (WebCore::HTMLTreeBuilder::processEndTagForInTable): 11 (WebCore::HTMLTreeBuilder::processEndTag): 12 1 13 2010-07-06 Anders Carlsson <andersca@apple.com> 2 14 -
trunk/WebCore/html/HTMLTreeBuilder.cpp
r62573 r62579 739 739 notImplemented(); 740 740 } 741 if (token.name() == captionTag || token.name() == colTag || token.name() == colgroupTag || token.name() == frameTag || token.name() == headTag || token.name() == tbodyTag || token.name() == tdTag || token.name() == tfootTag || token.name() == thTag || token.name() == theadTag || token.name() == trTag) {741 if (token.name() == captionTag || token.name() == colTag || token.name() == colgroupTag || token.name() == frameTag || token.name() == headTag || isTableBodyContextTag(token.name()) || token.name() == tdTag || token.name() == thTag || token.name() == trTag) { 742 742 parseError(token); 743 743 return; … … 909 909 case InCaptionMode: 910 910 ASSERT(insertionMode() == InCaptionMode); 911 if (token.name() == captionTag || token.name() == colTag || token.name() == colgroupTag || token.name() == tbodyTag || token.name() == tdTag || token.name() == tfootTag || token.name() == thTag || token.name() == theadTag || token.name() == trTag) {911 if (token.name() == captionTag || token.name() == colTag || token.name() == colgroupTag || isTableBodyContextTag(token.name()) || token.name() == tdTag || token.name() == thTag || token.name() == trTag) { 912 912 parseError(token); 913 913 if (!processCaptionEndTagForInCaption()) { … … 959 959 } 960 960 m_openElements.popUntilTableBodyScopeMarker(); 961 ASSERT( currentElement()->tagQName() == tbodyTag || currentElement()->tagQName() == tfootTag || currentElement()->tagQName() == theadTag);961 ASSERT(isTableBodyContextTag(currentElement()->localName())); 962 962 processFakeEndTag(currentElement()->tagQName()); 963 963 processStartTag(token); … … 1061 1061 case InSelectInTableMode: 1062 1062 ASSERT(insertionMode() == InSelectInTableMode); 1063 if (token.name() == captionTag || token.name() == tableTag || token.name() == tbodyTag || token.name() == tfootTag || token.name() == theadTag|| token.name() == trTag || token.name() == tdTag || token.name() == thTag) {1063 if (token.name() == captionTag || token.name() == tableTag || isTableBodyContextTag(token.name()) || token.name() == trTag || token.name() == tdTag || token.name() == thTag) { 1064 1064 parseError(token); 1065 1065 AtomicHTMLToken endSelect(HTMLToken::EndTag, selectTag.localName()); … … 1553 1553 return; 1554 1554 } 1555 if (token.name() == bodyTag || token.name() == captionTag || token.name() == colTag || token.name() == colgroupTag || token.name() == htmlTag || token.name() == tbodyTag || token.name() == tdTag || token.name() == tfootTag || token.name() == thTag || token.name() == theadTag || token.name() == trTag) {1555 if (token.name() == bodyTag || token.name() == captionTag || token.name() == colTag || token.name() == colgroupTag || token.name() == htmlTag || isTableBodyContextTag(token.name()) || token.name() == tdTag || token.name() == thTag || token.name() == trTag) { 1556 1556 parseError(token); 1557 1557 return; … … 1629 1629 return; 1630 1630 } 1631 if (token.name() == bodyTag || token.name() == colTag || token.name() == colgroupTag || token.name() == htmlTag || token.name() == tbodyTag || token.name() == tdTag || token.name() == tfootTag || token.name() == thTag || token.name() == theadTag || token.name() == trTag) {1631 if (token.name() == bodyTag || token.name() == colTag || token.name() == colgroupTag || token.name() == htmlTag || isTableBodyContextTag(token.name()) || token.name() == tdTag || token.name() == thTag || token.name() == trTag) { 1632 1632 parseError(token); 1633 1633 return; … … 1719 1719 case InTableBodyMode: 1720 1720 ASSERT(insertionMode() == InTableBodyMode); 1721 if ( token.name() == tbodyTag || token.name() == tfootTag || token.name() == theadTag) {1721 if (isTableBodyContextTag(token.name())) { 1722 1722 if (!m_openElements.inTableScope(token.name())) { 1723 1723 parseError(token); … … 1737 1737 } 1738 1738 m_openElements.popUntilTableBodyScopeMarker(); 1739 ASSERT( currentElement()->tagQName() == tbodyTag || currentElement()->tagQName() == tfootTag || currentElement()->tagQName() == theadTag);1739 ASSERT(isTableBodyContextTag(currentElement()->localName())); 1740 1740 processFakeEndTag(currentElement()->tagQName()); 1741 1741 processEndTag(token); … … 1820 1820 case InSelectInTableMode: 1821 1821 ASSERT(insertionMode() == InSelectInTableMode); 1822 if (token.name() == captionTag || token.name() == tableTag || token.name() == tbodyTag || token.name() == tfootTag || token.name() == theadTag|| token.name() == trTag || token.name() == tdTag || token.name() == thTag) {1822 if (token.name() == captionTag || token.name() == tableTag || isTableBodyContextTag(token.name()) || token.name() == trTag || token.name() == tdTag || token.name() == thTag) { 1823 1823 parseError(token); 1824 1824 if (m_openElements.inTableScope(token.name())) {
Note: See TracChangeset
for help on using the changeset viewer.