Changeset 106757 in webkit

Timestamp:

Feb 5, 2012 1:26:05 AM (12 years ago)

Author:

kling@webkit.org

Message:

Remove mapped vs non-mapped attribute distinction.
<​http://webkit.org/b/77827>

Reviewed by Antti Koivisto.

Removed the isMappedAttribute flag from Attribute as it no longer serves
a practical purpose. Previously, StyledElement would generate mapped
attributes and plain Element would generate non-mapped ones.

The distinction is now made much more clearly by dividing the work between
Element's and StyledElement's attributeChanged() methods. The only thing
that StyledElement wants to do in addition to what Element does is
calling parseMappedAttribute() (which we'll rename in a later patch.)

• dom/Attribute.cpp:

(WebCore::Attribute::clone):

• dom/Attribute.h:

(WebCore::Attribute::create):
(WebCore::Attribute::Attribute):
(Attribute):

• dom/Document.cpp:

(WebCore::Document::createAttributeNS):

• dom/Element.cpp:

(WebCore::Element::attributeChanged):

• dom/Element.h:

(Element):

• dom/Node.cpp:

(WebCore::Node::dumpStatistics):

• dom/StyledElement.cpp:

(WebCore::StyledElement::attributeChanged):
(WebCore::StyledElement::parseMappedAttribute):

• dom/StyledElement.h:

(StyledElement):

• html/parser/HTMLConstructionSite.cpp:

(WebCore):

• html/parser/HTMLTreeBuilder.cpp:

(WebCore::HTMLTreeBuilder::attributesForIsindexInput):

• html/parser/TextDocumentParser.cpp:

(WebCore::TextDocumentParser::insertFakePreElement):

• svg/SVGStyledElement.cpp:

(WebCore::SVGStyledElement::getPresentationAttribute):

• xml/parser/MarkupTokenBase.h:

(WebCore::::initializeAttributes):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Attribute.cpp (modified) (1 diff)
• dom/Attribute.h (modified) (4 diffs)
• dom/Document.cpp (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (2 diffs)
• dom/Node.cpp (modified) (3 diffs)
• dom/StyledElement.cpp (modified) (2 diffs)
• dom/StyledElement.h (modified) (1 diff)
• html/parser/HTMLConstructionSite.cpp (modified) (1 diff)
• html/parser/HTMLTreeBuilder.cpp (modified) (1 diff)
• html/parser/TextDocumentParser.cpp (modified) (1 diff)
• svg/SVGStyledElement.cpp (modified) (1 diff)
• xml/parser/MarkupTokenBase.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-05  Andreas Kling  <awesomekling@apple.com>
+
+        Remove mapped vs non-mapped attribute distinction.
+        <http://webkit.org/b/77827>
+
+        Reviewed by Antti Koivisto.
+
+        Removed the isMappedAttribute flag from Attribute as it no longer serves
+        a practical purpose. Previously, StyledElement would generate mapped
+        attributes and plain Element would generate non-mapped ones.
+
+        The distinction is now made much more clearly by dividing the work between
+        Element's and StyledElement's attributeChanged() methods. The only thing
+        that StyledElement wants to do in addition to what Element does is
+        calling parseMappedAttribute() (which we'll rename in a later patch.)
+
+        * dom/Attribute.cpp:
+        (WebCore::Attribute::clone):
+        * dom/Attribute.h:
+        (WebCore::Attribute::create):
+        (WebCore::Attribute::Attribute):
+        (Attribute):
+        * dom/Document.cpp:
+        (WebCore::Document::createAttributeNS):
+        * dom/Element.cpp:
+        (WebCore::Element::attributeChanged):
+        * dom/Element.h:
+        (Element):
+        * dom/Node.cpp:
+        (WebCore::Node::dumpStatistics):
+        * dom/StyledElement.cpp:
+        (WebCore::StyledElement::attributeChanged):
+        (WebCore::StyledElement::parseMappedAttribute):
+        * dom/StyledElement.h:
+        (StyledElement):
+        * html/parser/HTMLConstructionSite.cpp:
+        (WebCore):
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::attributesForIsindexInput):
+        * html/parser/TextDocumentParser.cpp:
+        (WebCore::TextDocumentParser::insertFakePreElement):
+        * svg/SVGStyledElement.cpp:
+        (WebCore::SVGStyledElement::getPresentationAttribute):
+        * xml/parser/MarkupTokenBase.h:
+        (WebCore::::initializeAttributes):
+
 2012-02-05  Andreas Kling  <awesomekling@apple.com>
 

trunk/Source/WebCore/dom/Attribute.cpp

@@ -41 +41 @@
 PassRefPtr<Attribute> Attribute::clone() const
 {
-    return adoptRef(new Attribute(m_name, m_value, m_isMappedAttribute));
+    return adoptRef(new Attribute(m_name, m_value));
 }
 

trunk/Source/WebCore/dom/Attribute.h

@@ -42 +42 @@
     static PassRefPtr<Attribute> create(const QualifiedName& name, const AtomicString& value)
     {
-        return adoptRef(new Attribute(name, value, false));
+        return adoptRef(new Attribute(name, value));
     }
-    static PassRefPtr<Attribute> createMapped(const QualifiedName& name, const AtomicString& value)
+    static PassRefPtr<Attribute> create(const AtomicString& name, const AtomicString& value)
     {
-        return adoptRef(new Attribute(name, value, true));
-    }
-    static PassRefPtr<Attribute> createMapped(const AtomicString& name, const AtomicString& value)
-    {
-        return adoptRef(new Attribute(name, value, true));
+        return adoptRef(new Attribute(name, value));
     }
 
@@ -76 +72 @@
     void parserSetName(const QualifiedName& name) { m_name = name; }
 
-    bool isMappedAttribute() { return m_isMappedAttribute; }
-
 private:
-    Attribute(const QualifiedName& name, const AtomicString& value, bool isMappedAttribute)
-        : m_isMappedAttribute(isMappedAttribute)
-        , m_hasAttr(false)
+    Attribute(const QualifiedName& name, const AtomicString& value)
+        : m_hasAttr(false)
         , m_name(name)
         , m_value(value)
@@ -87 +80 @@
     }
 
-    Attribute(const AtomicString& name, const AtomicString& value, bool isMappedAttribute)
-        : m_isMappedAttribute(isMappedAttribute)
-        , m_hasAttr(false)
+    Attribute(const AtomicString& name, const AtomicString& value)
+        : m_hasAttr(false)
         , m_name(nullAtom, name, nullAtom)
         , m_value(value)
@@ -98 +90 @@
     void unbindAttr(Attr*);
 
-    // These booleans will go into the spare 32-bits of padding from RefCounted in 64-bit.
-    bool m_isMappedAttribute;
+    // This boolean will go into the spare 32-bits of padding from RefCounted in 64-bit.
     bool m_hasAttr;
     

trunk/Source/WebCore/dom/Document.cpp

@@ -4336 +4336 @@
     }
 
