From a0be5222b8695aed31664ab4e8e804632569ed64 Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Fri, 30 Sep 2016 15:43:24 +0300
Subject: Imported WebKit commit 2730223e8fe1776419fae168986b9e77f55d02d3

Change-Id: I46d453477a779a8db544ffc50d088fa13331da9b
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
---
 .../platform/graphics/qt/FontCustomPlatformDataQt.cpp       | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'Source/WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp')

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);
-- 
cgit v1.2.3