Changeset 62579 in webkit


Ignore:
Timestamp:
Jul 6, 2010 12:29:54 PM (14 years ago)
Author:
abarth@webkit.org
Message:

2010-07-06 Adam Barth <abarth@webkit.org>

Address reviewer comments from https://bugs.webkit.org/show_bug.cgi?id=41671

Deploy isTableBodyContextTag where possible. No behavior change.

  • html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::processStartTagForInBody): (WebCore::HTMLTreeBuilder::processStartTag): (WebCore::HTMLTreeBuilder::processEndTagForInTable): (WebCore::HTMLTreeBuilder::processEndTag):
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r62578 r62579  
     12010-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
    1132010-07-06  Anders Carlsson  <andersca@apple.com>
    214
  • trunk/WebCore/html/HTMLTreeBuilder.cpp

    r62573 r62579  
    739739        notImplemented();
    740740    }
    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) {
    742742        parseError(token);
    743743        return;
     
    909909    case InCaptionMode:
    910910        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) {
    912912            parseError(token);
    913913            if (!processCaptionEndTagForInCaption()) {
     
    959959            }
    960960            m_openElements.popUntilTableBodyScopeMarker();
    961             ASSERT(currentElement()->tagQName() == tbodyTag || currentElement()->tagQName() == tfootTag || currentElement()->tagQName() == theadTag);
     961            ASSERT(isTableBodyContextTag(currentElement()->localName()));
    962962            processFakeEndTag(currentElement()->tagQName());
    963963            processStartTag(token);
     
    10611061    case InSelectInTableMode:
    10621062        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) {
    10641064            parseError(token);
    10651065            AtomicHTMLToken endSelect(HTMLToken::EndTag, selectTag.localName());
     
    15531553        return;
    15541554    }
    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) {
    15561556        parseError(token);
    15571557        return;
     
    16291629            return;
    16301630        }
    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) {
    16321632            parseError(token);
    16331633            return;
     
    17191719    case InTableBodyMode:
    17201720        ASSERT(insertionMode() == InTableBodyMode);
    1721         if (token.name() == tbodyTag || token.name() == tfootTag || token.name() == theadTag) {
     1721        if (isTableBodyContextTag(token.name())) {
    17221722            if (!m_openElements.inTableScope(token.name())) {
    17231723                parseError(token);
     
    17371737            }
    17381738            m_openElements.popUntilTableBodyScopeMarker();
    1739             ASSERT(currentElement()->tagQName() == tbodyTag || currentElement()->tagQName() == tfootTag || currentElement()->tagQName() == theadTag);
     1739            ASSERT(isTableBodyContextTag(currentElement()->localName()));
    17401740            processFakeEndTag(currentElement()->tagQName());
    17411741            processEndTag(token);
     
    18201820    case InSelectInTableMode:
    18211821        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) {
    18231823            parseError(token);
    18241824            if (m_openElements.inTableScope(token.name())) {
Note: See TracChangeset for help on using the changeset viewer.