-    // FIXME: Assume this is a mapped attribute, since createAttribute isn't namespace-aware.  There's no harm to XML
-    // documents if we're wrong.
-    return Attr::create(0, this, Attribute::createMapped(qName, StringImpl::empty()));
+    return Attr::create(0, this, Attribute::create(qName, StringImpl::empty()));
 }
 

trunk/Source/WebCore/dom/Element.cpp

@@ -660 +660 @@
     if (isIdAttributeName(attr->name()))
         idAttributeChanged(attr);
+    else if (attr->name() == HTMLNames::nameAttr)
+        setHasName(!attr->isNull());
+
     recalcStyleIfNeededAfterAttributeChanged(attr);
     updateAfterAttributeChanged(attr);

trunk/Source/WebCore/dom/Element.h

@@ -384 +384 @@
     PassRefPtr<RenderStyle> styleForRenderer();
 
+    PassRefPtr<Attribute> createAttribute(const QualifiedName&, const AtomicString& value);
+
 protected:
     Element(const QualifiedName& tagName, Document* document, ConstructionType type)
@@ -423 +425 @@
 
     void setAttributeInternal(size_t index, const QualifiedName&, const AtomicString& value);
-    virtual PassRefPtr<Attribute> createAttribute(const QualifiedName&, const AtomicString& value);
-    
+
 #ifndef NDEBUG
     virtual void formatForDebugger(char* buffer, unsigned length) const;

trunk/Source/WebCore/dom/Node.cpp

@@ -160 +160 @@
 
     size_t attributes = 0;
-    size_t mappedAttributes = 0;
-    size_t mappedAttributesWithStyleDecl = 0;
     size_t attributesWithAttr = 0;
     size_t attrMaps = 0;
@@ -189 +187 @@
                         if (attr->attr())
                             ++attributesWithAttr;
