Changeset 116423 in webkit

Timestamp:

May 8, 2012 8:20:54 AM (12 years ago)

Author:

kling@webkit.org

Message:

Element: Merge idAttributeChanged() into attributeChanged().
<​http://webkit.org/b/85885>

Reviewed by Antti Koivisto.

No new tests, code churn only.

• dom/Element.h:
• dom/Element.cpp:

(WebCore::Element::attributeChanged): There's no need for this to be a standalone function anymore.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (2 diffs)
• dom/Element.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-08  Andreas Kling  <kling@webkit.org>
+
+        Element: Merge idAttributeChanged() into attributeChanged().
+        <http://webkit.org/b/85885>
+
+        Reviewed by Antti Koivisto.
+
+        No new tests, code churn only.
+
+        * dom/Element.h:
+        * dom/Element.cpp:
+        (WebCore::Element::attributeChanged): There's no need for this to be a standalone function anymore.
+
 2012-05-08  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -705 +705 @@
     document()->incDOMTreeVersion();
 
-    if (isIdAttributeName(attr->name()))
-        idAttributeChanged(attr);
-    else if (attr->name() == HTMLNames::nameAttr)
+    if (isIdAttributeName(attr->name())) {
+        if (attributeData()) {
+            if (attr->isNull())
+                attributeData()->setIdForStyleResolution(nullAtom);
+            else if (document()->inQuirksMode())
+                attributeData()->setIdForStyleResolution(attr->value().lower());
+            else
+                attributeData()->setIdForStyleResolution(attr->value());
+        }
+        setNeedsStyleRecalc();
+    } else if (attr->name() == HTMLNames::nameAttr)
         setHasName(!attr->isNull());
 
@@ -746 +754 @@
 }
 
-void Element::idAttributeChanged(Attribute* attr)
-{
-    if (attributeData()) {
-        if (attr->isNull())
-            attributeData()->setIdForStyleResolution(nullAtom);
-        else if (document()->inQuirksMode())
-            attributeData()->setIdForStyleResolution(attr->value().lower());
-        else
-            attributeData()->setIdForStyleResolution(attr->value());
-    }
-    setNeedsStyleRecalc();
-}
-    
 // Returns true is the given attribute is an event handler.
 // We consider an event handler any attribute that begins with "on".

trunk/Source/WebCore/dom/Element.h

@@ -432 +432 @@
     virtual bool shouldRegisterAsExtraNamedItem() const { return false; }
 
-    void idAttributeChanged(Attribute*);
-
     HTMLCollection* ensureCachedHTMLCollection(CollectionType);