From 5fd4e17020a31fd0222d1b5e64bbaa7ad1424319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Wed, 10 Apr 2019 12:10:40 +0000 Subject: [PATCH] style: Use ToResolvedValue for computed style serialization. Differential Revision: https://phabricator.services.mozilla.com/D26784 --- components/style/properties/properties.mako.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index bb9a9ef64c9..5f44a259641 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -39,7 +39,7 @@ use style_traits::{SpecifiedValueInfo, StyleParseErrorKind, ToCss}; use to_shmem::impl_trivial_to_shmem; use crate::stylesheets::{CssRuleType, Origin, UrlExtraData}; use crate::values::generics::text::LineHeight; -use crate::values::computed; +use crate::values::{computed, resolved}; use crate::values::computed::NonNegativeLength; use crate::values::serialize_atom_name; use crate::rule_tree::StrongRuleNode; @@ -2812,19 +2812,19 @@ impl ComputedValues { where W: Write, { + use crate::values::resolved::ToResolvedValue; + + let context = resolved::Context { + style: self, + }; + // TODO(emilio): Is it worth to merge branches here just like // PropertyDeclaration::to_css does? - // - // We'd need to get a concept of ~resolved value, which may not be worth - // it. match property_id { % for prop in data.longhands: LonghandId::${prop.camel_case} => { let value = self.clone_${prop.ident}(); - % if prop.predefined_type == "Color": - let value = self.resolve_color(value); - % endif - value.to_css(dest) + value.to_resolved_value(&context).to_css(dest) } % endfor }