diff --git a/servo/appveyor.yml b/servo/appveyor.yml index 6c3eb9b1e83a..d76983593bd5 100644 --- a/servo/appveyor.yml +++ b/servo/appveyor.yml @@ -50,7 +50,7 @@ install: - if %BUILD_ENV%==gnu set MSYS=winsymlinks=lnk - if %BUILD_ENV%==gnu bash -lc "echo $MSYSTEM; pacman --needed --noconfirm -Sy pacman-mirrors" - if %BUILD_ENV%==gnu bash -lc "pacman --noconfirm -Sy" - - if %BUILD_ENV%==gnu bash -lc "pacman -Sy --needed --noconfirm mingw-w64-x86_64-toolchain mingw-w64-x86_64-freetype mingw-w64-x86_64-icu mingw-w64-x86_64-nspr mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-expat mingw-w64-x86_64-cmake tar diffutils patch patchutils make python2-setuptools mingw-w64-x86_64-ffmpeg" + - if %BUILD_ENV%==gnu bash -lc "pacman -Sy --needed --noconfirm mingw-w64-x86_64-toolchain mingw-w64-x86_64-freetype mingw-w64-x86_64-icu mingw-w64-x86_64-nspr mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-expat mingw-w64-x86_64-cmake tar diffutils patch patchutils make python2-setuptools" - if %BUILD_ENV%==gnu bash -lc "easy_install-2.7 pip virtualenv" - if %BUILD_ENV%==gnu bash -lc "mv /mingw64/bin/python2.exe /mingw64/bin/python2-mingw64.exe" - if %BUILD_ENV%==gnu bash -lc "mv /mingw64/bin/python2.7.exe /mingw64/bin/python2.7-mingw64.exe" diff --git a/servo/components/gfx/platform/dummy/font.rs b/servo/components/gfx/platform/dummy/font.rs deleted file mode 100644 index 096580c66db5..000000000000 --- a/servo/components/gfx/platform/dummy/font.rs +++ /dev/null @@ -1,80 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -use app_units::Au; -use font::{FontHandleMethods, FontMetrics, FontTableMethods}; -use font::{FontTableTag, FractionalPixel}; -use platform::font_context::FontContextHandle; -use platform::font_template::FontTemplateData; -use std::sync::Arc; -use style::computed_values::{font_stretch, font_weight}; -use text::glyph::GlyphId; - -#[derive(Debug)] -pub struct FontTable { - buffer: Vec, -} - -impl FontTableMethods for FontTable { - fn buffer(&self) -> &[u8] { - &self.buffer - } -} - -#[derive(Debug)] -pub struct FontHandle { - handle: FontContextHandle, -} - -impl Drop for FontHandle { - fn drop(&mut self) { - } -} - -impl FontHandleMethods for FontHandle { - fn new_from_template(fctx: &FontContextHandle, - template: Arc, - pt_size: Option) - -> Result { - Err(()) - } - - fn template(&self) -> Arc { - unimplemented!() - } - fn family_name(&self) -> String { - String::from("Unknown") - } - fn face_name(&self) -> String { - String::from("Unknown") - } - fn is_italic(&self) -> bool { - false - } - fn boldness(&self) -> font_weight::T { - font_weight::T::Weight400 - } - fn stretchiness(&self) -> font_stretch::T { - font_stretch::T::normal - } - fn glyph_index(&self, codepoint: char) -> Option { - None - } - fn glyph_h_kerning(&self, first_glyph: GlyphId, second_glyph: GlyphId) - -> FractionalPixel { - 0.0 - } - fn can_do_fast_shaping(&self) -> bool { - false - } - fn glyph_h_advance(&self, glyph: GlyphId) -> Option { - None - } - fn metrics(&self) -> FontMetrics { - unimplemented!() - } - fn table_for_tag(&self, tag: FontTableTag) -> Option { - None - } -} diff --git a/servo/components/gfx/platform/dummy/font_context.rs b/servo/components/gfx/platform/dummy/font_context.rs deleted file mode 100644 index 4b07896b2dca..000000000000 --- a/servo/components/gfx/platform/dummy/font_context.rs +++ /dev/null @@ -1,13 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#[derive(Clone, HeapSizeOf, Debug)] -pub struct FontContextHandle; - -impl FontContextHandle { - pub fn new() -> FontContextHandle { - FontContextHandle - } -} - diff --git a/servo/components/gfx/platform/dummy/font_list.rs b/servo/components/gfx/platform/dummy/font_list.rs deleted file mode 100644 index 6502572c2871..000000000000 --- a/servo/components/gfx/platform/dummy/font_list.rs +++ /dev/null @@ -1,24 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -pub fn for_each_available_family(mut callback: F) where F: FnMut(String) -{ -} - -pub fn for_each_variation(family_name: &str, mut callback: F) - where F: FnMut(String) -{ -} - -pub fn system_default_family(generic_name: &str) -> Option { - None -} - -pub fn last_resort_font_families() -> Vec { - vec!( - "Unknown".to_owned() - ) -} - -pub static SANS_SERIF_FONT_FAMILY: &'static str = "Unknown"; diff --git a/servo/components/gfx/platform/dummy/font_template.rs b/servo/components/gfx/platform/dummy/font_template.rs deleted file mode 100644 index 7263211fbbfb..000000000000 --- a/servo/components/gfx/platform/dummy/font_template.rs +++ /dev/null @@ -1,40 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -use servo_atoms::Atom; -use std::io::Error; -use webrender_traits::NativeFontHandle; - -#[derive(Deserialize, Serialize, Debug)] -pub struct FontTemplateData { - pub bytes: Vec, - pub identifier: Atom, -} - -impl FontTemplateData { - pub fn new(identifier: Atom, font_data: Option>) -> Result { - let bytes = match font_data { - Some(bytes) => { - bytes - }, - None => { - unimplemented!() - } - }; - - Ok(FontTemplateData { - bytes: bytes, - identifier: identifier, - }) - } - pub fn bytes(&self) -> Vec { - self.bytes.clone() - } - pub fn bytes_if_in_memory(&self) -> Option> { - Some(self.bytes()) - } - pub fn native_font(&self) -> Option { - None - } -} diff --git a/servo/support/windows/Servo.wxs.mako b/servo/support/windows/Servo.wxs.mako index aa4705ff5788..a4b58892eef2 100644 --- a/servo/support/windows/Servo.wxs.mako +++ b/servo/support/windows/Servo.wxs.mako @@ -113,70 +113,8 @@ Name="libfontconfig-1.dll" Source="C:\msys64\mingw64\bin\libfontconfig-1.dll" DiskId="1"/> - - - - - - - - - - - - - - - - - - - - ${include_directory(path.join(top_path, "resources"), "resources")} ${include_directory(browserhtml_path, "browserhtml")} @@ -199,7 +137,6 @@ - % for c in components: % endfor diff --git a/servo/support/windows/fonts.conf b/servo/support/windows/fonts.conf deleted file mode 100644 index 904c9832eb9f..000000000000 --- a/servo/support/windows/fonts.conf +++ /dev/null @@ -1,777 +0,0 @@ - - - - C:\Windows\Fonts - - - - mono - - - monospace - - - - - - - sans serif - - - sans-serif - - - - - - - sans - - - sans-serif - - - - - - - -~/.fontconfig - - - - - - - - - Nazli - serif - - - Lotoos - serif - - - Mitra - serif - - - Ferdosi - serif - - - Badr - serif - - - Zar - serif - - - Titr - serif - - - Jadid - serif - - - Kochi Mincho - serif - - - AR PL SungtiL GB - serif - - - AR PL Mingti2L Big5 - serif - - - MS 明朝 - serif - - - NanumMyeongjo - serif - - - UnBatang - serif - - - Baekmuk Batang - serif - - - MgOpen Canonica - serif - - - Sazanami Mincho - serif - - - AR PL ZenKai Uni - serif - - - ZYSong18030 - serif - - - FreeSerif - serif - - - SimSun - serif - - - - Arshia - sans-serif - - - Elham - sans-serif - - - Farnaz - sans-serif - - - Nasim - sans-serif - - - Sina - sans-serif - - - Roya - sans-serif - - - Koodak - sans-serif - - - Terafik - sans-serif - - - Kochi Gothic - sans-serif - - - AR PL KaitiM GB - sans-serif - - - AR PL KaitiM Big5 - sans-serif - - - MS ゴシック - sans-serif - - - NanumGothic - sans-serif - - - UnDotum - sans-serif - - - Baekmuk Dotum - sans-serif - - - MgOpen Modata - sans-serif - - - Sazanami Gothic - sans-serif - - - AR PL ShanHeiSun Uni - sans-serif - - - ZYSong18030 - sans-serif - - - FreeSans - sans-serif - - - - NSimSun - monospace - - - ZYSong18030 - monospace - - - NanumGothicCoding - monospace - - - FreeMono - monospace - - - - - Homa - fantasy - - - Kamran - fantasy - - - Fantezi - fantasy - - - Tabassom - fantasy - - - - - IranNastaliq - cursive - - - Nafees Nastaleeq - cursive - - - - - - - Bitstream Vera Serif - serif - - - DejaVu Serif - serif - - - Liberation Serif - serif - - - Times New Roman - serif - - - Times - serif - - - Nimbus Roman No9 L - serif - - - Nimbus Roman - serif - - - Luxi Serif - serif - - - Thorndale AMT - serif - - - Thorndale - serif - - - Georgia - serif - - - Garamond - serif - - - Palatino Linotype - serif - - - - Bitstream Vera Sans - sans-serif - - - DejaVu Sans - sans-serif - - - Liberation Sans - sans-serif - - - Arial - sans-serif - - - Helvetica - sans-serif - - - Verdana - sans-serif - - - Albany AMT - sans-serif - - - Albany - sans-serif - - - Nimbus Sans L - sans-serif - - - Nimbus Sans - sans-serif - - - Luxi Sans - sans-serif - - - Trebuchet MS - sans-serif - - - - Bitstream Vera Sans Mono - monospace - - - DejaVu Sans Mono - monospace - - - Liberation Mono - monospace - - - Inconsolata - monospace - - - Courier New - monospace - - - Courier - monospace - - - Andale Mono - monospace - - - Luxi Mono - monospace - - - Cumberland AMT - monospace - - - Cumberland - monospace - - - Nimbus Mono L - monospace - - - Nimbus Mono - monospace - - - - Impact - fantasy - - - Copperplate Gothic Std - fantasy - - - Cooper Std - fantasy - - - Bauhaus Std - fantasy - - - - ITC Zapf Chancery Std - cursive - - - Zapfino - cursive - - - Comic Sans MS - cursive - - - - - - sans-serif - - - serif - - - monospace - - - sans-serif - - - - serif - - Bitstream Vera Serif - DejaVu Serif - Times New Roman - Thorndale AMT - Luxi Serif - Nimbus Roman No9 L - Nimbus Roman - Times - - - - sans-serif - - Bitstream Vera Sans - DejaVu Sans - Verdana - Arial - Albany AMT - Luxi Sans - Nimbus Sans L - Nimbus Sans - Helvetica - Lucida Sans Unicode - BPG Glaho International - Tahoma - - - - monospace - - Bitstream Vera Sans Mono - DejaVu Sans Mono - Inconsolata - Andale Mono - Courier New - Cumberland AMT - Luxi Mono - Nimbus Mono L - Nimbus Mono - Courier - - - - - fantasy - - Impact - Copperplate Gothic Std - Cooper Std - Bauhaus Std - - - - - cursive - - ITC Zapf Chancery Std - Zapfino - Comic Sans MS - - - - - serif - - Artsounk - BPG UTF8 M - Kinnari - Norasi - Frank Ruehl - Dror - JG LaoTimes - Saysettha Unicode - Pigiarniq - B Davat - B Compset - Kacst-Qr - Urdu Nastaliq Unicode - Raghindi - Mukti Narrow - malayalam - Sampige - padmaa - Hapax Berbère - MS Mincho - SimSun - PMingLiu - WenQuanYi Zen Hei - WenQuanYi Bitmap Song - AR PL ShanHeiSun Uni - AR PL New Sung - ZYSong18030 - HanyiSong - MgOpen Canonica - Sazanami Mincho - IPAMonaMincho - IPAMincho - Kochi Mincho - AR PL SungtiL GB - AR PL Mingti2L Big5 - AR PL Zenkai Uni - MS 明朝 - ZYSong18030 - NanumMyeongjo - UnBatang - Baekmuk Batang - KacstQura - Frank Ruehl CLM - Lohit Bengali - Lohit Gujarati - Lohit Hindi - Lohit Marathi - Lohit Maithili - Lohit Kashmiri - Lohit Konkani - Lohit Nepali - Lohit Sindhi - Lohit Punjabi - Lohit Tamil - Meera - Lohit Malayalam - Lohit Kannada - Lohit Telugu - Lohit Oriya - LKLUG - - - - sans-serif - - Nachlieli - Lucida Sans Unicode - Yudit Unicode - Kerkis - ArmNet Helvetica - Artsounk - BPG UTF8 M - Waree - Loma - Garuda - Umpush - Saysettha Unicode - JG Lao Old Arial - GF Zemen Unicode - Pigiarniq - B Davat - B Compset - Kacst-Qr - Urdu Nastaliq Unicode - Raghindi - Mukti Narrow - malayalam - Sampige - padmaa - Hapax Berbère - MS Gothic - UmePlus P Gothic - - SimSun - PMingLiu - WenQuanYi Zen Hei - WenQuanYi Bitmap Song - AR PL ShanHeiSun Uni - AR PL New Sung - MgOpen Modata - VL Gothic - IPAMonaGothic - IPAGothic - Sazanami Gothic - Kochi Gothic - AR PL KaitiM GB - AR PL KaitiM Big5 - AR PL ShanHeiSun Uni - AR PL SungtiL GB - AR PL Mingti2L Big5 - MS ゴシック - ZYSong18030 - TSCu_Paranar - NanumGothic - UnDotum - Baekmuk Dotum - Baekmuk Gulim - KacstQura - Lohit Bengali - Lohit Gujarati - Lohit Hindi - Lohit Marathi - Lohit Maithili - Lohit Kashmiri - Lohit Konkani - Lohit Nepali - Lohit Sindhi - Lohit Punjabi - Lohit Tamil - Meera - Lohit Malayalam - Lohit Kannada - Lohit Telugu - Lohit Oriya - LKLUG - - - - monospace - - Miriam Mono - VL Gothic - IPAMonaGothic - IPAGothic - Sazanami Gothic - Kochi Gothic - AR PL KaitiM GB - MS Gothic - UmePlus Gothic - NSimSun - MingLiu - AR PL ShanHeiSun Uni - AR PL New Sung Mono - HanyiSong - AR PL SungtiL GB - AR PL Mingti2L Big5 - ZYSong18030 - NanumGothicCoding - NanumGothic - UnDotum - Baekmuk Dotum - Baekmuk Gulim - TlwgTypo - TlwgTypist - TlwgTypewriter - TlwgMono - Hasida - Mitra Mono - GF Zemen Unicode - Hapax Berbère - Lohit Bengali - Lohit Gujarati - Lohit Hindi - Lohit Marathi - Lohit Maithili - Lohit Kashmiri - Lohit Konkani - Lohit Nepali - Lohit Sindhi - Lohit Punjabi - Lohit Tamil - Meera - Lohit Malayalam - Lohit Kannada - Lohit Telugu - Lohit Oriya - LKLUG - - - - serif - - FreeSerif - Code2000 - Code2001 - - - - sans-serif - - FreeSans - Arial Unicode MS - Arial Unicode - Code2000 - Code2001 - - - - monospace - - FreeMono - - - -