diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
| commit | a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd (patch) | |
| tree | b7abd9f49ae1d4d2e426a5883bfccd42b8e2ee12 /Source/WebCore/dom/StyledElement.cpp | |
| parent | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (diff) | |
| download | qtwebkit-a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd.tar.gz | |
Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516)
Diffstat (limited to 'Source/WebCore/dom/StyledElement.cpp')
| -rw-r--r-- | Source/WebCore/dom/StyledElement.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/dom/StyledElement.cpp b/Source/WebCore/dom/StyledElement.cpp index d55b00993..a992644c1 100644 --- a/Source/WebCore/dom/StyledElement.cpp +++ b/Source/WebCore/dom/StyledElement.cpp @@ -163,7 +163,7 @@ void StyledElement::classAttributeChanged(const AtomicString& newClassString) ensureAttributeData()->setClass(newClassString, shouldFoldCase); if (DOMTokenList* classList = optionalClassList()) static_cast<ClassList*>(classList)->reset(newClassString); - } else if (attributeData()) + } else attributeData()->clearClass(); setNeedsStyleRecalc(); } @@ -212,7 +212,7 @@ bool StyledElement::setInlineStyleProperty(CSSPropertyID propertyID, double valu bool StyledElement::setInlineStyleProperty(CSSPropertyID propertyID, const String& value, bool important) { - bool changes = ensureAttributeData()->ensureMutableInlineStyle(this)->setProperty(propertyID, value, important, document()->elementSheet()->internal()); + bool changes = ensureAttributeData()->ensureMutableInlineStyle(this)->setProperty(propertyID, value, important, document()->elementSheet()->contents()); if (changes) inlineStyleChanged(); return changes; @@ -232,7 +232,7 @@ bool StyledElement::removeInlineStyleProperty(CSSPropertyID propertyID) void StyledElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const { if (StylePropertySet* inlineStyle = attributeData() ? attributeData()->inlineStyle() : 0) - inlineStyle->addSubresourceStyleURLs(urls, document()->elementSheet()->internal()); + inlineStyle->addSubresourceStyleURLs(urls, document()->elementSheet()->contents()); } static inline bool attributeNameSort(const pair<AtomicStringImpl*, AtomicString>& p1, const pair<AtomicStringImpl*, AtomicString>& p2) @@ -342,7 +342,7 @@ void StyledElement::addPropertyToAttributeStyle(StylePropertySet* style, CSSProp void StyledElement::addPropertyToAttributeStyle(StylePropertySet* style, CSSPropertyID propertyID, const String& value) { - style->setProperty(propertyID, value, false, document()->elementSheet()->internal()); + style->setProperty(propertyID, value, false, document()->elementSheet()->contents()); } } |