[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
eric at webkit.org
eric at webkit.org
Fri Feb 26 22:21:51 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 413a95acd1a3c64f81ae3c6c54dcc960e0437f3d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 17 02:16:25 2010 +0000
2010-02-16 Yusuke Sato <yusukes at chromium.org>
Reviewed by Dimitri Glazkov.
[Chromium] OpenType font with CFF glyphs is not handled correctly on Windows XP
https://bugs.webkit.org/show_bug.cgi?id=34735
* fast/css/font-face-opentype.html: Added.
* fast/css/resources/Ahem.otf: Added. Ahem font which has CFF glyphs, converted from Ahem.ttf by FontForge (http://fontforge.sourceforge.net/).
* platform/mac/fast/css/font-face-opentype-expected.checksum: Added.
* platform/mac/fast/css/font-face-opentype-expected.png: Added.
* platform/mac/fast/css/font-face-opentype-expected.txt: Added.
2010-02-16 Yusuke Sato <yusukes at chromium.org>
Reviewed by Dimitri Glazkov.
[Chromium] OpenType font with CFF glyphs is not handled correctly on Windows XP
https://bugs.webkit.org/show_bug.cgi?id=34735
Use 0xFFFF as invalidGlyph when fontData is a OpenType font with CFF glyphs.
Test: fast/css/font-face-opentype.html
* platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp:
(WebCore::fillBMPGlyphs):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54855 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 275d856..e0d3d73 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-16 Yusuke Sato <yusukes at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ [Chromium] OpenType font with CFF glyphs is not handled correctly on Windows XP
+ https://bugs.webkit.org/show_bug.cgi?id=34735
+
+ * fast/css/font-face-opentype.html: Added.
+ * fast/css/resources/Ahem.otf: Added. Ahem font which has CFF glyphs, converted from Ahem.ttf by FontForge (http://fontforge.sourceforge.net/).
+ * platform/mac/fast/css/font-face-opentype-expected.checksum: Added.
+ * platform/mac/fast/css/font-face-opentype-expected.png: Added.
+ * platform/mac/fast/css/font-face-opentype-expected.txt: Added.
+
2010-02-16 Dumitru Daniliuc <dumi at chromium.org>
Reviewed by Simon Fraser.
diff --git a/LayoutTests/fast/css/font-face-opentype.html b/LayoutTests/fast/css/font-face-opentype.html
new file mode 100644
index 0000000..51a3827
--- /dev/null
+++ b/LayoutTests/fast/css/font-face-opentype.html
@@ -0,0 +1,19 @@
+<style>
+ @font-face {
+ font-family: family1;
+ src: url(resources/Ahem.otf);
+ }
+</style>
+<p>
+ Test for <i><a href="https://bugs.webkit.org/show_bug.cgi?id=34735">https://bugs.webkit.org/show_bug.cgi?id=34735</a> [Chromium] OpenType font with CFF glyphs is not handled correctly on Windows XP</i>.
+</p>
+<p>Check if glyphs in Ahem.otf can be rendered correctly. If the test passes, you should see dozens of black square characters below:</p>
+<span style="font-family: family1">!"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNO</span>
+<span style="font-family: family1">PQRSTUVWXYZ[\]^_`abcdefghijklmnoqrstuvwxyz{|}~</span>
+<!-- space, single-quote, and small p are omitted since they are not black squares -->
+<p>Check if glyphs not in Ahem.otf can be rendered using a fallback font. If the test passes, you should see a single-quote character below:</p>
+<span style="font-family: family1">'</span>
+<!-- Ahem font does not have a glyph for ' -->
+<script>
+ document.body.offsetTop;
+</script>
diff --git a/LayoutTests/fast/css/resources/Ahem.otf b/LayoutTests/fast/css/resources/Ahem.otf
new file mode 100644
index 0000000..6dd4ba2
Binary files /dev/null and b/LayoutTests/fast/css/resources/Ahem.otf differ
diff --git a/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.checksum b/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.checksum
new file mode 100644
index 0000000..de2a1f3
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.checksum
@@ -0,0 +1 @@
+6d7f5f2828a0c0c1f988dd37aa65f534
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.png b/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.png
new file mode 100644
index 0000000..ea34a22
Binary files /dev/null and b/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.txt b/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.txt
new file mode 100644
index 0000000..6480cdd
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.txt
@@ -0,0 +1,42 @@
+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 784x584
+ RenderBlock {P} at (0,0) size 784x36
+ RenderText {#text} at (0,0) size 53x18
+ text run at (0,0) width 53: "Test for "
+ RenderInline {I} at (0,0) size 747x36
+ RenderInline {A} at (0,0) size 307x18 [color=#0000EE]
+ RenderText {#text} at (53,0) size 307x18
+ text run at (53,0) width 307: "https://bugs.webkit.org/show_bug.cgi?id=34735"
+ RenderText {#text} at (360,0) size 747x36
+ text run at (360,0) width 387: " [Chromium] OpenType font with CFF glyphs is not handled"
+ text run at (0,18) width 162: "correctly on Windows XP"
+ RenderText {#text} at (162,18) size 4x18
+ text run at (162,18) width 4: "."
+ RenderBlock {P} at (0,52) size 784x36
+ RenderText {#text} at (0,0) size 770x36
+ text run at (0,0) width 770: "Check if glyphs in Ahem.otf can be rendered correctly. If the test passes, you should see dozens of black square characters"
+ text run at (0,18) width 43: "below:"
+ RenderBlock (anonymous) at (0,104) size 784x32
+ RenderInline {SPAN} at (0,0) size 736x16
+ RenderText {#text} at (0,0) size 736x16
+ text run at (0,0) width 736: "!\"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNO"
+ RenderText {#text} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 736x16
+ RenderText {#text} at (0,16) size 736x16
+ text run at (0,16) width 736: "PQRSTUVWXYZ[\\]^_`abcdefghijklmnoqrstuvwxyz{|}~"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {P} at (0,152) size 784x36
+ RenderText {#text} at (0,0) size 744x36
+ text run at (0,0) width 744: "Check if glyphs not in Ahem.otf can be rendered using a fallback font. If the test passes, you should see a single-quote"
+ text run at (0,18) width 104: "character below:"
+ RenderBlock (anonymous) at (0,204) size 784x17
+ RenderInline {SPAN} at (0,0) size 3x16
+ RenderText {#text} at (0,1) size 3x16
+ text run at (0,1) width 3: "'"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 556561f..3a6411d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-16 Yusuke Sato <yusukes at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ [Chromium] OpenType font with CFF glyphs is not handled correctly on Windows XP
+ https://bugs.webkit.org/show_bug.cgi?id=34735
+
+ Use 0xFFFF as invalidGlyph when fontData is a OpenType font with CFF glyphs.
+
+ Test: fast/css/font-face-opentype.html
+
+ * platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp:
+ (WebCore::fillBMPGlyphs):
+
2010-02-16 Darin Adler <darin at apple.com>
* page/MediaCanStartListener.h: Fixed license.
diff --git a/WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp b/WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp
index e2c47c1..e71f66a 100644
--- a/WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp
+++ b/WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp
@@ -134,7 +134,8 @@ static bool fillBMPGlyphs(unsigned offset,
// Copy the output to the GlyphPage
bool haveGlyphs = false;
int invalidGlyph = 0xFFFF;
- if (!isVistaOrNewer() && !(tm.tmPitchAndFamily & TMPF_TRUETYPE))
+ const DWORD cffTableTag = 0x20464643; // 4-byte identifier for OpenType CFF table ('CFF ').
+ if (!isVistaOrNewer() && !(tm.tmPitchAndFamily & TMPF_TRUETYPE) && (GetFontData(dc, cffTableTag, 0, 0, 0) == GDI_ERROR))
invalidGlyph = 0x1F;
Glyph spaceGlyph = 0; // Glyph for a space. Lazily filled.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list