From 907bbdea615a5b2c888101bfe85af34d11ece0ed Mon Sep 17 00:00:00 2001 From: aydinkim Date: Thu, 2 May 2013 17:28:36 +0900 Subject: [PATCH] delete JosefinSans and related works --- src/servo-gfx/JosefinSans-SemiBold.ttf | Bin 33004 -> 0 bytes src/servo-gfx/OFL.txt | 93 ------------------------- src/servo-gfx/font.rs | 1 - src/servo-gfx/font_context.rs | 24 +------ 4 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 src/servo-gfx/JosefinSans-SemiBold.ttf delete mode 100644 src/servo-gfx/OFL.txt diff --git a/src/servo-gfx/JosefinSans-SemiBold.ttf b/src/servo-gfx/JosefinSans-SemiBold.ttf deleted file mode 100644 index f58d378543eca14f50144728ea8eb183c1dca1e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33004 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 diff --git a/src/servo-gfx/OFL.txt b/src/servo-gfx/OFL.txt deleted file mode 100644 index d0a273c523b..00000000000 --- a/src/servo-gfx/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2009, 2010, 2011 Daniel Johnson (). - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/servo-gfx/font.rs b/src/servo-gfx/font.rs index c66d2c3c6ed..ad38b116bac 100644 --- a/src/servo-gfx/font.rs +++ b/src/servo-gfx/font.rs @@ -151,7 +151,6 @@ pub impl FontDescriptor { #[deriving(Eq)] pub enum FontSelector { SelectorPlatformIdentifier(~str), - SelectorStubDummy, // aka, use Josephin Sans } // This struct is the result of mapping a specified FontStyle into the diff --git a/src/servo-gfx/font_context.rs b/src/servo-gfx/font_context.rs index 659aec9b686..1724e1843b0 100644 --- a/src/servo-gfx/font_context.rs +++ b/src/servo-gfx/font_context.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use font::{Font, FontDescriptor, FontGroup, FontStyle, SelectorPlatformIdentifier}; -use font::{SelectorStubDummy, SpecifiedFontStyle, UsedFontStyle}; +use font::{SpecifiedFontStyle, UsedFontStyle}; use font_context; use font_list::FontList; use servo_util::cache::Cache; @@ -14,13 +14,6 @@ use platform::font_context::FontContextHandle; use azure::azure_hl::BackendType; use core::hashmap::HashMap; -// TODO(Issue #164): delete, and get default font from font list -static TEST_FONT: [u8, ..33004] = include_bin!("JosefinSans-SemiBold.ttf"); - -fn test_font_bin() -> ~[u8] { - return vec::from_fn(33004, |i| TEST_FONT[i]); -} - // TODO(Rust #3934): creating lots of new dummy styles is a workaround // for not being able to store symbolic enums in top-level constants. pub fn dummy_style() -> FontStyle { @@ -135,18 +128,6 @@ pub impl<'self> FontContext { } } - // TODO(Issue #194): *always* attach a fallback font to the - // font list, so that this assertion will never fail. - - // assert fonts.len() > 0; - if fonts.len() == 0 { - let desc = FontDescriptor::new(font_context::dummy_style(), SelectorStubDummy); - debug!("(create font group) trying descriptor `%?`", desc); - match self.get_font_by_descriptor(&desc) { - Ok(instance) => fonts.push(instance), - Err(()) => {} - } - } assert!(fonts.len() > 0); // TODO(Issue #179): Split FontStyle into specified and used styles let used_style = copy *style; @@ -158,9 +139,6 @@ pub impl<'self> FontContext { priv fn create_font_instance(&self, desc: &FontDescriptor) -> Result<@mut Font, ()> { return match &desc.selector { - &SelectorStubDummy => { - Font::new_from_buffer(self, test_font_bin(), &desc.style, self.backend) - }, // TODO(Issue #174): implement by-platform-name font selectors. &SelectorPlatformIdentifier(ref identifier) => { let result_handle = self.handle.create_font_from_identifier(copy *identifier,