-                        if (attr->isMappedAttribute()) {
-                            ++mappedAttributes;
-                            if (attr->style())
-                                ++mappedAttributesWithStyleDecl;
-                        }
                     }
                 }
@@ -278 +271 @@
     printf("Attribute Maps:\n");
     printf("  Number of Attributes (non-Node and Node): %zu [%zu]\n", attributes, sizeof(Attribute));
-    printf("  Number of Attributes that are mapped: %zu\n", mappedAttributes);
-    printf("  Number of Attributes with a StyleDeclaration: %zu\n", mappedAttributesWithStyleDecl);
     printf("  Number of Attributes with an Attr: %zu\n", attributesWithAttr);
     printf("  Number of NamedNodeMaps: %zu [%zu]\n", attrMaps, sizeof(NamedNodeMap));

trunk/Source/WebCore/dom/StyledElement.cpp

@@ -61 +61 @@
 }
 
-PassRefPtr<Attribute> StyledElement::createAttribute(const QualifiedName& name, const AtomicString& value)
-{
-    return Attribute::createMapped(name, value);
-}
-
 void StyledElement::attributeChanged(Attribute* attr)
 {
-    if (attr->name() == HTMLNames::nameAttr)
-        setHasName(!attr->isNull());
-
-    if (!attr->isMappedAttribute()) {
-        Element::attributeChanged(attr);
-        return;
-    }
-
     if (!(attr->name() == styleAttr && isSynchronizingStyleAttribute()))
         parseMappedAttribute(attr);
 
-    recalcStyleIfNeededAfterAttributeChanged(attr);
-    updateAfterAttributeChanged(attr);
+    Element::attributeChanged(attr);
 }
 
@@ -107 +93 @@
 void StyledElement::parseMappedAttribute(Attribute* attr)
 {
-    if (isIdAttributeName(attr->name()))
-        idAttributeChanged(attr);
-    else if (attr->name() == classAttr)
+    if (attr->name() == classAttr)
         classAttributeChanged(attr->value());
     else if (attr->name() == styleAttr) {

trunk/Source/WebCore/dom/StyledElement.h

@@ -60 +60 @@
     const SpaceSplitString& classNames() const;
 
-    virtual PassRefPtr<Attribute> createAttribute(const QualifiedName&, const AtomicString& value);
-
 protected:
     StyledElement(const QualifiedName& name, Document* document, ConstructionType type)

trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp

@@ -433 +433 @@
     for (size_t i = 0; i < attributes->length(); ++i) {
         Attribute* attribute = attributes->attributeItem(i);
-        RefPtr<Attribute> clone = Attribute::createMapped(attribute->name(), attribute->value());
+        RefPtr<Attribute> clone = Attribute::create(attribute->name(), attribute->value());
         newAttributes->addAttribute(clone);
     }

trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp

@@ -572 +572 @@
     }
 
-    RefPtr<Attribute> mappedAttribute = Attribute::createMapped(nameAttr, isindexTag.localName());
+    RefPtr<Attribute> mappedAttribute = Attribute::create(nameAttr, isindexTag.localName());
     attributes->insertAttribute(mappedAttribute.release(), false);
     return attributes.release();

trunk/Source/WebCore/html/parser/TextDocumentParser.cpp

@@ -61 +61 @@
     // distrubing the line/column number calculations.
 
-    RefPtr<Attribute> styleAttribute = Attribute::createMapped("style", "word-wrap: break-word; white-space: pre-wrap;");
+    RefPtr<Attribute> styleAttribute = Attribute::create("style", "word-wrap: break-word; white-space: pre-wrap;");
     OwnPtr<NamedNodeMap> attributes = NamedNodeMap::create();
     attributes->insertAttribute(styleAttribute.release(), false);

trunk/Source/WebCore/svg/SVGStyledElement.cpp

@@ -412 +412 @@
     QualifiedName attributeName(nullAtom, name, nullAtom);
     Attribute* attr = attributeMap()->getAttributeItem(attributeName);
-    if (!attr || !attr->isMappedAttribute())
+    if (!attr)
         return 0;
 

trunk/Source/WebCore/xml/parser/MarkupTokenBase.h

@@ -542 +542 @@
 
         String value(attribute.m_value.data(), attribute.m_value.size());
-        m_attributes->insertAttribute(Attribute::createMapped(nameForAttribute(attribute), value), false);
+        m_attributes->insertAttribute(Attribute::create(nameForAttribute(attribute), value), false);
     }
 }