Attachment 138183 Details for Bug 84502 – Patch

[patch] Patch

bug-84502-20120420155521.patch (text/plain), 3.18 KB, created by Martin Robinson on 2012-04-20 15:55:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Robinson

Created: 2012-04-20 15:55:22 PDT

Size: 3.18 KB

patch

obsolete

>Subversion Revision: 114790
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f5512b8820e7eed4faf325694fefec5f8602626b..3893edd83afe8777cf4433622468ee44a878679b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,19 @@
>+2012-04-20  Martin Robinson  <mrobinson@igalia.com>
>+
>+        [GTK] Revert changes that disabled Cairo fonts metrics hinting
>+        https://bugs.webkit.org/show_bug.cgi?id=84502
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Re-enable Cairo metrics hinting, which seems to ensure consistent results in
>+        reference and pixel test results. This makes our font metrics a bit different
>+        than the Mac port's, but it's a decent price to pay for consistent results.
>+
>+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
>+        (initializeGtkFontSettings):
>+        * WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
>+        (WTR::initializeGtkSettings):
>+
> 2012-04-04  Jer Noble  <jer.noble@apple.com>
> 
>         apple.com top navigation bar appears inside video during full screen exit animation
>diff --git a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
>index 844555fbb298d0263cad9786740f9628ab292c5f..6be7b028d2c83fabc21d3e9a997db567b0f5f4cf 100644
>--- a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
>+++ b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
>@@ -157,16 +157,6 @@ static void initializeGtkFontSettings(const char* testURL)
>         g_object_set(settings, "gtk-xft-rgba", "rgb", NULL);
>     else
>         g_object_set(settings, "gtk-xft-rgba", "none", NULL);
>-
>-    GdkScreen* screen = gdk_screen_get_default();
>-    ASSERT(screen);
>-    const cairo_font_options_t* screenOptions = gdk_screen_get_font_options(screen);
>-    ASSERT(screenOptions);
>-    cairo_font_options_t* options = cairo_font_options_copy(screenOptions);
>-    // Turn off text metrics hinting, which quantizes metrics to pixels in device space.
>-    cairo_font_options_set_hint_metrics(options, CAIRO_HINT_METRICS_OFF);
>-    gdk_screen_set_font_options(screen, options);
>-    cairo_font_options_destroy(options);
> }
> 
> CString getTopLevelPath()
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp b/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp
>index a7231004698fd7fdc584f7b11659f6c5f53d1d24..c97ca928f351a1645944eba31678e03a8b1e3385 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp
>+++ b/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp
>@@ -50,16 +50,6 @@ void initializeGtkSettings()
>                  "gtk-font-name", "Liberation Sans 12",
>                  "gtk-theme-name", "Raleigh",
>                  "gtk-xft-rgba", "none", NULL);
>-
>-    GdkScreen* screen = gdk_screen_get_default();
>-    ASSERT(screen);
>-    const cairo_font_options_t* screenOptions = gdk_screen_get_font_options(screen);
>-    ASSERT(screenOptions);
>-    cairo_font_options_t* options = cairo_font_options_copy(screenOptions);
>-    // Turn off text metrics hinting, which quantizes metrics to pixels in device space.
>-    cairo_font_options_set_hint_metrics(options, CAIRO_HINT_METRICS_OFF);
>-    gdk_screen_set_font_options(screen, options);
>-    cairo_font_options_destroy(options);
> }
> 
> static CString getTopLevelPath()

Actions: View | Formatted Diff | Diff

Attachments on bug 84502: 138183