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

Update WR (scroll root changes, border gradients, yuv updates).  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15879)
servo · Mar 9, 2017 · 802440d · 802440d
2 parents dc3b32c + ce49bc5
commit 802440d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs
@@ -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(),
         }