Auto merge of #19022 - glennw:update-wr-wavy, r=jdm

Update WR (line decorations, pre-mul borders, mac fonts)

<!-- 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/19022)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-10-25 16:56:38 -05:00 committed by GitHub
commit a814fc578f
2 changed files with 32 additions and 35 deletions

View file

@ -460,14 +460,11 @@ impl WebRenderDisplayItemConverter for DisplayItem {
webrender_api::LayoutSize::zero());
}
DisplayItem::Line(ref item) => {
let box_bounds = item.base.bounds.to_rectf();
builder.push_line(&self.prim_info(),
box_bounds.origin.y + box_bounds.size.height,
box_bounds.origin.x,
box_bounds.origin.x + box_bounds.size.width,
// TODO(gw): Use a better estimate for wavy line thickness.
(0.33 * item.base.bounds.size.height.to_f32_px()).ceil(),
webrender_api::LineOrientation::Horizontal,
box_bounds.size.height,
item.color,
&item.color,
item.style);
}
DisplayItem::BoxShadow(ref item) => {