Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Use the style of the nearest common ancestor node for background colors

Browse source
This commit is contained in:
Patrick Walton 2012-11-11 17:12:30 -08:00
parent 8c3b8fe3d4
commit 6d4cb4319d
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/servo/layout/box.rs
View file

@ -412,8 +412,8 @@ impl RenderBox : RenderBoxMethods {
match *self { match *self {
UnscannedTextBox(*) => fail ~"Shouldn't see unscanned boxes here.", UnscannedTextBox(*) => fail ~"Shouldn't see unscanned boxes here.",
TextBox(_,d) => { TextBox(_,d) => {
let nearest_element = self.nearest_element(); let nearest_ancestor_element = self.nearest_ancestor_element();
let color = nearest_element.style().color().to_gfx_color(); let color = nearest_ancestor_element.style().color().to_gfx_color();
list.append_item(~DisplayItem::new_Text(&abs_box_bounds, list.append_item(~DisplayItem::new_Text(&abs_box_bounds,
~d.run.serialize(), ~d.run.serialize(),
d.range, d.range,
@ -441,12 +441,16 @@ impl RenderBox : RenderBoxMethods {
self.add_border_to_list(list, &abs_box_bounds); self.add_border_to_list(list, &abs_box_bounds);
} }
fn add_bgcolor_to_list(list: &mut DisplayList, abs_bounds: &Rect<Au>) { fn add_bgcolor_to_list(@self, list: &mut DisplayList, abs_bounds: &Rect<Au>) {
use std::cmp::FuzzyEq; use std::cmp::FuzzyEq;
if !self.d().node.is_element() { return } // FIXME: This causes a lot of background colors to be displayed when they are clearly not
// needed. We could use display list optimization to clean this up, but it still seems
// inefficient. What we really want is something like "nearest ancestor element that
// doesn't have a RenderBox".
let nearest_ancestor_element = self.nearest_ancestor_element();
let bgcolor = self.style().background_color(); let bgcolor = nearest_ancestor_element.style().background_color();
if !bgcolor.alpha.fuzzy_eq(&0.0) { if !bgcolor.alpha.fuzzy_eq(&0.0) {
list.append_item(~DisplayItem::new_SolidColor(abs_bounds, bgcolor.to_gfx_color())); list.append_item(~DisplayItem::new_SolidColor(abs_bounds, bgcolor.to_gfx_color()));
} }
@ -535,8 +539,8 @@ impl RenderBox : BoxedDebugMethods {
// Other methods // Other methods
impl RenderBox { impl RenderBox {
/// Returns the nearest ancestor-or-self node. Infallible. /// Returns the nearest ancestor-or-self element node. Infallible.
fn nearest_element(@self) -> Node { fn nearest_ancestor_element(@self) -> Node {
let mut node = self.d().node; let mut node = self.d().node;
while !node.is_element() { while !node.is_element() {
match NodeTree.get_parent(&node) { match NodeTree.get_parent(&node) {