Changeset 147020 in webkit

Timestamp:

Mar 27, 2013 4:57:50 PM (11 years ago)

Author:

pierre.rossi@gmail.com

Message:

[Qt] Add WOFF support when using zlib
​https://bugs.webkit.org/show_bug.cgi?id=112805

Reviewed by Allan Sandfeld Jensen.

Source/WebCore:

Covered by existing test:
fast/css/font-face-woff.html

• Target.pri: Conditional inclusion of WOFFFileFormat
• platform/graphics/qt/FontCustomPlatformDataQt.cpp:

(WebCore::createFontCustomPlatformData): Try to unpack WOFF data, otherwise spit out a warning and bail.
(WebCore::FontCustomPlatformData::supportsFormat): accept WOFF webfonts if USE(ZLIB).

LayoutTests:

• platform/qt-5.0-wk2/TestExpectations: keep skipped for WK2 due to a WTR bug.
• platform/qt/TestExpectations: unskip font-face-woff.html

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt-5.0-wk2/TestExpectations (modified) (1 diff)
• LayoutTests/platform/qt/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Target.pri (modified) (1 diff)
• Source/WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-27  Pierre Rossi  <pierre.rossi@gmail.com>
+
+        [Qt] Add WOFF support when using zlib
+        https://bugs.webkit.org/show_bug.cgi?id=112805
+
+        Reviewed by Allan Sandfeld Jensen.
+
+        * platform/qt-5.0-wk2/TestExpectations: keep skipped for WK2 due to a WTR bug.
+        * platform/qt/TestExpectations: unskip font-face-woff.html
+
 2013-03-27  Robert Hogan  <robert@webkit.org>
 

trunk/LayoutTests/platform/qt-5.0-wk2/TestExpectations

@@ -147 +147 @@
 webkit.org/b/108646 compositing/layer-creation/fixed-position-no-content.html [ Skip ]
 
+# [Qt][WK2] WTR doesn't dump pixels in a way that's consistent with other ports
+webkit.org/b/113320 fast/css/font-face-woff.html [ Skip ]
 ########################################
 

trunk/LayoutTests/platform/qt/TestExpectations

@@ -227 +227 @@
 userscripts
 plugins/plugin-document-load-prevented-userscript.html
-
-# ------ Doesn't support WOFF yet.
-fast/css/font-face-woff.html
 
 # Need to implement getFormValue().

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-27  Pierre Rossi  <pierre.rossi@gmail.com>
+
+        [Qt] Add WOFF support when using zlib
+        https://bugs.webkit.org/show_bug.cgi?id=112805
+
+        Reviewed by Allan Sandfeld Jensen.
+
+        Covered by existing test:
+        fast/css/font-face-woff.html
+
+        * Target.pri: Conditional inclusion of WOFFFileFormat
+        * platform/graphics/qt/FontCustomPlatformDataQt.cpp:
+        (WebCore::createFontCustomPlatformData): Try to unpack WOFF data, otherwise spit out a warning and bail.
+        (WebCore::FontCustomPlatformData::supportsFormat): accept WOFF webfonts if USE(ZLIB).
+
 2013-03-27  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/Target.pri

@@ -4230 +4230 @@
 }
 
+use?(ZLIB) {
+    HEADERS += platform/graphics/WOFFFileFormat.h
+    SOURCES += platform/graphics/WOFFFileFormat.cpp
+}
+
 !have?(sqlite3):exists($${SQLITE3SRCDIR}/sqlite3.c) {
     # Build sqlite3 into WebCore from source

trunk/Source/WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp

@@ -25 +25 @@
 #include "FontPlatformData.h"
 #include "SharedBuffer.h"
+#if USE(ZLIB)
+#include "WOFFFileFormat.h"
+#endif
 #include <QStringList>
 
@@ -40 +43 @@
     ASSERT_ARG(buffer, buffer);
 
+#if USE(ZLIB)
+    RefPtr<SharedBuffer> sfntBuffer;
+    if (isWOFF(buffer)) {
+        Vector<char> sfnt;
+        if (!convertWOFFToSfnt(buffer, sfnt))
+            return 0;
+
+        sfntBuffer = SharedBuffer::adoptVector(sfnt);
+        buffer = sfntBuffer.get();
+    }
+#endif // USE(ZLIB)
+
     const QByteArray fontData(buffer->data(), buffer->size());
+#if !USE(ZLIB)
+    if (fontData.startsWith("wOFF")) {
+        qWarning("WOFF support requires QtWebKit to be built with zlib support.");
+        return 0;
+    }
+#endif // !USE(ZLIB)
     // Pixel size doesn't matter at this point, it is set in FontCustomPlatformData::fontPlatformData.
     QRawFont rawFont(fontData, /*pixelSize = */0, QFont::PreferDefaultHinting);
@@ -53 +74 @@
 bool FontCustomPlatformData::supportsFormat(const String& format)
 {
-    return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype");
+    return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype")
+#if USE(ZLIB)
+            || equalIgnoringCase(format, "woff")
+#endif
+    ;
 }