summaryrefslogtreecommitdiffstats
path: root/WebKitTools/DumpRenderTree/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'WebKitTools/DumpRenderTree/gtk')
-rw-r--r--WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp7
-rw-r--r--WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp4
-rw-r--r--WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf27
3 files changed, 32 insertions, 6 deletions
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 1c851d7..54acc49 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -137,10 +137,9 @@ static void initializeGtkFontSettings(const char* testURL)
GtkSettings* settings = gtk_settings_get_default();
if (!settings)
return;
- g_object_set(settings, "gtk-xft-antialias", 1, NULL);
- g_object_set(settings, "gtk-xft-hinting", 1, NULL);
- g_object_set(settings, "gtk-xft-hintstyle", "hintfull", NULL);
- g_object_set(settings, "gtk-font-name", "Liberation Sans 16", NULL);
+ g_object_set(settings, "gtk-xft-antialias", 1,
+ "gtk-xft-hinting", 0,
+ "gtk-font-name", "Liberation Sans 16", NULL);
// One test needs subpixel anti-aliasing turned on, but generally we
// want all text in other tests to use to grayscale anti-aliasing.
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 688b3f8..ab70a3e 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -813,8 +813,10 @@ void LayoutTestController::setEditingBehavior(const char* editingBehavior)
if (!strcmp(editingBehavior, "win"))
g_object_set(G_OBJECT(settings), "editing-behavior", WEBKIT_EDITING_BEHAVIOR_WINDOWS, NULL);
- if (!strcmp(editingBehavior, "mac"))
+ else if (!strcmp(editingBehavior, "mac"))
g_object_set(G_OBJECT(settings), "editing-behavior", WEBKIT_EDITING_BEHAVIOR_MAC, NULL);
+ else if (!strcmp(editingBehavior, "unix"))
+ g_object_set(G_OBJECT(settings), "editing-behavior", WEBKIT_EDITING_BEHAVIOR_UNIX, NULL);
}
void LayoutTestController::abortModal()
diff --git a/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf b/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf
index 6eb057e..2d9af17 100644
--- a/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf
+++ b/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf
@@ -2,6 +2,19 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
+ <!-- Due to patent (http://freetype.sourceforge.net/patents.html)
+ issues hinting gives different results depending on the
+ freetype version of the linux distribution, avoiding hinting
+ gives more consistent results. When all the distributions
+ release freetype the 2.4, which enables by default the
+ hinting method that was patented, we could undo this change
+ and try the hinting again. -->
+ <match target="font">
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+
<!-- The sans-serif font should be Liberation Serif -->
<match target="pattern">
<test qual="any" name="family">
@@ -158,6 +171,9 @@
<edit name="family" mode="assign">
<string>Liberation Serif</string>
</edit>
+ <edit name="hinting" mode="assign">
+ <bool>true</bool>
+ </edit>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
@@ -175,7 +191,7 @@
<edit name="hintstyle" mode="assign">
<const>hintfull</const>
</edit>
- <edit name="hinting" mode="assign">
+ <edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
@@ -187,6 +203,9 @@
<edit name="family" mode="assign">
<string>Liberation Serif</string>
</edit>
+ <edit name="hinting" mode="assign">
+ <bool>true</bool>
+ </edit>
<edit name="autohint" mode="assign">
<bool>true</bool>
</edit>
@@ -202,6 +221,9 @@
<edit name="family" mode="assign">
<string>Liberation Serif</string>
</edit>
+ <edit name="hinting" mode="assign">
+ <bool>true</bool>
+ </edit>
<edit name="autohint" mode="assign">
<bool>false</bool>
</edit>
@@ -217,6 +239,9 @@
<edit name="family" mode="assign">
<string>Liberation Serif</string>
</edit>
+ <edit name="hinting" mode="assign">
+ <bool>true</bool>
+ </edit>
<edit name="autohint" mode="assign">
<bool>true</bool>
</edit>