[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
mrobinson at webkit.org
mrobinson at webkit.org
Fri Jan 21 15:05:02 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit ba96ebef304496afba32fcd4d9f8b2faa82b71e5
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 6 22:55:56 2011 +0000
2011-01-06 Martin Robinson <mrobinson at igalia.com>
Reviewed by Eric Seidel.
[GTK] Freetype backend does not support WOFF
https://bugs.webkit.org/show_bug.cgi?id=51904
* platform/gtk/Skipped: Unskip passing WOFF test. Add results.
* platform/gtk/fast/css/font-face-woff-expected.checksum: Added.
* platform/gtk/fast/css/font-face-woff-expected.png: Added.
* platform/gtk/fast/css/font-face-woff-expected.txt: Added.
2011-01-06 Martin Robinson <mrobinson at igalia.com>
Reviewed by Eric Seidel.
[GTK] Freetype backend does not support WOFF
https://bugs.webkit.org/show_bug.cgi?id=51904
* CMakeListsEfl.txt: Add WOFF support to the sources list.
* GNUmakefile.am: Add WOFF support to the sources list.
* platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp:
(WebCore::createFontCustomPlatformData): Call the WOFF decoder when appropriate.
(WebCore::FontCustomPlatformData::supportsFormat): Advertise support for WOFF.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75202 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0d92c59..da2ec9a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-06 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Eric Seidel.
+
+ [GTK] Freetype backend does not support WOFF
+ https://bugs.webkit.org/show_bug.cgi?id=51904
+
+ * platform/gtk/Skipped: Unskip passing WOFF test. Add results.
+ * platform/gtk/fast/css/font-face-woff-expected.checksum: Added.
+ * platform/gtk/fast/css/font-face-woff-expected.png: Added.
+ * platform/gtk/fast/css/font-face-woff-expected.txt: Added.
+
2011-01-06 James Simonsen <simonjam at chromium.org>
Reviewed by Darin Fisher.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index be54c16..10c60e4 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5043,9 +5043,6 @@ inspector/timeline-parse-html.html
# https://bugs.webkit.org/show_bug.cgi?id=38569
http/tests/workers/text-encoding.html
-# https://bugs.webkit.org/show_bug.cgi?id=31302
-fast/css/font-face-woff.html
-
# https://bugs.webkit.org/show_bug.cgi?id=40049
http/tests/inspector/resource-har-conversion.html
http/tests/inspector/resource-parameters.html
diff --git a/LayoutTests/platform/gtk/fast/css/font-face-woff-expected.checksum b/LayoutTests/platform/gtk/fast/css/font-face-woff-expected.checksum
new file mode 100644
index 0000000..c982c8c
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/css/font-face-woff-expected.checksum
@@ -0,0 +1 @@
+91b27ee3b3364708e118100f1bf6c6e0
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/css/font-face-woff-expected.png b/LayoutTests/platform/gtk/fast/css/font-face-woff-expected.png
new file mode 100644
index 0000000..d065d1a
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/css/font-face-woff-expected.png differ
diff --git a/LayoutTests/platform/gtk/fast/css/font-face-woff-expected.txt b/LayoutTests/platform/gtk/fast/css/font-face-woff-expected.txt
new file mode 100644
index 0000000..f93b028
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/css/font-face-woff-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x528
+ RenderBlock {P} at (0,0) size 784x38
+ RenderText {#text} at (0,0) size 774x38
+ text run at (0,0) width 774: "This test tries to render the following text with Ahem, loaded from a WOFF file. The text below should be a series of black"
+ text run at (0,19) width 41: "boxes."
+ RenderBlock {P} at (0,102) size 784x65
+ RenderText {#text} at (0,0) size 448x65
+ text run at (0,0) width 448: "Failure"
diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index 4c50d61..2ff8c4e 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -90,6 +90,7 @@ IF (WTF_PLATFORM_CAIRO)
"${WEBCORE_DIR}/platform/graphics/freetype"
)
LIST(APPEND WebCore_SOURCES
+ platform/graphics/WOFFFileFormat.cpp
platform/graphics/freetype/FontCacheFreeType.cpp
platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
platform/graphics/freetype/FontPlatformDataFreeType.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4101c31..b77aa59 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-06 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Eric Seidel.
+
+ [GTK] Freetype backend does not support WOFF
+ https://bugs.webkit.org/show_bug.cgi?id=51904
+
+ * CMakeListsEfl.txt: Add WOFF support to the sources list.
+ * GNUmakefile.am: Add WOFF support to the sources list.
+ * platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp:
+ (WebCore::createFontCustomPlatformData): Call the WOFF decoder when appropriate.
+ (WebCore::FontCustomPlatformData::supportsFormat): Advertise support for WOFF.
+
2011-01-06 James Simonsen <simonjam at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 06d7fc5..8b80c1c 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -40,6 +40,7 @@ webcore_cppflags += \
-I$(srcdir)/WebCore/platform/audio \
-I$(srcdir)/WebCore/platform/graphics \
-I$(srcdir)/WebCore/platform/graphics/filters \
+ -I$(srcdir)/WebCore/platform/graphics/opentype \
-I$(srcdir)/WebCore/platform/graphics/transforms \
-I$(srcdir)/WebCore/platform/image-decoders \
-I$(srcdir)/WebCore/platform/image-decoders/bmp \
@@ -2466,6 +2467,8 @@ webcore_sources += \
WebCore/platform/graphics/UnitBezier.h \
WebCore/platform/graphics/WidthIterator.cpp \
WebCore/platform/graphics/WidthIterator.h \
+ WebCore/platform/graphics/WOFFFileFormat.cpp \
+ WebCore/platform/graphics/WOFFFileFormat.h \
WebCore/platform/HostWindow.h \
WebCore/platform/KillRing.h \
WebCore/platform/KillRingNone.cpp \
diff --git a/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp b/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
index 800907a..c547224 100644
--- a/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
+++ b/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
@@ -24,6 +24,7 @@
#include "FontPlatformData.h"
#include "SharedBuffer.h"
+#include "WOFFFileFormat.h"
#include <cairo-ft.h>
#include <cairo.h>
@@ -67,6 +68,16 @@ FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
{
ASSERT_ARG(buffer, buffer);
+ RefPtr<SharedBuffer> sfntBuffer;
+ if (isWOFF(buffer)) {
+ Vector<char> sfnt;
+ if (!convertWOFFToSfnt(buffer, sfnt))
+ return 0;
+
+ sfntBuffer = SharedBuffer::adoptVector(sfnt);
+ buffer = sfntBuffer.get();
+ }
+
static FT_Library library = 0;
if (!library && FT_Init_FreeType(&library)) {
library = 0;
@@ -81,7 +92,7 @@ FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
bool FontCustomPlatformData::supportsFormat(const String& format)
{
- return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype");
+ return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype") || equalIgnoringCase(format, "woff");
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list