Index: Source/core/css/CSSFontSelector.cpp |
diff --git a/Source/core/css/CSSFontSelector.cpp b/Source/core/css/CSSFontSelector.cpp |
index 8828f1d8863ead16c88051f5398f29cf4830c88e..58554534d3314c481e2be2a03b4c33c2c613e703 100644 |
--- a/Source/core/css/CSSFontSelector.cpp |
+++ b/Source/core/css/CSSFontSelector.cpp |
@@ -507,13 +507,13 @@ CSSSegmentedFontFace* CSSFontSelector::getFontFace(const FontDescription& fontDe |
if (!familyFontFaces || familyFontFaces->isEmpty()) |
return 0; |
- OwnPtr<HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > >& segmentedFontFaceCache = m_fonts.add(family, nullptr).iterator->value; |
+ OwnPtr<HashMap<unsigned, Persistent<CSSSegmentedFontFace> > >& segmentedFontFaceCache = m_fonts.add(family, nullptr).iterator->value; |
if (!segmentedFontFaceCache) |
- segmentedFontFaceCache = adoptPtr(new HashMap<unsigned, RefPtr<CSSSegmentedFontFace> >); |
+ segmentedFontFaceCache = adoptPtr(new HashMap<unsigned, Persistent<CSSSegmentedFontFace> >); |
FontTraitsMask traitsMask = fontDescription.traitsMask(); |
- RefPtr<CSSSegmentedFontFace>& face = segmentedFontFaceCache->add(traitsMask, 0).iterator->value; |
+ Persistent<CSSSegmentedFontFace>& face = segmentedFontFaceCache->add(traitsMask, nullptr).iterator->value; |
if (!face) { |
face = CSSSegmentedFontFace::create(this); |
@@ -554,7 +554,7 @@ CSSSegmentedFontFace* CSSFontSelector::getFontFace(const FontDescription& fontDe |
for (unsigned i = 0; i < numCandidates; ++i) |
face->appendFontFace(candidateFontFaces[i]); |
} |
- return face.get(); |
+ return face.raw(); |
} |
void CSSFontSelector::clearDocument() |