diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/dom/StyledElement.cpp | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/dom/StyledElement.cpp')
| -rw-r--r-- | Source/WebCore/dom/StyledElement.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/Source/WebCore/dom/StyledElement.cpp b/Source/WebCore/dom/StyledElement.cpp index 3c55591..6781ed5 100644 --- a/Source/WebCore/dom/StyledElement.cpp +++ b/Source/WebCore/dom/StyledElement.cpp @@ -233,18 +233,9 @@ void StyledElement::classAttributeChanged(const AtomicString& newClassString) void StyledElement::parseMappedAttribute(Attribute* attr) { - if (isIdAttributeName(attr->name())) { - setHasID(!attr->isNull()); - if (attributeMap()) { - if (attr->isNull()) - attributeMap()->setIdForStyleResolution(nullAtom); - else if (document()->inQuirksMode()) - attributeMap()->setIdForStyleResolution(attr->value().lower()); - else - attributeMap()->setIdForStyleResolution(attr->value()); - } - setNeedsStyleRecalc(); - } else if (attr->name() == classAttr) + if (isIdAttributeName(attr->name())) + idAttributeChanged(attr); + else if (attr->name() == classAttr) classAttributeChanged(attr->value()); else if (attr->name() == styleAttr) { if (attr->isNull()) |