| Index: third_party/WebKit/Source/core/css/FontFaceCache.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/FontFaceCache.cpp b/third_party/WebKit/Source/core/css/FontFaceCache.cpp
|
| index 512cdec110d1f8512c07e416c6c86c7a5c35e6f3..5bc066919d0e433bd920257394b2ec142a2e8d5f 100644
|
| --- a/third_party/WebKit/Source/core/css/FontFaceCache.cpp
|
| +++ b/third_party/WebKit/Source/core/css/FontFaceCache.cpp
|
| @@ -47,21 +47,21 @@ FontFaceCache::FontFaceCache()
|
| {
|
| }
|
|
|
| -void FontFaceCache::add(CSSFontSelector* cssFontSelector, const StyleRuleFontFace* fontFaceRule, PassRefPtrWillBeRawPtr<FontFace> prpFontFace)
|
| +void FontFaceCache::add(CSSFontSelector* cssFontSelector, const StyleRuleFontFace* fontFaceRule, RawPtr<FontFace> prpFontFace)
|
| {
|
| - RefPtrWillBeRawPtr<FontFace> fontFace = prpFontFace;
|
| + RawPtr<FontFace> fontFace = prpFontFace;
|
| if (!m_styleRuleToFontFace.add(fontFaceRule, fontFace).isNewEntry)
|
| return;
|
| addFontFace(cssFontSelector, fontFace, true);
|
| }
|
|
|
| -void FontFaceCache::addFontFace(CSSFontSelector* cssFontSelector, PassRefPtrWillBeRawPtr<FontFace> prpFontFace, bool cssConnected)
|
| +void FontFaceCache::addFontFace(CSSFontSelector* cssFontSelector, RawPtr<FontFace> prpFontFace, bool cssConnected)
|
| {
|
| - RefPtrWillBeRawPtr<FontFace> fontFace = prpFontFace;
|
| + RawPtr<FontFace> fontFace = prpFontFace;
|
|
|
| FamilyToTraitsMap::AddResult traitsResult = m_fontFaces.add(fontFace->family(), nullptr);
|
| if (!traitsResult.storedValue->value)
|
| - traitsResult.storedValue->value = adoptPtrWillBeNoop(new TraitsMap);
|
| + traitsResult.storedValue->value = (new TraitsMap);
|
|
|
| TraitsMap::AddResult segmentedFontFaceResult = traitsResult.storedValue->value->add(fontFace->traits().bitfield(), nullptr);
|
| if (!segmentedFontFaceResult.storedValue->value)
|
| @@ -94,7 +94,7 @@ void FontFaceCache::removeFontFace(FontFace* fontFace, bool cssConnected)
|
| TraitsMap::iterator familyFontFacesIter = familyFontFaces->find(fontFace->traits().bitfield());
|
| if (familyFontFacesIter == familyFontFaces->end())
|
| return;
|
| - RefPtrWillBeRawPtr<CSSSegmentedFontFace> segmentedFontFace = familyFontFacesIter->value;
|
| + RawPtr<CSSSegmentedFontFace> segmentedFontFace = familyFontFacesIter->value;
|
|
|
| segmentedFontFace->removeFontFace(fontFace);
|
| if (segmentedFontFace->isEmpty()) {
|
| @@ -136,7 +136,7 @@ CSSSegmentedFontFace* FontFaceCache::get(const FontDescription& fontDescription,
|
|
|
| FamilyToTraitsMap::AddResult traitsResult = m_fonts.add(family, nullptr);
|
| if (!traitsResult.storedValue->value)
|
| - traitsResult.storedValue->value = adoptPtrWillBeNoop(new TraitsMap);
|
| + traitsResult.storedValue->value = (new TraitsMap);
|
|
|
| FontTraits traits = fontDescription.traits();
|
| TraitsMap::AddResult faceResult = traitsResult.storedValue->value->add(traits.bitfield(), nullptr);
|
|
|