| Index: Source/core/dom/Element.cpp
|
| diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
|
| index 17abe3fc80b7b7c95500e7651172b4da4b456598..243cd02f2b7b07d44588671cc8ba94d7cbc00f2e 100644
|
| --- a/Source/core/dom/Element.cpp
|
| +++ b/Source/core/dom/Element.cpp
|
| @@ -3106,7 +3106,7 @@ CSSStyleDeclaration* Element::style()
|
| MutableStylePropertySet& Element::ensureMutableInlineStyle()
|
| {
|
| ASSERT(isStyledElement());
|
| - RefPtr<StylePropertySet>& inlineStyle = ensureUniqueElementData().m_inlineStyle;
|
| + RefPtrWillBeMember<StylePropertySet>& inlineStyle = ensureUniqueElementData().m_inlineStyle;
|
| if (!inlineStyle) {
|
| CSSParserMode mode = (!isHTMLElement() || document().inQuirksMode()) ? HTMLQuirksMode : HTMLStandardMode;
|
| inlineStyle = MutableStylePropertySet::create(mode);
|
| @@ -3126,7 +3126,7 @@ void Element::clearMutableInlineStyleIfEmpty()
|
| inline void Element::setInlineStyleFromString(const AtomicString& newStyleString)
|
| {
|
| ASSERT(isStyledElement());
|
| - RefPtr<StylePropertySet>& inlineStyle = elementData()->m_inlineStyle;
|
| + RefPtrWillBeMember<StylePropertySet>& inlineStyle = elementData()->m_inlineStyle;
|
|
|
| // Avoid redundant work if we're using shared attribute data with already parsed inline style.
|
| if (inlineStyle && !elementData()->isUnique())
|
| @@ -3141,7 +3141,7 @@ inline void Element::setInlineStyleFromString(const AtomicString& newStyleString
|
| inlineStyle = BisonCSSParser::parseInlineStyleDeclaration(newStyleString, this);
|
| } else {
|
| ASSERT(inlineStyle->isMutable());
|
| - static_pointer_cast<MutableStylePropertySet>(inlineStyle)->parseDeclaration(newStyleString, document().elementSheet().contents());
|
| + static_cast<MutableStylePropertySet*>(inlineStyle.get())->parseDeclaration(newStyleString, document().elementSheet().contents());
|
| }
|
| }
|
|
|
| @@ -3300,6 +3300,7 @@ void Element::trace(Visitor* visitor)
|
| // rare data once that is in the heap.
|
| if (hasRareData())
|
| elementRareData()->trace(visitor);
|
| + visitor->trace(m_elementData);
|
| ContainerNode::trace(visitor);
|
| }
|
|
|
|
|