Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Avoid doing stupid calls to Node::style.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2018-01-15 03:09:13 +01:00
parent bc29a16285
commit ecf538ff04
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/construct.rs
View file

@ -1465,8 +1465,10 @@ impl<'a, ConcreteThreadSafeLayoutNode> PostorderNodeMutTraversal<ConcreteThreadS
fn process(&mut self, node: &ConcreteThreadSafeLayoutNode) { fn process(&mut self, node: &ConcreteThreadSafeLayoutNode) {
node.insert_flags(LayoutDataFlags::HAS_NEWLY_CONSTRUCTED_FLOW); node.insert_flags(LayoutDataFlags::HAS_NEWLY_CONSTRUCTED_FLOW);
let style = node.style(self.style_context());
// Bail out if this node has an ancestor with display: none. // Bail out if this node has an ancestor with display: none.
if node.style(self.style_context()).is_in_display_none_subtree() { if style.is_in_display_none_subtree() {
self.set_flow_construction_result(node, ConstructionResult::None); self.set_flow_construction_result(node, ConstructionResult::None);
return; return;
} }
@ -1475,11 +1477,9 @@ impl<'a, ConcreteThreadSafeLayoutNode> PostorderNodeMutTraversal<ConcreteThreadS
let (display, float, positioning) = match node.type_id() { let (display, float, positioning) = match node.type_id() {
None => { None => {
// Pseudo-element. // Pseudo-element.
let style = node.style(self.style_context());
(style.get_box().display, style.get_box().float, style.get_box().position) (style.get_box().display, style.get_box().float, style.get_box().position)
} }
Some(LayoutNodeType::Element(_)) => { Some(LayoutNodeType::Element(_)) => {
let style = node.style(self.style_context());
let original_display = style.get_box().original_display; let original_display = style.get_box().original_display;
let munged_display = match original_display { let munged_display = match original_display {
Display::Inline | Display::InlineBlock => original_display, Display::Inline | Display::InlineBlock => original_display,