Changeset 106746 in webkit


Ignore:
Timestamp:
Feb 4, 2012 2:56:28 PM (12 years ago)
Author:
kling@webkit.org
Message:

Element: Remove unnecessary attributeChanged() argument.
<​http://webkit.org/b/77814>

Reviewed by Ryosuke Niwa.

Remove the 'preserveDecls' argument to Element::attributeChanged() as that is no
longer needed after the removal of per-attribute style declarations.
Decorated subclass overrides with OVERRIDE since we're touching the lines.

Also removed an old inaccurate comment in NamedNodeMap::setAttributes() - calling
attributeChanged() is absolutely necessary to initialize element-specific state.

  • dom/Element.cpp:

(WebCore::Element::attributeChanged):

  • dom/Element.h:

(Element):

  • dom/NamedNodeMap.cpp:

(WebCore::NamedNodeMap::setAttributes):

  • dom/StyledElement.cpp:

(WebCore::StyledElement::attributeChanged):

  • dom/StyledElement.h:

(StyledElement):

  • html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::updateType):

  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::attributeChanged):

  • html/HTMLMediaElement.h:

(HTMLMediaElement):

  • html/HTMLScriptElement.cpp:

(WebCore::HTMLScriptElement::attributeChanged):

  • html/HTMLScriptElement.h:

(HTMLScriptElement):

  • html/HTMLTrackElement.cpp:

(WebCore::HTMLTrackElement::attributeChanged):

  • html/HTMLTrackElement.h:

(HTMLTrackElement):

  • svg/SVGAnimationElement.cpp:

(WebCore::SVGAnimationElement::attributeChanged):

  • svg/SVGAnimationElement.h:
  • svg/SVGElement.cpp:

(WebCore::SVGElement::attributeChanged):

  • svg/SVGElement.h:

(SVGElement):

  • svg/animation/SVGSMILElement.cpp:

(WebCore::SVGSMILElement::attributeChanged):

  • svg/animation/SVGSMILElement.h:

(SVGSMILElement):

