Diff
Modified: trunk/LayoutTests/ChangeLog (110938 => 110939)
--- trunk/LayoutTests/ChangeLog 2012-03-16 04:03:24 UTC (rev 110938)
+++ trunk/LayoutTests/ChangeLog 2012-03-16 04:05:17 UTC (rev 110939)
@@ -1,3 +1,21 @@
+2012-03-15 Matt Falkenhagen <[email protected]>
+
+ Change per-script font tests to use InternalSettings
+ https://bugs.webkit.org/show_bug.cgi?id=81202
+
+ Reviewed by Hajime Morita.
+
+ * fast/text/international/content-language-font-selection.html:
+ * fast/text/international/content-language-with-subtags.html:
+ * platform/efl/Skipped: Remove tests from Skipped since that no longer rely on overridePreference.
+ * platform/gtk-wk2/Skipped: Ditto.
+ * platform/gtk/Skipped: Ditto.
+ * platform/mac/Skipped: Ditto.
+ * platform/qt/Skipped: Ditto.
+ * platform/win/Skipped: Ditto.
+ * platform/wincairo/Skipped: Ditto.
+ * platform/wk2/Skipped: Ditto.
+
2012-03-15 Allan Sandfeld Jensen <[email protected]>
REGRESSION(r106232): The resize handler is always called after loading.
Modified: trunk/LayoutTests/fast/text/international/content-language-font-selection.html (110938 => 110939)
--- trunk/LayoutTests/fast/text/international/content-language-font-selection.html 2012-03-16 04:03:24 UTC (rev 110938)
+++ trunk/LayoutTests/fast/text/international/content-language-font-selection.html 2012-03-16 04:05:17 UTC (rev 110939)
@@ -3,8 +3,8 @@
<head>
<meta http-equiv="content-language" content="zh-TW">
<script>
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitStandardFontMap", [ "Hant", "Ahem" ]);
+if (window.internals)
+ window.internals.settings.setStandardFontFamily("Ahem", "Hant");
</script>
<title>Test font selection based on content-language</title>
</head>
Modified: trunk/LayoutTests/fast/text/international/content-language-with-subtags.html (110938 => 110939)
--- trunk/LayoutTests/fast/text/international/content-language-with-subtags.html 2012-03-16 04:03:24 UTC (rev 110938)
+++ trunk/LayoutTests/fast/text/international/content-language-with-subtags.html 2012-03-16 04:05:17 UTC (rev 110939)
@@ -3,8 +3,8 @@
<head>
<meta http-equiv="content-language" content="zh_tw_foobar">
<script>
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitStandardFontMap", [ "Hant", "Ahem" ]);
+if (window.internals)
+ window.internals.settings.setStandardFontFamily("Ahem", "Hant");
</script>
<title>Test font selection based on content-language</title>
</head>
Modified: trunk/LayoutTests/platform/efl/Skipped (110938 => 110939)
--- trunk/LayoutTests/platform/efl/Skipped 2012-03-16 04:03:24 UTC (rev 110938)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-03-16 04:05:17 UTC (rev 110939)
@@ -652,8 +652,6 @@
fast/parser/pre-html5-parser-quirks.html
fast/repaint/no-caret-repaint-in-non-content-editable-element.html
fast/spatial-navigation
-fast/text/international/content-language-font-selection.html
-fast/text/international/content-language-with-subtags.html
fast/text/zero-font-size.html
fast/viewport/viewport-128.html
http/tests/appcache/disabled.html
Modified: trunk/LayoutTests/platform/gtk/Skipped (110938 => 110939)
--- trunk/LayoutTests/platform/gtk/Skipped 2012-03-16 04:03:24 UTC (rev 110938)
+++ trunk/LayoutTests/platform/gtk/Skipped 2012-03-16 04:05:17 UTC (rev 110939)
@@ -373,11 +373,6 @@
# CSS Filters is disabled
css3/filters
-# layoutTestController.overridePreference("WebKit*FontMap"...) is not
-# supported.
-fast/text/international/content-language-font-selection.html
-fast/text/international/content-language-with-subtags.html
-
# Needs layoutTestController.enableAutoResizeMode()
fast/autoresize
Modified: trunk/LayoutTests/platform/gtk-wk2/Skipped (110938 => 110939)
--- trunk/LayoutTests/platform/gtk-wk2/Skipped 2012-03-16 04:03:24 UTC (rev 110938)
+++ trunk/LayoutTests/platform/gtk-wk2/Skipped 2012-03-16 04:05:17 UTC (rev 110939)
@@ -208,8 +208,6 @@
# WebKit2 needs layoutTestController.overridePreference
# https://bugs.webkit.org/show_bug.cgi?id=42197
-fast/text/international/content-language-font-selection.html
-fast/text/international/content-language-with-subtags.html
fast/repaint/no-caret-repaint-in-non-content-editable-element.html
editing/selection/caret-mode-paragraph-keys-navigation.html
platform/gtk/editing/selection/caret-mode-document-begin-end.html
Modified: trunk/LayoutTests/platform/mac/Skipped (110938 => 110939)
--- trunk/LayoutTests/platform/mac/Skipped 2012-03-16 04:03:24 UTC (rev 110938)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-03-16 04:05:17 UTC (rev 110939)
@@ -519,10 +519,6 @@
# It needs a rebaseline
fast/repaint/table-extra-bottom-grow.html
-# DRT doesn't support overridePreference("WebKit*FontMap"...)
-fast/text/international/content-language-font-selection.html
-fast/text/international/content-language-with-subtags.html
-
# Web Intents is not yet enabled.
webintents/
Modified: trunk/LayoutTests/platform/qt/Skipped (110938 => 110939)
--- trunk/LayoutTests/platform/qt/Skipped 2012-03-16 04:03:24 UTC (rev 110938)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-03-16 04:05:17 UTC (rev 110939)
@@ -1051,8 +1051,6 @@
# Missing DRT ability to override 'standard' preferences.
fast/dom/Window/timer-resume-on-navigation-back.html
-fast/text/international/content-language-font-selection.html
-fast/text/international/content-language-with-subtags.html
loader/go-back-to-different-window-size.html
# Missing layoutTestController.findString() http://webkit.org/b/50236
Modified: trunk/LayoutTests/platform/win/Skipped (110938 => 110939)
--- trunk/LayoutTests/platform/win/Skipped 2012-03-16 04:03:24 UTC (rev 110938)
+++ trunk/LayoutTests/platform/win/Skipped 2012-03-16 04:05:17 UTC (rev 110939)
@@ -1530,10 +1530,6 @@
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/content-language-font-selection.html
-fast/text/international/content-language-with-subtags.html
-
# Web Intents is not yet enabled.
webintents/
Modified: trunk/LayoutTests/platform/wincairo/Skipped (110938 => 110939)
--- trunk/LayoutTests/platform/wincairo/Skipped 2012-03-16 04:03:24 UTC (rev 110938)
+++ trunk/LayoutTests/platform/wincairo/Skipped 2012-03-16 04:05:17 UTC (rev 110939)
@@ -2043,10 +2043,6 @@
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/content-language-font-selection.html
-fast/text/international/content-language-with-subtags.html
-
# Web Intents is not yet enabled.
webintents/
Modified: trunk/LayoutTests/platform/wk2/Skipped (110938 => 110939)
--- trunk/LayoutTests/platform/wk2/Skipped 2012-03-16 04:03:24 UTC (rev 110938)
+++ trunk/LayoutTests/platform/wk2/Skipped 2012-03-16 04:05:17 UTC (rev 110939)
@@ -292,8 +292,6 @@
fast/images/animated-gif-restored-from-bfcache.html
fast/repaint/no-caret-repaint-in-non-content-editable-element.html
fast/text/zero-font-size.html
-fast/text/international/content-language-font-selection.html
-fast/text/international/content-language-with-subtags.html
css3/filters/effect-combined.html
css3/filters/filter-repaint.html
