From 4b88baaa5179c9fb699b0f699cdd1c4860333a29 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 13 Aug 2013 14:15:49 +0200 Subject: Revert "[Qt] memory leak in WebCore::FontCache::getLastResortFallbackFont" This causes the browser example to crash on startup on 32bit x86. This reverts commit 25e8da88b2008e62c62206bddc815229761a0fb2 Task-number: QTBUG-32879 Change-Id: I38fb03f7fec5f9a197613d16cc59761b780ec49a Reviewed-by: Jocelyn Turcotte --- Source/WebCore/platform/graphics/qt/FontCacheQt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 FontCache::getSimilarFontPlatformData(const Font& fon PassRefPtr 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&) -- cgit v1.2.1