| Index: Source/core/css/FontFace.cpp
|
| diff --git a/Source/core/css/FontFace.cpp b/Source/core/css/FontFace.cpp
|
| index 8156b98d92e9eb5c57780281ff08465ad8237753..e75c2e163056f3c397881a34515ede4170e19d26 100644
|
| --- a/Source/core/css/FontFace.cpp
|
| +++ b/Source/core/css/FontFace.cpp
|
| @@ -107,7 +107,7 @@ PassRefPtr<FontFace> FontFace::create(ExecutionContext* context, const AtomicStr
|
| return nullptr;
|
| }
|
|
|
| - RefPtr<FontFace> fontFace = adoptRef<FontFace>(new FontFace(src));
|
| + RefPtr<FontFace> fontFace = adoptRefWillBeRefCountedGarbageCollected<FontFace>(new FontFace(src));
|
| fontFace->setFamily(context, family, exceptionState);
|
| if (exceptionState.hadException())
|
| return nullptr;
|
| @@ -160,7 +160,7 @@ PassRefPtr<FontFace> FontFace::create(Document* document, const StyleRuleFontFac
|
| if (!src || !src->isValueList())
|
| return nullptr;
|
|
|
| - RefPtr<FontFace> fontFace = adoptRef<FontFace>(new FontFace(src));
|
| + RefPtr<FontFace> fontFace = adoptRefWillBeRefCountedGarbageCollected<FontFace>(new FontFace(src));
|
|
|
| if (fontFace->setFamilyValue(toCSSValueList(family.get()))
|
| && fontFace->setPropertyFromStyle(properties, CSSPropertyFontStyle)
|
| @@ -453,7 +453,7 @@ unsigned FontFace::traitsMask() const
|
| traitsMask |= FontWeight400Mask;
|
| }
|
|
|
| - if (RefPtr<CSSValue> fontVariant = m_variant) {
|
| + if (RefPtrWillBeRawPtr<CSSValue> fontVariant = m_variant) {
|
| // font-variant descriptor can be a value list.
|
| if (fontVariant->isPrimitiveValue()) {
|
| RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| @@ -539,4 +539,15 @@ void FontFace::initCSSFontFace(Document* document)
|
| }
|
| }
|
|
|
| +void FontFace::trace(Visitor* visitor)
|
| +{
|
| + visitor->trace(m_src);
|
| + visitor->trace(m_style);
|
| + visitor->trace(m_weight);
|
| + visitor->trace(m_stretch);
|
| + visitor->trace(m_unicodeRange);
|
| + visitor->trace(m_variant);
|
| + visitor->trace(m_featureSettings);
|
| +}
|
| +
|
| } // namespace WebCore
|
|
|