diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2016-09-30 15:43:24 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:31:05 +0000 |
commit | a0be5222b8695aed31664ab4e8e804632569ed64 (patch) | |
tree | fe477e98b7aecd302b2176264046ceac0cfe6236 /Source/WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp | |
parent | 9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c (diff) |
Imported WebKit commit 2730223e8fe1776419fae168986b9e77f55d02d3
Change-Id: I46d453477a779a8db544ffc50d088fa13331da9b
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/Source/WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp b/Source/WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp index 78e159aa0..bc65c0511 100644 --- a/Source/WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp +++ b/Source/WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp @@ -39,18 +39,7 @@ FontPlatformData FontCustomPlatformData::fontPlatformData(const FontDescription& std::unique_ptr<FontCustomPlatformData> createFontCustomPlatformData(SharedBuffer& buffer) { - SharedBuffer* fontBuffer = &buffer; - RefPtr<SharedBuffer> sfntBuffer; - if (isWOFF(&buffer)) { - Vector<char> sfnt; - if (!convertWOFFToSfnt(&buffer, sfnt)) - return 0; - - sfntBuffer = SharedBuffer::adoptVector(sfnt); - fontBuffer = sfntBuffer.get(); - } - - const QByteArray fontData(fontBuffer->data(), fontBuffer->size()); + const QByteArray fontData(buffer.data(), buffer.size()); // Pixel size doesn't matter at this point, it is set in FontCustomPlatformData::fontPlatformData. QRawFont rawFont(fontData, /*pixelSize = */0, QFont::PreferDefaultHinting); |