Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Fix servo build.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2019-06-03 08:44:57 -04:00
parent aa03bf2e19
commit 2e5078e9c5
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/display_list/builder.rs
View file

@ -1489,7 +1489,7 @@ impl Fragment {
state.add_display_item(DisplayItem::Rectangle(CommonDisplayItem::new( state.add_display_item(DisplayItem::Rectangle(CommonDisplayItem::new(
base, base,
webrender_api::RectangleDisplayItem { webrender_api::RectangleDisplayItem {
color: self.style().get_color().color.to_layout(), color: self.style().get_inherited_text().color.to_layout(),
}, },
))); )));
} }
@ -1967,9 +1967,9 @@ impl Fragment {
// TODO(emilio): Allow changing more properties by ::selection // TODO(emilio): Allow changing more properties by ::selection
// Paint the text with the color as described in its styling. // Paint the text with the color as described in its styling.
let text_color = if text_fragment.selected() { let text_color = if text_fragment.selected() {
self.selected_style().get_color().color self.selected_style().get_inherited_text().color
} else { } else {
self.style().get_color().color self.style().get_inherited_text().color
}; };
// Determine the orientation and cursor to use. // Determine the orientation and cursor to use.

2
components/layout/fragment.rs
View file

@ -1519,7 +1519,7 @@ impl Fragment {
} }
pub fn color(&self) -> Color { pub fn color(&self) -> Color {
self.style().get_color().color self.style().get_inherited_text().color
} }
/// Returns the text decoration line of this fragment, according to the style of the nearest ancestor /// Returns the text decoration line of this fragment, according to the style of the nearest ancestor

2
components/script/dom/canvasrenderingcontext2d.rs
View file

@ -260,7 +260,7 @@ impl CanvasState {
match canvas_element.style() { match canvas_element.style() {
Some(ref s) if canvas_element.has_css_layout_box() => { Some(ref s) if canvas_element.has_css_layout_box() => {
Ok(s.get_color().color) Ok(s.get_inherited_text().color)
}, },
_ => Ok(RGBA::new(0, 0, 0, 255)), _ => Ok(RGBA::new(0, 0, 0, 255)),
} }