Skip to content

GitLab

T
tangled
Commit 88d6260b authored by Sergey Ulanov's avatar Sergey Ulanov Committed by Commit Bot
Browse files
Options

Update Android font config used in layout tests. 

Now the config files refers to the open fonts from
third_party/test_fonts instead of ms-ttf-corefonts that were used
previously.

Also fixed android_fallback_fonts.xml to refer to
NotoSansCJKjp-Regular.otf instead of NotoSansCJKkr-Regular.otf to
match the fonts we have in //third_party/test_fonts

Bug: 787020
Change-Id: Ie50f76c0a183e9904a3dae2d6fef091a6c2abe83
Reviewed-on: https://chromium-review.googlesource.com/1048872Reviewed-by: default avatarPeter Beverloo <peter@chromium.org>
Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558376}
parent a4a5823d
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 63 deletions
content/shell/test_runner/resources/fonts/android_fallback_fonts.xml
View file @ 88d6260b
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</family> </family>
<family> <family>
<fileset> <fileset>
<file>NotoSansCJKkr-Regular.otf</file> <file>NotoSansCJKjp-Regular.otf</file>
</fileset> </fileset>
</family> </family>
<family> <family>
......
content/shell/test_runner/resources/fonts/android_main_fonts.xml
View file @ 88d6260b
...@@ -6,31 +6,34 @@ ...@@ -6,31 +6,34 @@
<name>sans</name> <name>sans</name>
<name>sans serif</name> <name>sans serif</name>
<name>sans-serif</name> <name>sans-serif</name>
<name>Arimo</name>
<name>Arial</name> <name>Arial</name>
<name>Helvetica</name> <name>Helvetica</name>
</nameset> </nameset>
<fileset> <fileset>
<file>Arial.ttf</file> <file>Arimo-Regular.ttf</file>
<file>Arial_Bold.ttf</file> <file>Arimo-Bold.ttf</file>
<file>Arial_Italic.ttf</file> <file>Arimo-Italic.ttf</file>
<file>Arial_Bold_Italic.ttf</file> <file>Arimo-BoldItalic.ttf</file>
</fileset> </fileset>
</family> </family>
<family> <family>
<nameset> <nameset>
<name>serif</name> <name>serif</name>
<name>Tinos</name>
<name>Times</name> <name>Times</name>
<name>Times New Roman</name> <name>Times New Roman</name>
<name>Monaco</name> <name>Monaco</name>
<!-- Match Linux. See comments of SubpixelPositioning in fonts.conf --> <!-- Match Linux. See comments of SubpixelPositioning in
base/test/fontconfig_util_linux.cc -->
<name>SubpixelPositioning</name> <name>SubpixelPositioning</name>
</nameset> </nameset>
<fileset> <fileset>
<file>Times_New_Roman.ttf</file> <file>Tinos-Regular.ttf</file>
<file>Times_New_Roman_Bold.ttf</file> <file>Tinos-Bold.ttf</file>
<file>Times_New_Roman_Italic.ttf</file> <file>Tinos-Italic.ttf</file>
<file>Times_New_Roman_Bold_Italic.ttf</file> <file>Tinos-BoldItalic.ttf</file>
</fileset> </fileset>
</family> </family>
...@@ -38,78 +41,37 @@ ...@@ -38,78 +41,37 @@
<nameset> <nameset>
<name>mono</name> <name>mono</name>
<name>monospace</name> <name>monospace</name>
<name>Cousine</name>
<name>Courier</name> <name>Courier</name>
<name>Courier New</name> <name>Courier New</name>
</nameset> </nameset>
<fileset> <fileset>
<file>Courier_New.ttf</file> <file>Cousine-Regular.ttf</file>
<file>Courier_New_Bold.ttf</file> <file>Cousine-Bold.ttf</file>
<file>Courier_New_Italic.ttf</file> <file>Cousine-Italic.ttf</file>
<file>Courier_New_Bold_Italic.ttf</file> <file>Cousine-BoldItalic.ttf</file>
</fileset>
</family>
<family>
<nameset>
<name>cursive</name>
<name>Comic Sans MS</name>
</nameset>
<fileset>
<file>Comic_Sans_MS.ttf</file>
<file>Comic_Sans_MS_Bold.ttf</file>
</fileset>
</family>
<family>
<nameset>
<name>fantasy</name>
<name>Impact</name>
</nameset>
<fileset>
<file>Impact.ttf</file>
</fileset> </fileset>
</family> </family>
<family> <family>
<nameset> <nameset>
<name>Gelasio</name>
<name>Georgia</name> <name>Georgia</name>
</nameset> </nameset>
<fileset> <fileset>
<file>Georgia.ttf</file> <file>Gelasio-Regular.ttf</file>
<file>Georgia_Bold.ttf</file> <file>Gelasio-Bold.ttf</file>
<file>Georgia_Italic.ttf</file> <file>Gelasio-Italic.ttf</file>
<file>Georgia_Bold_Italic.ttf</file> <file>Gelasio-BoldItalic.ttf</file>
</fileset> </fileset>
</family> </family>
<family>
<nameset>
<name>Trebuchet MS</name>
</nameset>
<fileset>
<file>Trebuchet_MS.ttf</file>
<file>Trebuchet_MS_Bold.ttf</file>
<file>Trebuchet_MS_Italic.ttf</file>
<file>Trebuchet_MS_Bold_Italic.ttf</file>
</fileset>
</family>
<family>
<nameset>
<name>Verdana</name>
</nameset>
<fileset>
<file>Verdana.ttf</file>
<file>Verdana_Bold.ttf</file>
<file>Verdana_Italic.ttf</file>
<file>Verdana_Bold_Italic.ttf</file>
</fileset>
</family>
<family> <family>
<nameset> <nameset>
<name>Ahem</name> <name>Ahem</name>
<!-- Match Linux. See comments of SubpixelPositioning in fonts.conf --> <!-- Match Linux. See comments of SubpixelPositioning in
base/test/fontconfig_util_linux.cc -->
<name>SubpixelPositioningAhem</name> <name>SubpixelPositioningAhem</name>
</nameset> </nameset>
<fileset> <fileset>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment