| Index: Source/core/css/StyleRule.cpp
|
| diff --git a/Source/core/css/StyleRule.cpp b/Source/core/css/StyleRule.cpp
|
| index 7735706796f59fa40ddd85bee35b38d6a8f6cc62..f95cb24ed14a11f6ecb871209d1b7a9d58c7f1f2 100644
|
| --- a/Source/core/css/StyleRule.cpp
|
| +++ b/Source/core/css/StyleRule.cpp
|
| @@ -270,14 +270,20 @@ MutableStylePropertySet& StyleRule::mutableProperties()
|
| {
|
| if (!m_properties->isMutable())
|
| m_properties = m_properties->mutableCopy();
|
| - return *toMutableStylePropertySet(m_properties);
|
| + return *toMutableStylePropertySet(m_properties.get());
|
| }
|
|
|
| -void StyleRule::setProperties(PassRefPtr<StylePropertySet> properties)
|
| +void StyleRule::setProperties(PassRefPtrWillBeRawPtr<StylePropertySet> properties)
|
| {
|
| m_properties = properties;
|
| }
|
|
|
| +void StyleRule::traceAfterDispatch(Visitor* visitor)
|
| +{
|
| + visitor->trace(m_properties);
|
| + StyleRuleBase::traceAfterDispatch(visitor);
|
| +}
|
| +
|
| StyleRulePage::StyleRulePage()
|
| : StyleRuleBase(Page)
|
| {
|
| @@ -298,14 +304,20 @@ MutableStylePropertySet& StyleRulePage::mutableProperties()
|
| {
|
| if (!m_properties->isMutable())
|
| m_properties = m_properties->mutableCopy();
|
| - return *toMutableStylePropertySet(m_properties);
|
| + return *toMutableStylePropertySet(m_properties.get());
|
| }
|
|
|
| -void StyleRulePage::setProperties(PassRefPtr<StylePropertySet> properties)
|
| +void StyleRulePage::setProperties(PassRefPtrWillBeRawPtr<StylePropertySet> properties)
|
| {
|
| m_properties = properties;
|
| }
|
|
|
| +void StyleRulePage::traceAfterDispatch(Visitor* visitor)
|
| +{
|
| + visitor->trace(m_properties);
|
| + StyleRuleBase::traceAfterDispatch(visitor);
|
| +}
|
| +
|
| StyleRuleFontFace::StyleRuleFontFace()
|
| : StyleRuleBase(FontFace)
|
| {
|
| @@ -328,11 +340,17 @@ MutableStylePropertySet& StyleRuleFontFace::mutableProperties()
|
| return *toMutableStylePropertySet(m_properties);
|
| }
|
|
|
| -void StyleRuleFontFace::setProperties(PassRefPtr<StylePropertySet> properties)
|
| +void StyleRuleFontFace::setProperties(PassRefPtrWillBeRawPtr<StylePropertySet> properties)
|
| {
|
| m_properties = properties;
|
| }
|
|
|
| +void StyleRuleFontFace::traceAfterDispatch(Visitor* visitor)
|
| +{
|
| + visitor->trace(m_properties);
|
| + StyleRuleBase::traceAfterDispatch(visitor);
|
| +}
|
| +
|
| StyleRuleGroup::StyleRuleGroup(Type type, WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase> >& adoptRule)
|
| : StyleRuleBase(type)
|
| {
|
| @@ -418,11 +436,17 @@ MutableStylePropertySet& StyleRuleViewport::mutableProperties()
|
| return *toMutableStylePropertySet(m_properties);
|
| }
|
|
|
| -void StyleRuleViewport::setProperties(PassRefPtr<StylePropertySet> properties)
|
| +void StyleRuleViewport::setProperties(PassRefPtrWillBeRawPtr<StylePropertySet> properties)
|
| {
|
| m_properties = properties;
|
| }
|
|
|
| +void StyleRuleViewport::traceAfterDispatch(Visitor* visitor)
|
| +{
|
| + visitor->trace(m_properties);
|
| + StyleRuleBase::traceAfterDispatch(visitor);
|
| +}
|
| +
|
| StyleRuleFilter::StyleRuleFilter(const String& filterName)
|
| : StyleRuleBase(Filter)
|
| , m_filterName(filterName)
|
| @@ -447,9 +471,15 @@ MutableStylePropertySet& StyleRuleFilter::mutableProperties()
|
| return *toMutableStylePropertySet(m_properties);
|
| }
|
|
|
| -void StyleRuleFilter::setProperties(PassRefPtr<StylePropertySet> properties)
|
| +void StyleRuleFilter::setProperties(PassRefPtrWillBeRawPtr<StylePropertySet> properties)
|
| {
|
| m_properties = properties;
|
| }
|
|
|
| +void StyleRuleFilter::traceAfterDispatch(Visitor* visitor)
|
| +{
|
| + visitor->trace(m_properties);
|
| + StyleRuleBase::traceAfterDispatch(visitor);
|
| +}
|
| +
|
| } // namespace WebCore
|
|
|