diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-15 18:14:37 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-15 18:14:38 +0200 |
| commit | a59824df76181c52d1f9edcb8d08e7ea1c163b66 (patch) | |
| tree | 9d2e9d52f35a799175b39a6d0fb6839639f00c5a /Source/WebCore/platform | |
| parent | 9af68289ed0dc78c82fb7ab67ee7e661159f20b7 (diff) | |
| parent | 4b88baaa5179c9fb699b0f699cdd1c4860333a29 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Id5cb34a6df11467cb5d32b0d5c2dfb921befb45d
Diffstat (limited to 'Source/WebCore/platform')
| -rw-r--r-- | Source/WebCore/platform/graphics/qt/FontCacheQt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp b/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp index e730d84bc..6d1ee72f2 100644 --- a/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp +++ b/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp @@ -81,7 +81,7 @@ PassRefPtr<SimpleFontData> FontCache::getSimilarFontPlatformData(const Font& fon PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescription& fontDescription, ShouldRetain shouldRetain) { const AtomicString fallbackFamily = QFont(fontDescription.family().family()).lastResortFamily(); - return getCachedFontData(fontDescription, fallbackFamily, false, shouldRetain); + return getCachedFontData(new FontPlatformData(fontDescription, fallbackFamily), shouldRetain); } void FontCache::getTraitsInFamily(const AtomicString&, Vector<unsigned>&) |