diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-09-17 06:50:57 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-09-17 06:50:57 -0600 |
| commit | 1b6d4daf85d672265824a014dba99c94c8c08814 (patch) | |
| tree | 6aa73602c3f5622f05db26273a1c1feec28d65e4 /components/layout/layout_task.rs | |
| parent | 6cd098da302db85975d0967ddee836f04eae3bd5 (diff) | |
| parent | feaf6f4c3fbee9cafb3fdf9981c3ab639a56195b (diff) | |
| download | servo-1b6d4daf85d672265824a014dba99c94c8c08814.tar.gz servo-1b6d4daf85d672265824a014dba99c94c8c08814.zip | |
Auto merge of #7555 - SimonSapin:custom-properties++, r=mbrubeck
Custom properties, take 2
Support `var()` in shorthand properties, and fix various bugs.
r? @pcwalton
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7555)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/layout_task.rs')
| -rw-r--r-- | components/layout/layout_task.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index 1a8311e0a78..b6c8a9b4989 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -979,7 +979,7 @@ impl LayoutTask { // FIXME: implement used value computation for line-height property => { rw_data.resolved_style_response = - style.computed_value_to_string(property.as_slice()); + style.computed_value_to_string(property.as_slice()).ok(); } }; } |