Changeset 158088 in webkit for trunk/Source/WebCore/css/CSSFontFaceSource.cpp

Timestamp:

Oct 26, 2013, 11:39:22 AM (12 years ago)

Author:

Antti Koivisto

Message:

Revert some accidental changes.

• css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::getFontData):

• css/CSSFontSelector.cpp:
• css/CSSFontSelector.h:

File:

• trunk/Source/WebCore/css/CSSFontFaceSource.cpp (modified) (1 diff)

trunk/Source/WebCore/css/CSSFontFaceSource.cpp

@@ -171 +171 @@
         fontSelector->beginLoadingFontSoon(m_font.get());
 
-        RefPtr<SimpleFontData> fallback = fontSelector->userStandardFont(fontDescription);
-        if (!fallback)
-            fallback = fontCache()->getLastResortFallbackFont(fontDescription);
-        fontData = SimpleFontData::create(fallback->platformData(), /*isCustomFont*/ true, /*isLoading*/ true);
+        // This temporary font is not retained and should not be returned.
+        FontCachePurgePreventer fontCachePurgePreventer;
+        SimpleFontData* temporaryFont = fontCache()->getNonRetainedLastResortFallbackFont(fontDescription);
+        fontData = SimpleFontData::create(temporaryFont->platformData(), true, true);
     }