diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-24 02:18:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-24 02:18:01 -0500 |
| commit | b4cebe1920ee9dc64f1a080fb940ea77743692a2 (patch) | |
| tree | 0959876977184ba2326a314df1556ec7fa420512 /components/layout/display_list_builder.rs | |
| parent | 7f80d9cb455b2b75dfbf9ff3414f072717b376a3 (diff) | |
| parent | 078d4ed40c7c3858f84200f9354351e99ca18d2e (diff) | |
| download | servo-b4cebe1920ee9dc64f1a080fb940ea77743692a2.tar.gz servo-b4cebe1920ee9dc64f1a080fb940ea77743692a2.zip | |
Auto merge of #17002 - servo:derive-all-the-things, r=emilio
Introduce style::values::generics::rect ▭
<!-- 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/17002)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/display_list_builder.rs')
| -rw-r--r-- | components/layout/display_list_builder.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index 63ec70b7096..13829e8830d 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -1429,8 +1429,7 @@ impl FragmentDisplayListBuilding for Fragment { url.clone(), UsePlaceholder::No); if let Some(webrender_image) = webrender_image { - // The corners array is guaranteed to be len=4 by the css parser. - let corners = &border_style_struct.border_image_slice.corners; + let corners = &border_style_struct.border_image_slice.offsets; state.add_display_item(DisplayItem::Border(box BorderDisplayItem { base: base, @@ -1438,10 +1437,10 @@ impl FragmentDisplayListBuilding for Fragment { details: BorderDetails::Image(ImageBorder { image: webrender_image, fill: border_style_struct.border_image_slice.fill, - slice: SideOffsets2D::new(corners[0].resolve(webrender_image.height), - corners[1].resolve(webrender_image.width), - corners[2].resolve(webrender_image.height), - corners[3].resolve(webrender_image.width)), + slice: SideOffsets2D::new(corners.top.resolve(webrender_image.height), + corners.right.resolve(webrender_image.width), + corners.bottom.resolve(webrender_image.height), + corners.left.resolve(webrender_image.width)), // TODO(gw): Support border-image-outset outset: SideOffsets2D::zero(), repeat_horizontal: convert_repeat_mode(border_style_struct.border_image_repeat.0), |