Change per-script font tests to use InternalSettings
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Mar 2012 04:05:17 +0000 (04:05 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Mar 2012 04:05:17 +0000 (04:05 +0000)
https://bugs.webkit.org/show_bug.cgi?id=81202

Patch by Matt Falkenhagen <falken@chromium.org> on 2012-03-15
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@110939 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/text/international/content-language-font-selection.html
LayoutTests/fast/text/international/content-language-with-subtags.html
LayoutTests/platform/efl/Skipped
LayoutTests/platform/gtk-wk2/Skipped
LayoutTests/platform/gtk/Skipped
LayoutTests/platform/mac/Skipped
LayoutTests/platform/qt/Skipped
LayoutTests/platform/win/Skipped
LayoutTests/platform/wincairo/Skipped
LayoutTests/platform/wk2/Skipped

index 09a73d1..7f826b5 100644 (file)
@@ -1,3 +1,21 @@
+2012-03-15  Matt Falkenhagen  <falken@chromium.org>
+
+        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  <allan.jensen@nokia.com>
 
         REGRESSION(r106232): The resize handler is always called after loading.
index 6067216..76b73d5 100644 (file)
@@ -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>
index 19be6a6..c996a35 100644 (file)
@@ -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>
index cb2449f..96f7aec 100644 (file)
@@ -652,8 +652,6 @@ fast/parser/noscript-with-javascript-enabled.html
 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
index 95ccc92..bde00c6 100644 (file)
@@ -208,8 +208,6 @@ fast/events/wheelevent-direction-inverted-from-device.html
 
 # 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
index 4c72ac4..04f04f6 100644 (file)
@@ -373,11 +373,6 @@ http/tests/security/text-track-crossorigin.html
 # 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
 
index 0d5bf94..eafb9a1 100644 (file)
@@ -519,10 +519,6 @@ fast/canvas/webgl/uniform-location-length-limits.html
 # 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/
 
index ce02199..f17a4ea 100644 (file)
@@ -1051,8 +1051,6 @@ java
 
 # 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
index 7de433c..3cdef09 100644 (file)
@@ -1530,10 +1530,6 @@ fast/events/platform-wheelevent-paging-y-in-non-scrolling-page.html
 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/
 
index a506620..1d777f4 100644 (file)
@@ -2043,10 +2043,6 @@ fast/events/platform-wheelevent-paging-y-in-non-scrolling-page.html
 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/
 
index 4ca8a8b..e992920 100644 (file)
@@ -292,8 +292,6 @@ fast/harness/override-preferences-2.html
 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