aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/display_list_builder.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-04-09 01:24:28 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-04-09 01:24:28 +0530
commit4da38cdd7c26d24d6c9de75d3f3509ae372dd25b (patch)
treee11cdac91fb10eae1b6c0ede98f36bcfcfab282c /components/layout/display_list_builder.rs
parentc56eb65b7c117911bc63fdb695705abc2606211e (diff)
parent96835c6d6f3ae3554506f7c34ed944654c97d472 (diff)
downloadservo-4da38cdd7c26d24d6c9de75d3f3509ae372dd25b.tar.gz
servo-4da38cdd7c26d24d6c9de75d3f3509ae372dd25b.zip
Auto merge of #10324 - perlun:rename-style-structs, r=bholley
Renamed the style structs Renamed style structs. The idea is to rename all style structs from Foo to ServoFoo, as described out in #10185. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10324) <!-- Reviewable:end -->
Diffstat (limited to 'components/layout/display_list_builder.rs')
-rw-r--r--components/layout/display_list_builder.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs
index 729063c3872..f4c6094f0b5 100644
--- a/components/layout/display_list_builder.rs
+++ b/components/layout/display_list_builder.rs
@@ -50,7 +50,7 @@ use style::computed_values::{background_repeat, background_size};
use style::computed_values::{border_style, image_rendering, overflow_x, position};
use style::computed_values::{transform, transform_style, visibility};
use style::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize, WritingMode};
-use style::properties::style_structs::Border;
+use style::properties::style_structs::ServoBorder;
use style::properties::{self, ComputedValues, ServoComputedValues};
use style::values::RGBA;
use style::values::computed;
@@ -306,7 +306,7 @@ fn handle_overlapping_radii(size: &Size2D<Au>, radii: &BorderRadii<Au>) -> Borde
}
}
-fn build_border_radius(abs_bounds: &Rect<Au>, border_style: &Border) -> BorderRadii<Au> {
+fn build_border_radius(abs_bounds: &Rect<Au>, border_style: &ServoBorder) -> BorderRadii<Au> {
// TODO(cgaebel): Support border radii even in the case of multiple border widths.
// This is an extension of supporting elliptical radii. For now, all percentage
// radii will be relative to the width.