Changeset 62079 in webkit


Ignore:
Timestamp:
Jun 28, 2010 8:25:21 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-06-28 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Rename ContainerNode::addChild to legacyParserAddChild to indicate its parser-only intended use
​https://bugs.webkit.org/show_bug.cgi?id=41324

A bunch of places in the code were calling ContainerNode::addChild.
I don't think they actually want to be doing that, as it has special
form-related handling which is part of LegacyHTMLTreeBuilder.

No functional changes, thus no tests.

  • dom/ContainerNode.cpp: (WebCore::ContainerNode::legacyParserAddChild):
  • dom/ContainerNode.h:
  • dom/DOMImplementation.cpp: (WebCore::DOMImplementation::createDocument):
  • dom/Node.cpp: (WebCore::Node::legacyParserAddChild):
  • dom/Node.h:
  • html/HTMLKeygenElement.cpp: (WebCore::HTMLKeygenElement::HTMLKeygenElement):
  • html/HTMLTableElement.cpp: (WebCore::HTMLTableElement::legacyParserAddChild):
  • html/HTMLTableElement.h:
  • html/HTMLTableRowElement.cpp: (WebCore::HTMLTableRowElement::legacyParserAddChild):
  • html/HTMLTableRowElement.h:
  • html/HTMLTableSectionElement.cpp: (WebCore::HTMLTableSectionElement::legacyParserAddChild):
  • html/HTMLTableSectionElement.h:
  • html/HTMLViewSourceDocument.cpp: (WebCore::HTMLViewSourceDocument::createContainingTable): (WebCore::HTMLViewSourceDocument::addSpanWithClassName): (WebCore::HTMLViewSourceDocument::addLine): (WebCore::HTMLViewSourceDocument::addText): (WebCore::HTMLViewSourceDocument::addLink):
