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

Attempt to fix incremental layout

Browse source 
I have no idea how to test it,
but this code builds and is close enough to what it was befor #1109.

Review much needed.
This commit is contained in:
Simon Sapin 2013-10-23 14:00:18 +02:00
parent 9b25df1968
commit 86da932927
2 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/main/css/matching.rs
View file

@ -6,6 +6,8 @@
use std::cell::Cell;
use css::node_style::StyledNode;
use css::node_util::NodeUtil;
use layout::incremental;
use script::dom::node::{AbstractNode, LayoutView};
use style::Stylist;
@ -39,7 +41,7 @@ impl MatchMethods for AbstractNode<LayoutView> {
for kid in self.children() {
if kid.is_element() {
kid.match_subtree(stylist);
kid.match_subtree(stylist);
}
}
}
@ -54,7 +56,15 @@ impl MatchMethods for AbstractNode<LayoutView> {
};
let cell = Cell::new(computed_values);
do self.write_layout_data |data| {
data.style = Some(cell.take());
let style = cell.take();
// If there was an existing style, compute the damage that
// incremental layout will need to fix.
match data.style {
None => (),
Some(ref previous_style) => self.set_restyle_damage(
incremental::compute_damage(previous_style, &style))
}
data.style = Some(style);
}
}
fn cascade_subtree(&self, parent: Option<AbstractNode<LayoutView>>) {

37
src/components/main/layout/incremental.rs
View file

@ -2,9 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use newcss::complete::CompleteSelectResults;
use script::dom::node::{AbstractNode, LayoutView};
use style::ComputedValues;
/// Individual layout actions that may be necessary after restyling.
///
@ -113,18 +111,14 @@ impl RestyleDamage {
// breakage on modifications.
macro_rules! add_if_not_equal(
($old:ident, $new:ident, $damage:ident,
[ $($effect:ident),* ], [ $($getter:ident),* ]) => ({
if $( ($old.$getter() != $new.$getter()) )||* {
[ $($effect:ident),* ], [ $($style_struct:ident.$name:ident),* ]) => ({
if $( ($old.$style_struct.$name != $new.$style_struct.$name) )||* {
$damage.union_in_place( restyle_damage!( $($effect),* ) );
}
})
)
pub fn compute_damage(node: &AbstractNode<LayoutView>,
old_results: &CompleteSelectResults, new_results: &CompleteSelectResults)
-> RestyleDamage {
let old = old_results.computed_style();
let new = new_results.computed_style();
pub fn compute_damage(old: &ComputedValues, new: &ComputedValues) -> RestyleDamage {
let mut damage = RestyleDamage::none();
// This checks every CSS property, as enumerated in
@ -134,21 +128,18 @@ pub fn compute_damage(node: &AbstractNode<LayoutView>,
// FIXME: We can short-circuit more of this.
add_if_not_equal!(old, new, damage, [ Repaint ],
[ color, background_color, border_top_color, border_right_color,
border_bottom_color, border_left_color ]);
[ Color.color, Background.background_color,
Border.border_top_color, Border.border_right_color,
Border.border_bottom_color, Border.border_left_color ]);
add_if_not_equal!(old, new, damage, [ Repaint, BubbleWidths, Reflow ],
[ border_top_width, border_right_width, border_bottom_width,
border_left_width, margin_top, margin_right, margin_bottom, margin_left,
padding_top, padding_right, padding_bottom, padding_left, position,
width, height, float, font_family, font_size, font_style, font_weight,
text_align, text_decoration, line_height ]);
// Handle 'display' specially because it has this 'is_root' parameter.
let is_root = node.is_root();
if old.display(is_root) != new.display(is_root) {
damage.union_in_place(restyle_damage!(Repaint, BubbleWidths, Reflow));
}
[ Border.border_top_width, Border.border_right_width,
Border.border_bottom_width, Border.border_left_width,
Margin.margin_top, Margin.margin_right, Margin.margin_bottom, Margin.margin_left,
Padding.padding_top, Padding.padding_right, Padding.padding_bottom, Padding.padding_left,
Box.position, Box.width, Box.height, Box.float, Box.display,
Font.font_family, Font.font_size, Font.font_style, Font.font_weight,
Text.text_align, Text.text_decoration, Box.line_height ]);
// FIXME: test somehow that we checked every CSS property