diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:16:09 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:16:09 +0200 |
| commit | c00313189427c6f3db679d573a19f6c1cf0c5df2 (patch) | |
| tree | e5ef9076e86aba8c5db4bdc95c2171b3961c65ce /Source | |
| parent | 0765f1b4d6614c095352b9a5b5495971f01e1bb1 (diff) | |
| parent | c31ff44d3a17fab37754acb2a0a29cd6eba10699 (diff) | |
| download | qtwebkit-c00313189427c6f3db679d573a19f6c1cf0c5df2.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I387d45abe4c8228c8153250e64bd0b3eb4dedc87
Diffstat (limited to 'Source')
| -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 6d1ee72f2..e730d84bc 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(new FontPlatformData(fontDescription, fallbackFamily), shouldRetain); + return getCachedFontData(fontDescription, fallbackFamily, false, shouldRetain); } void FontCache::getTraitsInFamily(const AtomicString&, Vector<unsigned>&) |