[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
evan at chromium.org
evan at chromium.org
Wed Dec 22 11:22:27 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 87bfc3de4813ca3a0f5aba31f8e31b40debfc91d
Author: evan at chromium.org <evan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 20 22:23:45 2010 +0000
2010-07-20 Daniel Erat <derat at chromium.org>
Reviewed by Ojan Vafai.
Subpixel rendering always disabled for Chromium Linux
https://bugs.webkit.org/show_bug.cgi?id=42220
Layout test addition to check that Chromium Linux honors fontconfig
settings enabling or disabling subpixel rendering per-strike.
* platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.checksum:
* platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.png:
* platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt:
* platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle.html:
2010-07-20 Daniel Erat <derat at chromium.org>
Reviewed by Ojan Vafai.
Subpixel rendering always disabled for Chromium Linux
https://bugs.webkit.org/show_bug.cgi?id=42220
Explicitly initialize global Chromium Linux isSkiaSubpixelGlyphs
flag to false for clarity.
* platform/graphics/chromium/FontPlatformDataLinux.cpp:
2010-07-20 Daniel Erat <derat at chromium.org>
Reviewed by Ojan Vafai.
Subpixel rendering always disabled for Chromium Linux
https://bugs.webkit.org/show_bug.cgi?id=42220
Honor Fontconfig subpixel rendering setting on Chromium Linux.
* src/gtk/WebFontInfo.cpp:
(WebKit::WebFontInfo::renderStyleForStrike):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63780 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 31e503a..678ad57 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-20 Daniel Erat <derat at chromium.org>
+
+ Reviewed by Ojan Vafai.
+
+ Subpixel rendering always disabled for Chromium Linux
+ https://bugs.webkit.org/show_bug.cgi?id=42220
+
+ Layout test addition to check that Chromium Linux honors fontconfig
+ settings enabling or disabling subpixel rendering per-strike.
+
+ * platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.checksum:
+ * platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.png:
+ * platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt:
+ * platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle.html:
+
2010-07-20 Chris Fleizach <cfleizach at apple.com>
Reviewed by Beth Dakin.
diff --git a/LayoutTests/platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.checksum b/LayoutTests/platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.checksum
index 78dae9c..53645aa 100644
--- a/LayoutTests/platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.checksum
+++ b/LayoutTests/platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.checksum
@@ -1 +1 @@
-059488219a7bb44e3e814c3db350a709
\ No newline at end of file
+cf183d1ad8fabcd47b4024cd890704b9
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.png b/LayoutTests/platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.png
index fbdd048..c0b1019 100644
Binary files a/LayoutTests/platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.png and b/LayoutTests/platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.png differ
diff --git a/LayoutTests/platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt b/LayoutTests/platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt
index 0ce2120..2fafba8 100644
--- a/LayoutTests/platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt
+++ b/LayoutTests/platform/chromium-linux/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt
@@ -18,7 +18,7 @@ layer at (0,0) size 800x600
text run at (412,0) width 306: " mode, as that forces some rendering settings used "
text run at (718,0) width 32: "in the"
text run at (0,20) width 89: "following tests."
- RenderBlock {OL} at (0,56) size 784x399
+ RenderBlock {OL} at (0,56) size 784x471
RenderListItem {LI} at (40,0) size 744x55
RenderBlock {P} at (0,0) size 744x20
RenderListMarker at (-21,0) size 16x19: "1"
@@ -100,3 +100,23 @@ layer at (0,0) size 800x600
RenderInline {SPAN} at (0,0) size 92x13
RenderText {#text} at (70,5) size 92x13
text run at (70,5) width 92: "hopefully autohinted"
+ RenderListItem {LI} at (40,415) size 744x56
+ RenderBlock {P} at (0,0) size 744x20
+ RenderListMarker at (-21,0) size 16x19: "6"
+ RenderText {#text} at (0,0) size 590x19
+ text run at (0,0) width 414: "The following text should show that fontconfig can be used to enable "
+ text run at (414,0) width 176: "or disable subpixel rendering."
+ RenderBlock {P} at (0,36) size 744x20
+ RenderInline {SPAN} at (0,0) size 57x18
+ RenderText {#text} at (0,0) size 57x18
+ text run at (0,0) width 57: "subpixel"
+ RenderText {#text} at (57,0) size 4x19
+ text run at (57,0) width 4: " "
+ RenderInline {I} at (0,0) size 14x19
+ RenderText {#text} at (61,0) size 14x19
+ text run at (61,0) width 14: "vs"
+ RenderText {#text} at (75,0) size 4x19
+ text run at (75,0) width 4: " "
+ RenderInline {SPAN} at (0,0) size 78x18
+ RenderText {#text} at (79,0) size 78x18
+ text run at (79,0) width 78: "no subpixel"
diff --git a/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle.html b/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle.html
index 75685a7..91be028 100644
--- a/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle.html
+++ b/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle.html
@@ -42,6 +42,13 @@
<p><span style="font-family:AutohintedSerif; font-size:0.6em;">autohinted</span> <i>vs</i> <span style="font-family:FullAndAutoHintedSerif; font-size:0.6em;">hopefully autohinted</span></p>
</li>
+
+ <li>
+ <p>The following text should show that fontconfig can be used to enable
+ or disable subpixel rendering.</p>
+
+ <p><span style="font-family:SubpixelEnabledArial">subpixel</span> <i>vs</i> <span style="font-family:SubpixelDisabledArial">no subpixel</span></p>
+ </li>
</ol>
</body>
</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7a73a0d..309096a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-20 Daniel Erat <derat at chromium.org>
+
+ Reviewed by Ojan Vafai.
+
+ Subpixel rendering always disabled for Chromium Linux
+ https://bugs.webkit.org/show_bug.cgi?id=42220
+
+ Explicitly initialize global Chromium Linux isSkiaSubpixelGlyphs
+ flag to false for clarity.
+
+ * platform/graphics/chromium/FontPlatformDataLinux.cpp:
+
2010-07-20 Adam Barth <abarth at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/chromium/FontPlatformDataLinux.cpp b/WebCore/platform/graphics/chromium/FontPlatformDataLinux.cpp
index dda10b7..9b54732 100644
--- a/WebCore/platform/graphics/chromium/FontPlatformDataLinux.cpp
+++ b/WebCore/platform/graphics/chromium/FontPlatformDataLinux.cpp
@@ -43,7 +43,8 @@
namespace WebCore {
static SkPaint::Hinting skiaHinting = SkPaint::kNormal_Hinting;
-static bool isSkiaAntiAlias = true, isSkiaSubpixelGlyphs;
+static bool isSkiaAntiAlias = true;
+static bool isSkiaSubpixelGlyphs = false;
void FontPlatformData::setHinting(SkPaint::Hinting hinting)
{
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b9a8933..3490157 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-20 Daniel Erat <derat at chromium.org>
+
+ Reviewed by Ojan Vafai.
+
+ Subpixel rendering always disabled for Chromium Linux
+ https://bugs.webkit.org/show_bug.cgi?id=42220
+
+ Honor Fontconfig subpixel rendering setting on Chromium Linux.
+
+ * src/gtk/WebFontInfo.cpp:
+ (WebKit::WebFontInfo::renderStyleForStrike):
+
2010-07-20 Darin Fisher <darin at chromium.org>
Fix Chromium build bustage.
diff --git a/WebKit/chromium/src/gtk/WebFontInfo.cpp b/WebKit/chromium/src/gtk/WebFontInfo.cpp
index 3ac0b00..dd25eb1 100644
--- a/WebKit/chromium/src/gtk/WebFontInfo.cpp
+++ b/WebKit/chromium/src/gtk/WebFontInfo.cpp
@@ -165,6 +165,23 @@ void WebFontInfo::renderStyleForStrike(const char* family, int sizeAndStyle, Web
out->useHinting = b;
if (FcPatternGetInteger(match, FC_HINT_STYLE, 0, &i) == FcResultMatch)
out->hintStyle = i;
+ if (FcPatternGetInteger(match, FC_RGBA, 0, &i) == FcResultMatch) {
+ switch (i) {
+ case FC_RGBA_NONE:
+ out->useSubpixel = 0;
+ break;
+ case FC_RGBA_RGB:
+ case FC_RGBA_BGR:
+ case FC_RGBA_VRGB:
+ case FC_RGBA_VBGR:
+ out->useSubpixel = 1;
+ break;
+ default:
+ // This includes FC_RGBA_UNKNOWN.
+ out->useSubpixel = 2;
+ break;
+ }
+ }
FcPatternDestroy(match);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list