Title: [158088] trunk/Source/WebCore
- Revision
- 158088
- Author
- an...@apple.com
- Date
- 2013-10-26 11:39:22 -0700 (Sat, 26 Oct 2013)
Log Message
Revert some accidental changes.
* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::getFontData):
* css/CSSFontSelector.cpp:
* css/CSSFontSelector.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158087 => 158088)
--- trunk/Source/WebCore/ChangeLog 2013-10-26 17:09:31 UTC (rev 158087)
+++ trunk/Source/WebCore/ChangeLog 2013-10-26 18:39:22 UTC (rev 158088)
@@ -1,3 +1,12 @@
+2013-10-26 Antti Koivisto <an...@apple.com>
+
+ Revert some accidental changes.
+
+ * css/CSSFontFaceSource.cpp:
+ (WebCore::CSSFontFaceSource::getFontData):
+ * css/CSSFontSelector.cpp:
+ * css/CSSFontSelector.h:
+
2013-10-26 Mark Lam <mark....@apple.com>
Gardening: fixed broken build.
Modified: trunk/Source/WebCore/css/CSSFontFaceSource.cpp (158087 => 158088)
--- trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2013-10-26 17:09:31 UTC (rev 158087)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2013-10-26 18:39:22 UTC (rev 158088)
@@ -170,10 +170,10 @@
// and the loader may invoke arbitrary delegate or event handler code.
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);
}
return fontData.release();
Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (158087 => 158088)
--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2013-10-26 17:09:31 UTC (rev 158087)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2013-10-26 18:39:22 UTC (rev 158088)
@@ -476,11 +476,6 @@
return false;
}
-PassRefPtr<SimpleFontData> CSSFontSelector::userStandardFont(const FontDescription& description)
-{
- return fontDataForGenericFamily(m_document, description, standardFamily);
-}
-
PassRefPtr<FontData> CSSFontSelector::getFontData(const FontDescription& fontDescription, const AtomicString& familyName)
{
if (m_fontFaces.isEmpty()) {
Modified: trunk/Source/WebCore/css/CSSFontSelector.h (158087 => 158088)
--- trunk/Source/WebCore/css/CSSFontSelector.h 2013-10-26 17:09:31 UTC (rev 158087)
+++ trunk/Source/WebCore/css/CSSFontSelector.h 2013-10-26 18:39:22 UTC (rev 158088)
@@ -61,7 +61,6 @@
virtual size_t fallbackFontDataCount() OVERRIDE;
virtual PassRefPtr<FontData> getFallbackFontData(const FontDescription&, size_t) OVERRIDE;
CSSSegmentedFontFace* getFontFace(const FontDescription&, const AtomicString& family);
- virtual PassRefPtr<SimpleFontData> userStandardFont(const FontDescription&);
virtual bool resolvesFamilyFor(const FontDescription&) const OVERRIDE;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
