Auto merge of #17035 - upsuper:bug1188074, r=heycam

Allow text to be in background shorthand

Servo side change of [bug 1188074](https://bugzilla.mozilla.org/show_bug.cgi?id=1188074).

<!-- 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/17035)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-25 04:10:43 -05:00 committed by GitHub
commit 3016a03650

View file

@ -72,13 +72,6 @@
if ${name}.is_none() {
if let Ok(value) = input.try(|input| background_${name}::single_value
::parse(context, input)) {
% if name == "clip" and product == "gecko":
// "text" value of background-clip should not be part of background
// shorthand per current spec and impls.
if value == background_clip::single_value::SpecifiedValue::text {
return Err(());
}
% endif
${name} = Some(value);
continue
}