diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-08-13 14:15:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-14 16:22:19 +0200 |
| commit | 4b88baaa5179c9fb699b0f699cdd1c4860333a29 (patch) | |
| tree | ac70140caf7055ac6f70bac57747fd955d6aec14 | |
| parent | 6e692125a0a20e69de7e8d14ee1ef01d8d5023dc (diff) | |
| download | qtwebkit-5.1.1.tar.gz | |
Revert "[Qt] memory leak in WebCore::FontCache::getLastResortFallbackFont"v5.1.1
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 <jocelyn.turcotte@digia.com>
| -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>&) |