Auto merge of #15879 - glennw:update-wr-scroll, r=mrobinson

Update WR (scroll root changes, border gradients, yuv updates).

<!-- 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/15879)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-08 23:43:10 -08:00 committed by GitHub
commit 802440dbf0
2 changed files with 26 additions and 26 deletions

View file

@ -405,7 +405,7 @@ impl WebRenderDisplayItemConverter for DisplayItem {
builder.push_scroll_layer(clip,
item.scroll_root.size.to_sizef(),
item.scroll_root.id.convert_to_webrender());
Some(item.scroll_root.id.convert_to_webrender()));
}
DisplayItem::PopScrollRoot(_) => builder.pop_scroll_layer(),
}