Location:
trunk/Source/WebCore
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r106744 r106746  
     12012-02-04  Andreas Kling  <awesomekling@apple.com>
     2
     3        Element: Remove unnecessary attributeChanged() argument.
     4        <http://webkit.org/b/77814>
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Remove the 'preserveDecls' argument to Element::attributeChanged() as that is no
     9        longer needed after the removal of per-attribute style declarations.
     10        Decorated subclass overrides with OVERRIDE since we're touching the lines.
     11
     12        Also removed an old inaccurate comment in NamedNodeMap::setAttributes() - calling
     13        attributeChanged() is absolutely necessary to initialize element-specific state.
     14
     15        * dom/Element.cpp:
     16        (WebCore::Element::attributeChanged):
     17        * dom/Element.h:
     18        (Element):
     19        * dom/NamedNodeMap.cpp:
     20        (WebCore::NamedNodeMap::setAttributes):
     21        * dom/StyledElement.cpp:
     22        (WebCore::StyledElement::attributeChanged):
     23        * dom/StyledElement.h:
     24        (StyledElement):
     25        * html/HTMLInputElement.cpp:
     26        (WebCore::HTMLInputElement::updateType):
     27        * html/HTMLMediaElement.cpp:
     28        (WebCore::HTMLMediaElement::attributeChanged):
     29        * html/HTMLMediaElement.h:
     30        (HTMLMediaElement):
     31        * html/HTMLScriptElement.cpp:
     32        (WebCore::HTMLScriptElement::attributeChanged):
     33        * html/HTMLScriptElement.h:
     34        (HTMLScriptElement):
     35        * html/HTMLTrackElement.cpp:
     36        (WebCore::HTMLTrackElement::attributeChanged):
     37        * html/HTMLTrackElement.h:
     38        (HTMLTrackElement):
     39        * svg/SVGAnimationElement.cpp:
     40        (WebCore::SVGAnimationElement::attributeChanged):
     41        * svg/SVGAnimationElement.h:
     42        * svg/SVGElement.cpp:
     43        (WebCore::SVGElement::attributeChanged):
     44        * svg/SVGElement.h:
     45        (SVGElement):
     46        * svg/animation/SVGSMILElement.cpp:
     47        (WebCore::SVGSMILElement::attributeChanged):
     48        * svg/animation/SVGSMILElement.h:
     49        (SVGSMILElement):
     50
    1512012-02-04  Ken Buchanan  <kenrb@chromium.org>
    252

  • trunk/Source/WebCore/dom/Element.cpp

    r106626 r106746  
    656656}
    657657
    658 void Element::attributeChanged(Attribute* attr, bool)
     658void Element::attributeChanged(Attribute* attr)
    659659{
    660660    if (isIdAttributeName(attr->name()))

  • trunk/Source/WebCore/dom/Element.h

    r106740 r106746  
    222222
    223223    // This method is called whenever an attribute is added, changed or removed.
    224     // FIXME: Remove the preserveDecls argument.
    225     virtual void attributeChanged(Attribute*, bool preserveDecls = false);
     224    virtual void attributeChanged(Attribute*);
    226225
    227226    // Only called by the parser immediately after element construction.

  • trunk/Source/WebCore/dom/NamedNodeMap.cpp

    r106740 r106746  
    240240    unsigned newLength = other.length();
    241241    m_attributes.resize(newLength);
     242
     243    // FIXME: These loops can probably be combined.
    242244    for (unsigned i = 0; i < newLength; i++)
    243245        m_attributes[i] = other.m_attributes[i]->clone();
    244 
    245     // FIXME: This is wasteful.  The class list could be preserved on a copy, and we
    246     // wouldn't have to waste time reparsing the attribute.
    247     // The derived class, HTMLNamedNodeMap, which manages a parsed class list for the CLASS attribute,
    248     // will update its member variable when parse attribute is called.
    249246    for (unsigned i = 0; i < newLength; i++)
    250         m_element->attributeChanged(m_attributes[i].get(), true);
     247        m_element->attributeChanged(m_attributes[i].get());
    251248}
    252249

  • trunk/Source/WebCore/dom/StyledElement.cpp

    r106740 r106746  
    6565}
    6666
    67 void StyledElement::attributeChanged(Attribute* attr, bool preserveDecls)
     67void StyledElement::attributeChanged(Attribute* attr)
    6868{
    6969    if (attr->name() == HTMLNames::nameAttr)
    … …  
    7171
    7272    if (!attr->isMappedAttribute()) {
    73         Element::attributeChanged(attr, preserveDecls);
     73        Element::attributeChanged(attr);
    7474        return;
    7575    }

  • trunk/Source/WebCore/dom/StyledElement.h

    r106740 r106746  
    6969    }
    7070
    71     virtual void attributeChanged(Attribute*, bool preserveDecls = false);
     71    virtual void attributeChanged(Attribute*) OVERRIDE;
    7272    virtual void parseMappedAttribute(Attribute*);
    7373    virtual void copyNonAttributeProperties(const Element*);

  • trunk/Source/WebCore/html/HTMLInputElement.cpp

    r106740 r106746  
    549549        ASSERT(map);
    550550        if (Attribute* height = map->getAttributeItem(heightAttr))
    551             attributeChanged(height, false);
     551            attributeChanged(height);
    552552        if (Attribute* width = map->getAttributeItem(widthAttr))
    553             attributeChanged(width, false);
     553            attributeChanged(width);
    554554        if (Attribute* align = map->getAttributeItem(alignAttr))
    555             attributeChanged(align, false);
     555            attributeChanged(align);
    556556    }
    557557

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r106531 r106746  
    316316}
    317317
    318 void HTMLMediaElement::attributeChanged(Attribute* attr, bool preserveDecls)
    319 {
    320     HTMLElement::attributeChanged(attr, preserveDecls);
     318void HTMLMediaElement::attributeChanged(Attribute* attr)
     319{
     320    HTMLElement::attributeChanged(attr);
    321321
    322322    const QualifiedName& attrName = attr->name();

  • trunk/Source/WebCore/html/HTMLMediaElement.h

    r106531 r106746  
    337337
    338338    virtual bool supportsFocus() const;
    339     virtual void attributeChanged(Attribute*, bool preserveDecls);
     339    virtual void attributeChanged(Attribute*) OVERRIDE;
    340340    virtual bool rendererIsNeeded(const NodeRenderingContext&);
    341341    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);

  • trunk/Source/WebCore/html/HTMLScriptElement.cpp

    r104927 r106746  
    5959}
    6060
    61 void HTMLScriptElement::attributeChanged(Attribute* attr, bool preserveDecls)
     61void HTMLScriptElement::attributeChanged(Attribute* attr)
    6262{
    6363    if (attr->name() == asyncAttr)
    6464        handleAsyncAttribute();
    65     HTMLElement::attributeChanged(attr, preserveDecls);
     65    HTMLElement::attributeChanged(attr);
    6666}
    6767

  • trunk/Source/WebCore/html/HTMLScriptElement.h

    r104927 r106746  
    4848    virtual void insertedIntoDocument();
    4949    virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
    50     virtual void attributeChanged(Attribute*, bool preserveDecls = false);
     50    virtual void attributeChanged(Attribute*) OVERRIDE;
    5151
    5252    virtual bool isURLAttribute(Attribute*) const;

  • trunk/Source/WebCore/html/HTMLTrackElement.cpp

    r105668 r106746  
    101101}
    102102
    103 void HTMLTrackElement::attributeChanged(Attribute* attr, bool preserveDecls)
    104 {
    105     HTMLElement::attributeChanged(attr, preserveDecls);
     103void HTMLTrackElement::attributeChanged(Attribute* attr)
     104{
     105    HTMLElement::attributeChanged(attr);
    106106
    107107    if (!RuntimeEnabledFeatures::webkitVideoTrackEnabled())

  • trunk/Source/WebCore/html/HTMLTrackElement.h

    r105434 r106746  
    7777
    7878    virtual void parseMappedAttribute(Attribute*);
    79     virtual void attributeChanged(Attribute*, bool preserveDecls);
     79    virtual void attributeChanged(Attribute*) OVERRIDE;
    8080
    8181    virtual void insertedIntoDocument() OVERRIDE;

  • trunk/Source/WebCore/svg/SVGAnimationElement.cpp

    r103296 r106746  
    202202}
    203203
    204 void SVGAnimationElement::attributeChanged(Attribute* attr, bool preserveDecls)
     204void SVGAnimationElement::attributeChanged(Attribute* attr)
    205205{
    206206    // Assumptions may not hold after an attribute change.
    207207    m_animationValid = false;
    208208    setInactive();
    209     SVGSMILElement::attributeChanged(attr, preserveDecls);
     209    SVGSMILElement::attributeChanged(attr);
    210210}
    211211

  • trunk/Source/WebCore/svg/SVGAnimationElement.h

    r95907 r106746  
    108108
    109109private:
    110     virtual void attributeChanged(Attribute*, bool preserveDecls);
     110    virtual void attributeChanged(Attribute*) OVERRIDE;
    111111
    112112    virtual bool calculateFromAndToValues(const String& fromString, const String& toString) = 0;

  • trunk/Source/WebCore/svg/SVGElement.cpp

    r97670 r106746  
    360360}
    361361
    362 void SVGElement::attributeChanged(Attribute* attr, bool preserveDecls)
     362void SVGElement::attributeChanged(Attribute* attr)
    363363{
    364364    ASSERT(attr);
    … …  
    366366        return;
    367367
    368     StyledElement::attributeChanged(attr, preserveDecls);
     368    StyledElement::attributeChanged(attr);
    369369
    370370    // When an animated SVG property changes through SVG DOM, svgAttributeChanged() is called, not attributeChanged().

  • trunk/Source/WebCore/svg/SVGElement.h

    r100075 r106746  
    112112
    113113    virtual void finishParsingChildren();
    114     virtual void attributeChanged(Attribute*, bool preserveDecls = false);
     114    virtual void attributeChanged(Attribute*) OVERRIDE;
    115115    virtual bool childShouldCreateRenderer(Node*) const;
    116116   

  • trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp

    r105572 r106746  
    407407}
    408408
    409 void SVGSMILElement::attributeChanged(Attribute* attr, bool preserveDecls)
    410 {
    411     SVGElement::attributeChanged(attr, preserveDecls);
    412    
     409void SVGSMILElement::attributeChanged(Attribute* attr)
     410{
     411    SVGElement::attributeChanged(attr);
     412
    413413    const QualifiedName& attrName = attr->name();
    414414    if (attrName == SVGNames::durAttr)

  • trunk/Source/WebCore/svg/animation/SVGSMILElement.h

    r104719 r106746  
    4646
    4747    virtual void parseMappedAttribute(Attribute*);
    48     virtual void attributeChanged(Attribute*, bool preserveDecls);
     48    virtual void attributeChanged(Attribute*) OVERRIDE;
    4949    virtual void insertedIntoDocument();
    5050    virtual void removedFromDocument();
Note: See TracChangeset for help on using the changeset viewer.