aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/display_list_builder.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-06-12 14:47:02 -0500
committerGitHub <noreply@github.com>2016-06-12 14:47:02 -0500
commitb5115fc895bb40bce52d39de65a07160935b15fd (patch)
tree1cc341c142106dde33c89fbdf83324c2634be721 /components/layout/display_list_builder.rs
parent0b2cc910d40aeed81d2de3296d371df4d0e81f60 (diff)
parent46cadfdd2ce17172fc508e0240b6ac43f5470e10 (diff)
downloadservo-b5115fc895bb40bce52d39de65a07160935b15fd.tar.gz
servo-b5115fc895bb40bce52d39de65a07160935b15fd.zip
Auto merge of #11696 - mrmiywj:rename-to-less-repetitive, r=ConnorGBrewster
use less repetitive name <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #11689 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because just renaming <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/11696) <!-- Reviewable:end -->
Diffstat (limited to 'components/layout/display_list_builder.rs')
-rw-r--r--components/layout/display_list_builder.rs38
1 files changed, 19 insertions, 19 deletions
diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs
index 94596844684..62d490b4439 100644
--- a/components/layout/display_list_builder.rs
+++ b/components/layout/display_list_builder.rs
@@ -377,7 +377,7 @@ impl FragmentDisplayListBuilding for Fragment {
let base = state.create_base_display_item(&bounds,
&clip,
self.node,
- style.get_cursor(Cursor::DefaultCursor),
+ style.get_cursor(Cursor::Default),
display_list_section);
state.add_display_item(
DisplayItem::SolidColorClass(box SolidColorDisplayItem {
@@ -569,7 +569,7 @@ impl FragmentDisplayListBuilding for Fragment {
let base = state.create_base_display_item(&bounds,
&clip,
self.node,
- style.get_cursor(Cursor::DefaultCursor),
+ style.get_cursor(Cursor::Default),
display_list_section);
state.add_display_item(DisplayItem::ImageClass(box ImageDisplayItem {
base: base,
@@ -697,7 +697,7 @@ impl FragmentDisplayListBuilding for Fragment {
let base = state.create_base_display_item(absolute_bounds,
&clip,
self.node,
- style.get_cursor(Cursor::DefaultCursor),
+ style.get_cursor(Cursor::Default),
display_list_section);
let gradient_display_item = DisplayItem::GradientClass(box GradientDisplayItem {
base: base,
@@ -727,7 +727,7 @@ impl FragmentDisplayListBuilding for Fragment {
let base = state.create_base_display_item(&bounds,
&clip,
self.node,
- style.get_cursor(Cursor::DefaultCursor),
+ style.get_cursor(Cursor::Default),
display_list_section);
state.add_display_item(DisplayItem::BoxShadowClass(box BoxShadowDisplayItem {
base: base,
@@ -799,7 +799,7 @@ impl FragmentDisplayListBuilding for Fragment {
let base = state.create_base_display_item(&bounds,
&clip,
self.node,
- style.get_cursor(Cursor::DefaultCursor),
+ style.get_cursor(Cursor::Default),
display_list_section);
state.add_display_item(DisplayItem::BorderClass(box BorderDisplayItem {
base: base,
@@ -842,7 +842,7 @@ impl FragmentDisplayListBuilding for Fragment {
let base = state.create_base_display_item(&bounds,
&clip,
self.node,
- style.get_cursor(Cursor::DefaultCursor),
+ style.get_cursor(Cursor::Default),
DisplayListSection::Outlines);
state.add_display_item(DisplayItem::BorderClass(box BorderDisplayItem {
base: base,
@@ -867,7 +867,7 @@ impl FragmentDisplayListBuilding for Fragment {
let base = state.create_base_display_item(stacking_relative_border_box,
clip,
self.node,
- style.get_cursor(Cursor::DefaultCursor),
+ style.get_cursor(Cursor::Default),
DisplayListSection::Content);
state.add_display_item(DisplayItem::BorderClass(box BorderDisplayItem {
base: base,
@@ -888,7 +888,7 @@ impl FragmentDisplayListBuilding for Fragment {
let base = state.create_base_display_item(&baseline,
clip,
self.node,
- style.get_cursor(Cursor::DefaultCursor),
+ style.get_cursor(Cursor::Default),
DisplayListSection::Content);
state.add_display_item(DisplayItem::LineClass(box LineDisplayItem {
base: base,
@@ -905,7 +905,7 @@ impl FragmentDisplayListBuilding for Fragment {
let base = state.create_base_display_item(stacking_relative_border_box,
clip,
self.node,
- self.style.get_cursor(Cursor::DefaultCursor),
+ self.style.get_cursor(Cursor::Default),
DisplayListSection::Content);
state.add_display_item(DisplayItem::BorderClass(box BorderDisplayItem {
base: base,
@@ -956,7 +956,7 @@ impl FragmentDisplayListBuilding for Fragment {
let base = state.create_base_display_item(stacking_relative_border_box,
&clip,
self.node,
- self.style.get_cursor(Cursor::DefaultCursor),
+ self.style.get_cursor(Cursor::Default),
display_list_section);
state.add_display_item(
DisplayItem::SolidColorClass(box SolidColorDisplayItem {
@@ -981,14 +981,14 @@ impl FragmentDisplayListBuilding for Fragment {
stacking_relative_border_box.origin.y),
Size2D::new(INSERTION_POINT_LOGICAL_WIDTH,
stacking_relative_border_box.size.height));
- cursor = Cursor::TextCursor;
+ cursor = Cursor::Text;
} else {
insertion_point_bounds =
Rect::new(Point2D::new(stacking_relative_border_box.origin.x,
stacking_relative_border_box.origin.y + advance),
Size2D::new(stacking_relative_border_box.size.width,
INSERTION_POINT_LOGICAL_WIDTH));
- cursor = Cursor::VerticalTextCursor;
+ cursor = Cursor::VerticalText;
};
let base = state.create_base_display_item(&insertion_point_bounds,
@@ -1208,7 +1208,7 @@ impl FragmentDisplayListBuilding for Fragment {
&stacking_relative_content_box,
clip,
self.node,
- self.style.get_cursor(Cursor::DefaultCursor),
+ self.style.get_cursor(Cursor::Default),
DisplayListSection::Content);
let item = DisplayItem::IframeClass(box IframeDisplayItem {
base: base,
@@ -1235,7 +1235,7 @@ impl FragmentDisplayListBuilding for Fragment {
&stacking_relative_content_box,
clip,
self.node,
- self.style.get_cursor(Cursor::DefaultCursor),
+ self.style.get_cursor(Cursor::Default),
DisplayListSection::Content);
state.add_display_item(DisplayItem::ImageClass(box ImageDisplayItem {
base: base,
@@ -1271,7 +1271,7 @@ impl FragmentDisplayListBuilding for Fragment {
&stacking_relative_content_box,
clip,
self.node,
- self.style.get_cursor(Cursor::DefaultCursor),
+ self.style.get_cursor(Cursor::Default),
DisplayListSection::Content);
let display_item = match canvas_data {
CanvasData::Pixels(canvas_data) => {
@@ -1545,12 +1545,12 @@ impl FragmentDisplayListBuilding for Fragment {
// Determine the orientation and cursor to use.
let (orientation, cursor) = if self.style.writing_mode.is_vertical() {
if self.style.writing_mode.is_sideways_left() {
- (TextOrientation::SidewaysLeft, Cursor::VerticalTextCursor)
+ (TextOrientation::SidewaysLeft, Cursor::VerticalText)
} else {
- (TextOrientation::SidewaysRight, Cursor::VerticalTextCursor)
+ (TextOrientation::SidewaysRight, Cursor::VerticalText)
}
} else {
- (TextOrientation::Upright, Cursor::TextCursor)
+ (TextOrientation::Upright, Cursor::Text)
};
// Compute location of the baseline.
@@ -1649,7 +1649,7 @@ impl FragmentDisplayListBuilding for Fragment {
&shadow_bounds(&stacking_relative_box, blur_radius, Au(0)),
clip,
self.node,
- self.style.get_cursor(Cursor::DefaultCursor),
+ self.style.get_cursor(Cursor::Default),
DisplayListSection::Content);
state.add_display_item(DisplayItem::BoxShadowClass(box BoxShadowDisplayItem {
base: base,