aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-11-25 13:06:31 -0600
committerGitHub <noreply@github.com>2017-11-25 13:06:31 -0600
commit8f61fde3907f2dde3e697791ccfb9a4d86d1a48c (patch)
tree3ae3352f2a4aed8a757dac4f8143879f4d626307 /components/script/dom
parent49658860d12186b9ccc45fcdb0394886f00afe37 (diff)
parenta470ebd501452e61e806226c72952be623947bde (diff)
downloadservo-8f61fde3907f2dde3e697791ccfb9a4d86d1a48c.tar.gz
servo-8f61fde3907f2dde3e697791ccfb9a4d86d1a48c.zip
Auto merge of #19366 - CYBAI:font-family-out-of-mako, r=emilio
style: Move font-family outside of mako This is a sub-PR of #19015 Besides, this is the last PR for `font.mako.rs`! πŸŽ‰ r? emilio --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #19355 - [x] These changes do not require tests <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19366) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/element.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index b11498e2850..84021ca7c38 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -587,9 +587,9 @@ impl LayoutElementHelpers for LayoutDom<Element> {
shared_lock,
PropertyDeclaration::FontFamily(
font_family::SpecifiedValue::Values(
- font_family::computed_value::FontFamilyList::new(vec![
- font_family::computed_value::FontFamily::from_atom(
- font_family)])))));
+ computed::font::FontFamilyList::new(Box::new([
+ computed::font::SingleFontFamily::from_atom(
+ font_family)]))))));
}
let font_size = self.downcast::<HTMLFontElement>().and_then(|this| this.get_size());