Auto merge of #17788 - emilio:clean-cascade, r=heycam

style: Cleanup the cascade a good bit.

Was about the time.

<!-- 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/17788)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-07-20 02:36:15 -07:00 committed by GitHub
commit f594ae58a6
20 changed files with 286 additions and 248 deletions

View file

@ -54,9 +54,7 @@ fn assert_computed_serialization<C, F, T>(f: F, input: &'static str, output: &st
let context = Context {
is_root_element: true,
device: &device,
inherited_style: initial_style,
style: StyleBuilder::for_derived_style(&device, initial_style, None),
builder: StyleBuilder::for_derived_style(&device, initial_style, None, None),
cached_system_font: None,
font_metrics_provider: &ServoMetricsProvider,
in_media_query: false,