[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrobinson at webkit.org
mrobinson at webkit.org
Wed Dec 22 14:23:40 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1d1d2a3dda4a21c16c938a4e5933bbcd5c80118f
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 7 18:39:50 2010 +0000
2010-09-21 Martin Robinson <mrobinson at igalia.com>
Reviewed by Chris Fleizach.
[GTK] The FreeType backend does not respect the FC_EMBOLDEN property
https://bugs.webkit.org/show_bug.cgi?id=46216
Added tests for this issue.
* platform/gtk/fonts/fontconfig-synthetic-bold-expected.txt: Added.
* platform/gtk/fonts/fontconfig-synthetic-bold.html: Added.
2010-10-05 Martin Robinson <mrobinson at igalia.com>
Reviewed by Chris Fleizach.
[GTK] The FreeType backend does not respect the FC_EMBOLDEN property
https://bugs.webkit.org/show_bug.cgi?id=46216
Look for the FC_EMBOLDEN property of the FcPattern when constructing
FontPlatformData and use it to enable synthetic bold fonts when necessary.
Test: platform/gtk/fonts/fontconfig-synthetic-bold.html
* platform/graphics/cairo/FontPlatformDataFreeType.cpp:
(WebCore::FontPlatformData::FontPlatformData): Properly handle the FC_EMBOLDEN property.
2010-09-21 Martin Robinson <mrobinson at igalia.com>
Reviewed by Chris Fleizach.
[GTK] The FreeType backend does not respect the FC_EMBOLDEN property
https://bugs.webkit.org/show_bug.cgi?id=46216
* DumpRenderTree/gtk/fonts/fonts.conf: Add a setting which enables FC_EMBOLDEN
for DejaVu Serif when there is no bold version available. This is necessary to
properly test the property in layout tests.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69326 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a51b993..5f67821 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-21 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Chris Fleizach.
+
+ [GTK] The FreeType backend does not respect the FC_EMBOLDEN property
+ https://bugs.webkit.org/show_bug.cgi?id=46216
+
+ Added tests for this issue.
+
+ * platform/gtk/fonts/fontconfig-synthetic-bold-expected.txt: Added.
+ * platform/gtk/fonts/fontconfig-synthetic-bold.html: Added.
+
2010-10-05 Martin Robinson <mrobinson at igalia.com>
Reviewed by Chris Fleizach.
diff --git a/LayoutTests/platform/gtk/fonts/fontconfig-synthetic-bold-expected.txt b/LayoutTests/platform/gtk/fonts/fontconfig-synthetic-bold-expected.txt
new file mode 100644
index 0000000..71f2874
--- /dev/null
+++ b/LayoutTests/platform/gtk/fonts/fontconfig-synthetic-bold-expected.txt
@@ -0,0 +1,10 @@
+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 784x576
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 310x19
+ text run at (0,0) width 310: "a b c d e f g h i j k l m n o p q r s t u v"
+ RenderBlock {P} at (0,35) size 784x19
+ RenderText {#text} at (0,0) size 375x19
+ text run at (0,0) width 375: "a b c d e f g h i j k l m n o p q r s t u v"
diff --git a/LayoutTests/platform/gtk/fonts/fontconfig-synthetic-bold.html b/LayoutTests/platform/gtk/fonts/fontconfig-synthetic-bold.html
new file mode 100644
index 0000000..51a6614
--- /dev/null
+++ b/LayoutTests/platform/gtk/fonts/fontconfig-synthetic-bold.html
@@ -0,0 +1,17 @@
+<html>
+ <head>
+ <style type="text/css">
+ #normal {
+ font-family: "DejaVu Serif";
+ }
+ #bold {
+ font-family: "DejaVu Serif";
+ font-weight: bold;
+ }
+ </style>
+ </head>
+ <body>
+ <p id="normal">a b c d e f g h i j k l m n o p q r s t u v</p>
+ <p id="bold">a b c d e f g h i j k l m n o p q r s t u v</p>
+ </body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 78aa024..de91f4d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-05 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Chris Fleizach.
+
+ [GTK] The FreeType backend does not respect the FC_EMBOLDEN property
+ https://bugs.webkit.org/show_bug.cgi?id=46216
+
+ Look for the FC_EMBOLDEN property of the FcPattern when constructing
+ FontPlatformData and use it to enable synthetic bold fonts when necessary.
+
+ Test: platform/gtk/fonts/fontconfig-synthetic-bold.html
+
+ * platform/graphics/cairo/FontPlatformDataFreeType.cpp:
+ (WebCore::FontPlatformData::FontPlatformData): Properly handle the FC_EMBOLDEN property.
+
2010-10-07 James Simonsen <simonjam at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp b/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp
index 90987c0..6a4b896 100644
--- a/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp
+++ b/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp
@@ -106,6 +106,13 @@ FontPlatformData::FontPlatformData(FcPattern* pattern, const FontDescription& fo
int spacing;
if (FcPatternGetInteger(pattern, FC_SPACING, 0, &spacing) == FcResultMatch && spacing == FC_MONO)
m_fixedWidth = true;
+
+ if (fontDescription.weight() >= FontWeightBold) {
+ // The FC_EMBOLDEN property instructs us to fake the boldness of the font.
+ FcBool fontConfigEmbolden;
+ if (FcPatternGetBool(pattern, FC_EMBOLDEN, 0, &fontConfigEmbolden) == FcResultMatch)
+ m_syntheticBold = fontConfigEmbolden;
+ }
}
FontPlatformData::FontPlatformData(float size, bool bold, bool italic)
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index eea45c3..d188204 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-21 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Chris Fleizach.
+
+ [GTK] The FreeType backend does not respect the FC_EMBOLDEN property
+ https://bugs.webkit.org/show_bug.cgi?id=46216
+
+ * DumpRenderTree/gtk/fonts/fonts.conf: Add a setting which enables FC_EMBOLDEN
+ for DejaVu Serif when there is no bold version available. This is necessary to
+ properly test the property in layout tests.
+
2010-10-07 Jocelyn Turcotte <jocelyn.turcotte at nokia.com>, Andras Becsi <abecsi at webkit.org>, Balazs Kelemen <kbalazs at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf b/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf
index 520f96e..2c3a0c0 100644
--- a/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf
+++ b/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf
@@ -214,6 +214,26 @@
</edit>
</match>
+ <!-- We need to enable simulated bold to for DejaVu Serif to ensure that we interpret
+ this property correctly in: platform/gtk/fonts/fontconfig-synthetic-bold.html -->
+ <match target="font">
+ <test qual="any" name="family">
+ <string>DejaVu Serif</string>
+ </test>
+ <test name="weight" compare="less_eq">
+ <const>medium</const>
+ </test>
+ <test target="pattern" name="weight" compare="more">
+ <const>medium</const>
+ </test>
+ <edit name="embolden" mode="assign">
+ <bool>true</bool>
+ </edit>
+ <edit name="weight" mode="assign">
+ <const>bold</const>
+ </edit>
+ </match>
+
<config>
<!-- These are the default Unicode chars that are expected to be blank
in fonts. All other blank chars are assumed to be broken and won't
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list