Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760

1 files changed, 6 insertions, 6 deletions

diff --git a/WebCore/dom/StyledElement.cpp b/WebCore/dom/StyledElement.cpp
index 34a593c..994b084 100644
--- a/WebCore/dom/StyledElement.cpp
+++ b/WebCore/dom/StyledElement.cpp
@@ -3,7 +3,7 @@
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2008, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -194,6 +194,7 @@ void StyledElement::attributeChanged(Attribute* attr, bool preserveDecls)
         if (namedAttrMap)
             mappedAttributes()->declAdded();
     }
+
     updateAfterAttributeChanged(attr);
 }
 
@@ -227,16 +228,15 @@ void StyledElement::classAttributeChanged(const AtomicString& newClassString)
 
 void StyledElement::parseMappedAttribute(Attribute* attr)
 {
-    if (attr->name() == idAttributeName()) {
-        // unique id
+    if (isIdAttributeName(attr->name())) {
         setHasID(!attr->isNull());
         if (namedAttrMap) {
             if (attr->isNull())
-                namedAttrMap->setID(nullAtom);
+                namedAttrMap->setIdForStyleResolution(nullAtom);
             else if (document()->inCompatMode())
-                namedAttrMap->setID(attr->value().lower());
+                namedAttrMap->setIdForStyleResolution(attr->value().lower());
             else
-                namedAttrMap->setID(attr->value());
+                namedAttrMap->setIdForStyleResolution(attr->value());
         }
         setNeedsStyleRecalc();
     } else if (attr->name() == classAttr)