Diff
Modified: trunk/LayoutTests/ChangeLog (99516 => 99517)
--- trunk/LayoutTests/ChangeLog 2011-11-08 03:02:19 UTC (rev 99516)
+++ trunk/LayoutTests/ChangeLog 2011-11-08 04:31:10 UTC (rev 99517)
@@ -1,3 +1,24 @@
+2011-11-07 Matt Falkenhagen <fal...@chromium.org>
+
+ Add layout test for locale-based font selection
+ https://bugs.webkit.org/show_bug.cgi?id=67019
+
+ This test relies on overridePreference("WebKit*FontMap"...) which is
+ implemented only on Chromium DumpRenderTree so far.
+
+ Reviewed by Kent Tamura.
+
+ * fast/text/international/locale-sensitive-fonts.html: Added.
+ * platform/chromium/test_expectations.txt:
+ * platform/efl/Skipped: Added skip for non-Chromium ports.
+ * platform/gtk-wk2/Skipped:
+ * platform/gtk/Skipped:
+ * platform/mac/Skipped:
+ * platform/qt/Skipped:
+ * platform/win/Skipped:
+ * platform/wincairo/Skipped:
+ * platform/wk2/Skipped:
+
2011-11-07 Chris Fleizach <cfleiz...@apple.com>
REGRESSION(r99025-r99037): platform/mac/accessibility/select-element-selection-with-optgroups.html is asserting
Added: trunk/LayoutTests/fast/text/international/locale-sensitive-fonts.html (0 => 99517)
--- trunk/LayoutTests/fast/text/international/locale-sensitive-fonts.html (rev 0)
+++ trunk/LayoutTests/fast/text/international/locale-sensitive-fonts.html 2011-11-08 04:31:10 UTC (rev 99517)
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.layoutTestController) {
+ layoutTestController.overridePreference("WebKitStandardFontMap", [ "Hans", "Ahem" ]);
+ layoutTestController.overridePreference("WebKitFantasyFontMap", [ "Hans", "Ahem" ]);
+}
+</script>
+</head>
+<body>
+<!-- This tests locale-sensitive font selection. Using overridePreference, the
+fonts for Simplified Han are to Ahem font. So all divs should match. -->
+<div style="font-size: 20px">
+<div style="font-family: 'Ahem'">this is ahem font</div>
+<div style="-webkit-locale: 'zh_CN'">this is ahem font</div>
+<div style="-webkit-locale: 'zh_CN'; font-family: fantasy">this is ahem font</div>
+</div>
+</body>
+</html>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (99516 => 99517)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-11-08 03:02:19 UTC (rev 99516)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-11-08 04:31:10 UTC (rev 99517)
@@ -3902,3 +3902,5 @@
BUG_TONY MAC WIN : fast/layers/self-painting-outline.html = IMAGE
BUG_TONY MAC WIN : fast/box-shadow/box-shadow-radius.html = IMAGE
BUG_TONY MAC : fast/borders/outline-alpha-block.html = IMAGE
+
+BUGWK67019 : fast/text/international/locale-sensitive-fonts.html = MISSING FAIL
Modified: trunk/LayoutTests/platform/efl/Skipped (99516 => 99517)
--- trunk/LayoutTests/platform/efl/Skipped 2011-11-08 03:02:19 UTC (rev 99516)
+++ trunk/LayoutTests/platform/efl/Skipped 2011-11-08 04:31:10 UTC (rev 99517)
@@ -718,6 +718,7 @@
fast/parser/pre-html5-parser-quirks.html
fast/repaint/no-caret-repaint-in-non-content-editable-element.html
fast/spatial-navigation
+fast/text/international/locale-sensitive-fonts.html
fast/text/zero-font-size.html
fast/viewport/viewport-128.html
http/tests/appcache/disabled.html
Modified: trunk/LayoutTests/platform/gtk/Skipped (99516 => 99517)
--- trunk/LayoutTests/platform/gtk/Skipped 2011-11-08 03:02:19 UTC (rev 99516)
+++ trunk/LayoutTests/platform/gtk/Skipped 2011-11-08 04:31:10 UTC (rev 99517)
@@ -358,6 +358,10 @@
# HiDPI tests require test infrastructure enhancements
fast/hidpi
+# layoutTestController.overridePreference("WebKit*FontMap"...) is not
+# supported.
+fast/text/international/locale-sensitive-fonts.html
+
###############################################################################
# TESTS FAILING
###############################################################################
Modified: trunk/LayoutTests/platform/gtk-wk2/Skipped (99516 => 99517)
--- trunk/LayoutTests/platform/gtk-wk2/Skipped 2011-11-08 03:02:19 UTC (rev 99516)
+++ trunk/LayoutTests/platform/gtk-wk2/Skipped 2011-11-08 04:31:10 UTC (rev 99517)
@@ -637,6 +637,7 @@
# WebKit2 needs layoutTestController.overridePreference
# https://bugs.webkit.org/show_bug.cgi?id=42197
+fast/text/international/locale-sensitive-fonts.html
platform/gtk/editing/selection/caret-mode-document-begin-end.html
editing/selection/caret-mode-paragraph-keys-navigation.html
Modified: trunk/LayoutTests/platform/mac/Skipped (99516 => 99517)
--- trunk/LayoutTests/platform/mac/Skipped 2011-11-08 03:02:19 UTC (rev 99516)
+++ trunk/LayoutTests/platform/mac/Skipped 2011-11-08 04:31:10 UTC (rev 99517)
@@ -486,3 +486,5 @@
# It needs a rebaseline
fast/repaint/table-extra-bottom-grow.html
+# DRT doesn't support overridePreference("WebKit*FontMap"...)
+fast/text/international/locale-sensitive-fonts.html
Modified: trunk/LayoutTests/platform/qt/Skipped (99516 => 99517)
--- trunk/LayoutTests/platform/qt/Skipped 2011-11-08 03:02:19 UTC (rev 99516)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-11-08 04:31:10 UTC (rev 99517)
@@ -712,6 +712,7 @@
# Missing DRT ability to override 'standard' preferences.
fast/dom/Window/timer-resume-on-navigation-back.html
+fast/text/international/locale-sensitive-fonts.html
loader/go-back-to-different-window-size.html
# Missing layoutTestController.findString() http://webkit.org/b/50236
Modified: trunk/LayoutTests/platform/win/Skipped (99516 => 99517)
--- trunk/LayoutTests/platform/win/Skipped 2011-11-08 03:02:19 UTC (rev 99516)
+++ trunk/LayoutTests/platform/win/Skipped 2011-11-08 04:31:10 UTC (rev 99517)
@@ -1444,3 +1444,5 @@
fast/events/platform-wheelevent-paging-y-in-scrolling-div.html
fast/events/platform-wheelevent-paging-y-in-scrolling-page.html
+# DRT doesn't support overridePreference("WebKit*FontMap"...)
+fast/text/international/locale-sensitive-fonts.html
Modified: trunk/LayoutTests/platform/wincairo/Skipped (99516 => 99517)
--- trunk/LayoutTests/platform/wincairo/Skipped 2011-11-08 03:02:19 UTC (rev 99516)
+++ trunk/LayoutTests/platform/wincairo/Skipped 2011-11-08 04:31:10 UTC (rev 99517)
@@ -1978,3 +1978,6 @@
# HiDPI tests require test infrastructure enhancements
fast/hidpi
+
+# DRT doesn't support overridePreference("WebKit*FontMap"...)
+fast/text/international/locale-sensitive-fonts.html
Modified: trunk/LayoutTests/platform/wk2/Skipped (99516 => 99517)
--- trunk/LayoutTests/platform/wk2/Skipped 2011-11-08 03:02:19 UTC (rev 99516)
+++ trunk/LayoutTests/platform/wk2/Skipped 2011-11-08 04:31:10 UTC (rev 99517)
@@ -308,6 +308,7 @@
fast/parser/noscript-with-_javascript_-enabled.html
fast/repaint/no-caret-repaint-in-non-content-editable-element.html
fast/text/zero-font-size.html
+fast/text/international/locale-sensitive-fonts.html
http/tests/appcache/disabled.html
# LayoutTestController::applicationCacheDiskUsageForOrigin isn't implemented - https://bugs.webkit.org/show_bug.cgi?id=57127
http/tests/appcache/origin-usage.html