Location:
trunk/WebCore
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r62077 r62079  
     12010-06-28  Eric Seidel  <eric@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Rename ContainerNode::addChild to legacyParserAddChild to indicate its parser-only intended use
     6        https://bugs.webkit.org/show_bug.cgi?id=41324
     7
     8        A bunch of places in the code were calling ContainerNode::addChild.
     9        I don't think they actually want to be doing that, as it has special
     10        form-related handling which is part of LegacyHTMLTreeBuilder.
     11
     12        No functional changes, thus no tests.
     13
     14        * dom/ContainerNode.cpp:
     15        (WebCore::ContainerNode::legacyParserAddChild):
     16        * dom/ContainerNode.h:
     17        * dom/DOMImplementation.cpp:
     18        (WebCore::DOMImplementation::createDocument):
     19        * dom/Node.cpp:
     20        (WebCore::Node::legacyParserAddChild):
     21        * dom/Node.h:
     22        * html/HTMLKeygenElement.cpp:
     23        (WebCore::HTMLKeygenElement::HTMLKeygenElement):
     24        * html/HTMLTableElement.cpp:
     25        (WebCore::HTMLTableElement::legacyParserAddChild):
     26        * html/HTMLTableElement.h:
     27        * html/HTMLTableRowElement.cpp:
     28        (WebCore::HTMLTableRowElement::legacyParserAddChild):
     29        * html/HTMLTableRowElement.h:
     30        * html/HTMLTableSectionElement.cpp:
     31        (WebCore::HTMLTableSectionElement::legacyParserAddChild):
     32        * html/HTMLTableSectionElement.h:
     33        * html/HTMLViewSourceDocument.cpp:
     34        (WebCore::HTMLViewSourceDocument::createContainingTable):
     35        (WebCore::HTMLViewSourceDocument::addSpanWithClassName):
     36        (WebCore::HTMLViewSourceDocument::addLine):
     37        (WebCore::HTMLViewSourceDocument::addText):
     38        (WebCore::HTMLViewSourceDocument::addLink):
     39
    1402010-06-28  Eric Seidel  <eric@webkit.org>
    241

  • trunk/WebCore/dom/ContainerNode.cpp

    r62076 r62079  
    555555}
    556556
    557 ContainerNode* ContainerNode::addChild(PassRefPtr<Node> newChild)
     557ContainerNode* ContainerNode::legacyParserAddChild(PassRefPtr<Node> newChild)
    558558{
    559559    ASSERT(newChild);

  • trunk/WebCore/dom/ContainerNode.h

    r62076 r62079  
    4949    virtual bool appendChild(PassRefPtr<Node> newChild, ExceptionCode&, bool shouldLazyAttach = false);
    5050
    51     virtual ContainerNode* addChild(PassRefPtr<Node>);
     51    virtual ContainerNode* legacyParserAddChild(PassRefPtr<Node>);
    5252    virtual void parserAddChild(PassRefPtr<Node>);
    5353

  • trunk/WebCore/dom/DOMImplementation.cpp

    r61868 r62079  
    257257    }
    258258
     259    // FIXME: Shouldn't this call appendChild instead?
    259260    if (doctype)
    260         doc->addChild(doctype);
     261        doc->legacyParserAddChild(doctype);
    261262    if (documentElement)
    262         doc->addChild(documentElement.release());
     263        doc->legacyParserAddChild(documentElement.release());
    263264
    264265    return doc.release();

  • trunk/WebCore/dom/Node.cpp

    r62076 r62079  
    640640}
    641641
    642 ContainerNode* Node::addChild(PassRefPtr<Node>)
     642ContainerNode* Node::legacyParserAddChild(PassRefPtr<Node>)
    643643{
    644644    return 0;

  • trunk/WebCore/dom/Node.h

    r62076 r62079  
    265265    // Also does not dispatch DOM mutation events.
    266266    // Returns the appropriate container node for future insertions as you parse, or 0 for failure.
    267     virtual ContainerNode* addChild(PassRefPtr<Node>);
     267    virtual ContainerNode* legacyParserAddChild(PassRefPtr<Node>);
    268268    // addChild is tied into the logic of the LegacyHTMLTreeBuilder.  We need
    269269    // a "clean" version to use for the HTML5 version of the HTMLTreeBuilder.

  • trunk/WebCore/dom/XMLDocumentParser.cpp

    r61904 r62079  
    177177#endif
    178178    RefPtr<Node> newNode = Text::create(document(), "");
    179     if (!m_currentNode->addChild(newNode.get()))
     179    if (!m_currentNode->legacyParserAddChild(newNode.get()))
    180180        return false;
    181181    pushCurrentNode(newNode.get());

  • trunk/WebCore/dom/XMLDocumentParserLibxml2.cpp

    r61985 r62079  
    791791        m_scriptStartLine = lineNumber();
    792792
    793     if (!m_currentNode->addChild(newElement.get())) {
     793    if (!m_currentNode->legacyParserAddChild(newElement.get())) {
    794794        stopParsing();
    795795        return;
    … …  
    936936    pi->setCreatedByParser(true);
    937937
    938     if (!m_currentNode->addChild(pi.get()))
     938    if (!m_currentNode->legacyParserAddChild(pi.get()))
    939939        return;
    940940    if (m_view && !pi->attached())
    … …  
    963963
    964964    RefPtr<Node> newNode = CDATASection::create(document(), toString(s, len));
    965     if (!m_currentNode->addChild(newNode.get()))
     965    if (!m_currentNode->legacyParserAddChild(newNode.get()))
    966966        return;
    967967    if (m_view && !newNode->attached())
    … …  
    982982
    983983    RefPtr<Node> newNode = Comment::create(document(), toString(s));
    984     m_currentNode->addChild(newNode.get());
     984    m_currentNode->legacyParserAddChild(newNode.get());
    985985    if (m_view && !newNode->attached())
    986986        newNode->attach();
    … …  
    10461046#endif
    10471047
    1048         document()->addChild(DocumentType::create(document(), toString(name), toString(externalID), toString(systemID)));
     1048        document()->legacyParserAddChild(DocumentType::create(document(), toString(name), toString(externalID), toString(systemID)));
    10491049    }
    10501050}

  • trunk/WebCore/html/HTMLKeygenElement.cpp

    r61293 r62079  
    5151    for (size_t i = 0; i < keys.size(); ++i) {
    5252        RefPtr<HTMLOptionElement> option = HTMLOptionElement::create(document, this->form());
    53         addChild(option);
    54         option->addChild(Text::create(document, keys[i]));
     53        legacyParserAddChild(option);
     54        option->legacyParserAddChild(Text::create(document, keys[i]));
    5555    }
    5656}

  • trunk/WebCore/html/HTMLTableElement.cpp

    r61959 r62079  
    252252}
    253253
    254 ContainerNode* HTMLTableElement::addChild(PassRefPtr<Node> child)
     254ContainerNode* HTMLTableElement::legacyParserAddChild(PassRefPtr<Node> child)
    255255{
    256256    if (child->hasTagName(formTag)) {
    257257        // First add the child.
    258         HTMLElement::addChild(child);
     258        HTMLElement::legacyParserAddChild(child);
    259259
    260260        // Now simply return ourselves as the container to insert into.
    … …  
    263263    }
    264264
    265     return HTMLElement::addChild(child.get());
     265    return HTMLElement::legacyParserAddChild(child.get());
    266266}
    267267

  • trunk/WebCore/html/HTMLTableElement.h

    r61959 r62079  
    6464    String summary() const;
    6565
    66     virtual ContainerNode* addChild(PassRefPtr<Node>);
     66    virtual ContainerNode* legacyParserAddChild(PassRefPtr<Node>);
    6767
    6868    virtual void attach();

  • trunk/WebCore/html/HTMLTableRowElement.cpp

    r61959 r62079  
    6363}
    6464
    65 ContainerNode* HTMLTableRowElement::addChild(PassRefPtr<Node> child)
     65ContainerNode* HTMLTableRowElement::legacyParserAddChild(PassRefPtr<Node> child)
    6666{
    6767    if (child->hasTagName(formTag)) {
    6868        // First add the child.
    69         HTMLTablePartElement::addChild(child);
     69        HTMLTablePartElement::legacyParserAddChild(child);
    7070
    7171        // Now simply return ourselves as the container to insert into.
    … …  
    7474    }
    7575
    76     return HTMLTablePartElement::addChild(child);
     76    return HTMLTablePartElement::legacyParserAddChild(child);
    7777}
    7878

  • trunk/WebCore/html/HTMLTableRowElement.h

    r61959 r62079  
    3636    static PassRefPtr<HTMLTableRowElement> create(const QualifiedName&, Document*);
    3737
    38     virtual ContainerNode* addChild(PassRefPtr<Node>);
     38    virtual ContainerNode* legacyParserAddChild(PassRefPtr<Node>);
    3939
    4040    int rowIndex() const;

  • trunk/WebCore/html/HTMLTableSectionElement.cpp

    r61293 r62079  
    5656}
    5757
    58 ContainerNode* HTMLTableSectionElement::addChild(PassRefPtr<Node> child)
     58ContainerNode* HTMLTableSectionElement::legacyParserAddChild(PassRefPtr<Node> child)
    5959{
    6060    if (child->hasTagName(formTag)) {
    6161        // First add the child.
    62         HTMLTablePartElement::addChild(child);
     62        HTMLTablePartElement::legacyParserAddChild(child);
    6363
    6464        // Now simply return ourselves as the container to insert into.
    … …  
    6767    }
    6868
    69     return HTMLTablePartElement::addChild(child);
     69    return HTMLTablePartElement::legacyParserAddChild(child);
    7070}
    7171

  • trunk/WebCore/html/HTMLTableSectionElement.h

    r60361 r62079  
    3535    static PassRefPtr<HTMLTableSectionElement> create(const QualifiedName&, Document*);
    3636
    37     virtual ContainerNode* addChild(PassRefPtr<Node>);
     37    virtual ContainerNode* legacyParserAddChild(PassRefPtr<Node>);
    3838
    3939    PassRefPtr<HTMLElement> insertRow(int index, ExceptionCode&);

  • trunk/WebCore/html/HTMLViewSourceDocument.cpp

    r61868 r62079  
    7070{
    7171    RefPtr<HTMLHtmlElement> html = HTMLHtmlElement::create(this);
    72     addChild(html);
     72    legacyParserAddChild(html);
    7373    html->attach();
    7474    RefPtr<HTMLBodyElement> body = HTMLBodyElement::create(this);
    75     html->addChild(body);
     75    html->legacyParserAddChild(body);
    7676    body->attach();
    7777   
    … …  
    8282    attrs->addAttribute(Attribute::createMapped(classAttr, "webkit-line-gutter-backdrop"));
    8383    div->setAttributeMap(attrs.release());
    84     body->addChild(div);
     84    body->legacyParserAddChild(div);
    8585    div->attach();
    8686
    8787    RefPtr<HTMLTableElement> table = HTMLTableElement::create(this);
    88     body->addChild(table);
     88    body->legacyParserAddChild(table);
    8989    table->attach();
    9090    m_tbody = HTMLTableSectionElement::create(tbodyTag, this);
    91     table->addChild(m_tbody);
     91    table->legacyParserAddChild(m_tbody);
    9292    m_tbody->attach();
    9393    m_current = m_tbody;
    … …  
    215215    attrs->addAttribute(Attribute::createMapped(classAttr, className));
    216216    span->setAttributeMap(attrs.release());
    217     m_current->addChild(span);
     217    m_current->legacyParserAddChild(span);
    218218    span->attach();
    219219    return span.release();
    … …  
    224224    // Create a table row.
    225225    RefPtr<HTMLTableRowElement> trow = HTMLTableRowElement::create(this);
    226     m_tbody->addChild(trow);
     226    m_tbody->legacyParserAddChild(trow);
    227227    trow->attach();
    228228   
    … …  
    232232    attrs->addAttribute(Attribute::createMapped(classAttr, "webkit-line-number"));
    233233    td->setAttributeMap(attrs.release());
    234     trow->addChild(td);
     234    trow->legacyParserAddChild(td);
    235235    td->attach();
    236236
    … …  
    240240    attrs->addAttribute(Attribute::createMapped(classAttr, "webkit-line-content"));
    241241    td->setAttributeMap(attrs.release());
    242     trow->addChild(td);
     242    trow->legacyParserAddChild(td);
    243243    td->attach();
    244244    m_current = m_td = td;
    … …  
    277277            addLine(className);
    278278        RefPtr<Text> t = Text::create(this, substring);
    279         m_current->addChild(t);
     279        m_current->legacyParserAddChild(t);
    280280        t->attach();
    281281        if (i < size - 1)
    … …  
    305305    attrs->addAttribute(Attribute::createMapped(hrefAttr, url));
    306306    anchor->setAttributeMap(attrs.release());
    307     m_current->addChild(anchor);
     307    m_current->legacyParserAddChild(anchor);
    308308    anchor->attach();
    309309    return anchor.release();

  • trunk/WebCore/html/LegacyHTMLTreeBuilder.cpp

    r62029 r62079  
    345345
    346346    // Make a new doctype node and set it as our doctype.
    347     m_document->addChild(DocumentType::create(m_document, String::adopt(t->m_name), String::adopt(t->m_publicID), String::adopt(t->m_systemID)));
     347    m_document->legacyParserAddChild(DocumentType::create(m_document, String::adopt(t->m_name), String::adopt(t->m_publicID), String::adopt(t->m_systemID)));
    348348    if (t->m_forceQuirks)
    349349        m_document->setParseMode(Document::Compat);
    … …  
    391391    // let's be stupid and just try to insert it.
    392392    // this should work if the document is well-formed
    393     Node* newNode = m_current->addChild(n);
     393    Node* newNode = m_current->legacyParserAddChild(n);
    394394    if (!newNode)
    395395        return handleError(n, flat, localName, tagPriority); // Try to handle the error.
    … …  
    460460                if (!createdHead)
    461461                    reportError(MisplacedHeadContentError, &localName, &m_current->localName());
    462                 if (m_head->addChild(n)) {
     462                if (m_head->legacyParserAddChild(n)) {
    463463                    if (!n->attached() && !m_isParsingFragment)
    464464                        n->attach();
    465465                    return true;
    466                 } else
    467                     return false;
     466                }
     467                return false;
    468468            }
    469469        } else if (h->hasLocalName(htmlTag)) {
    … …  
    491491            }
    492492            if (m_head) {
    493                 Node* newNode = m_head->addChild(n);
     493                Node* newNode = m_head->legacyParserAddChild(n);
    494494                if (!newNode) {
    495495                    setSkipMode(h->tagQName());
    … …  
    531531            if (m_currentMapElement) {
    532532                reportError(MisplacedAreaError, &m_current->localName());
    533                 m_currentMapElement->addChild(n);
     533                m_currentMapElement->legacyParserAddChild(n);
    534534                if (!n->attached() && !m_isParsingFragment)
    535535                    n->attach();
    … …  
    16071607    }
    16081608
    1609     n->addChild(HTMLHRElement::create(m_document));
    1610     n->addChild(Text::create(m_document, text));
    1611     n->addChild(isIndex.release());
    1612     n->addChild(HTMLHRElement::create(m_document));
     1609    n->legacyParserAddChild(HTMLHRElement::create(m_document));
     1610    n->legacyParserAddChild(Text::create(m_document, text));
     1611    n->legacyParserAddChild(isIndex.release());
     1612    n->legacyParserAddChild(HTMLHRElement::create(m_document));
    16131613
    16141614    return n.release();

  • trunk/WebCore/rendering/MediaControlElements.cpp

    r61293 r62079  
    136136void MediaControlElement::attachToParent(Element* parent)
    137137{
    138     parent->addChild(this);
     138    parent->legacyParserAddChild(this);
    139139}
    140140
    … …  
    390390void MediaControlInputElement::attachToParent(Element* parent)
    391391{
    392     parent->addChild(this);
     392    parent->legacyParserAddChild(this);
    393393}
    394394

  • trunk/WebCore/rendering/TextControlInnerElements.cpp

    r61752 r62079  
    112112    // For elements without a shadow parent, add the node to the DOM normally.
    113113    if (!m_shadowParent)
    114         parent->addChild(this);
     114        parent->legacyParserAddChild(this);
    115115   
    116116    // Add the renderer to the render tree

  • trunk/WebCore/xml/XSLTProcessor.cpp

    r61868 r62079  
    103103        fragment->parseHTML(sourceString);
    104104    else if (sourceMIMEType == "text/plain")
    105         fragment->addChild(Text::create(outputDoc, sourceString));
     105        fragment->legacyParserAddChild(Text::create(outputDoc, sourceString));
    106106    else {
    107107        bool successfulParse = fragment->parseXML(sourceString, outputDoc->documentElement());
Note: See TracChangeset for help on using the changeset viewer.