From bc1b8ef4c6d672de5d6c12a8a82286112208e900 Mon Sep 17 00:00:00 2001 From: Adrian Utrilla Date: Mon, 4 Apr 2016 11:03:30 +0200 Subject: [PATCH] Inlined content_changed --- components/script/dom/characterdata.rs | 2 +- components/script/dom/cssstyledeclaration.rs | 17 +++++++---------- components/script/dom/document.rs | 4 ---- components/script/dom/element.rs | 7 +++---- components/script/dom/htmlimageelement.rs | 2 +- components/script/script_thread.rs | 3 +-- 6 files changed, 13 insertions(+), 22 deletions(-) diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs index bffd52831e9..e992834b640 100644 --- a/components/script/dom/characterdata.rs +++ b/components/script/dom/characterdata.rs @@ -65,7 +65,7 @@ impl CharacterData { fn content_changed(&self) { let node = self.upcast::(); - node.owner_doc().content_changed(node, NodeDamage::OtherNodeDamage); + node.dirty(NodeDamage::OtherNodeDamage); } } diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index 7c61098dc88..a33672b7fe6 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -9,7 +9,7 @@ use dom::bindings::inheritance::Castable; use dom::bindings::js::{JS, Root}; use dom::bindings::reflector::{Reflector, reflect_dom_object}; use dom::element::{Element, StylePriority}; -use dom::node::{Node, NodeDamage, document_from_node, window_from_node}; +use dom::node::{Node, NodeDamage, window_from_node}; use dom::window::Window; use std::ascii::AsciiExt; use std::borrow::ToOwned; @@ -257,9 +257,8 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration { element.update_inline_style(decl, priority); } - let document = document_from_node(element); - let node = element.upcast(); - document.content_changed(node, NodeDamage::NodeStyleDamaged); + let node = element.upcast::(); + node.dirty(NodeDamage::NodeStyleDamaged); Ok(()) } @@ -292,9 +291,8 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration { None => element.set_inline_style_property_priority(&[&*property], priority), } - let document = document_from_node(element); - let node = element.upcast(); - document.content_changed(node, NodeDamage::NodeStyleDamaged); + let node = element.upcast::(); + node.dirty(NodeDamage::NodeStyleDamaged); Ok(()) } @@ -329,9 +327,8 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration { None => elem.remove_inline_style_property(&property), } - let document = document_from_node(elem); - let node = elem.upcast(); - document.content_changed(node, NodeDamage::NodeStyleDamaged); + let node = elem.upcast::(); + node.dirty(NodeDamage::NodeStyleDamaged); // Step 6 Ok(value) diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index eb7e0da8a1b..76eca979d10 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -399,10 +399,6 @@ impl Document { self.encoding.set(encoding); } - pub fn content_changed(&self, node: &Node, damage: NodeDamage) { - node.dirty(damage); - } - pub fn content_and_heritage_changed(&self, node: &Node, damage: NodeDamage) { node.force_dirty_ancestors(damage); } diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 42fab95947a..d51aafd25e8 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -1690,7 +1690,7 @@ impl VirtualMethods for Element { parse_style_attribute(&value, &doc.base_url(), win.css_error_reporter()) }); if node.is_in_doc() { - doc.content_changed(node, NodeDamage::NodeStyleDamaged); + node.dirty(NodeDamage::NodeStyleDamaged); } }, &atom!("id") => { @@ -1728,7 +1728,7 @@ impl VirtualMethods for Element { common_style_affecting_attributes().iter().any(|a| &a.atom == attr.local_name()) || rare_style_affecting_attributes().iter().any(|a| a == attr.local_name()) { - doc.content_changed(node, NodeDamage::OtherNodeDamage); + node.dirty(NodeDamage::OtherNodeDamage); } }, _ => {}, @@ -2111,8 +2111,7 @@ impl Element { pub fn set_focus_state(&self, value: bool) { self.set_state(IN_FOCUS_STATE, value); - let doc = document_from_node(self); - doc.content_changed(self.upcast(), NodeDamage::OtherNodeDamage); + self.upcast::().dirty(NodeDamage::OtherNodeDamage); } pub fn get_hover_state(&self) -> bool { diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index 73046e5230d..2de6963a526 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/components/script/dom/htmlimageelement.rs @@ -81,7 +81,7 @@ impl Runnable for ImageResponseHandlerRunnable { // Mark the node dirty let document = document_from_node(&*element); - document.content_changed(element.upcast(), NodeDamage::OtherNodeDamage); + element.upcast::().dirty(NodeDamage::OtherNodeDamage); // Fire image.onload if trigger_image_load { diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index b24af89193e..cfce8de2768 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -2117,8 +2117,7 @@ impl ScriptThread { // Kick off the initial reflow of the page. debug!("kicking off initial reflow of {:?}", final_url); document.disarm_reflow_timeout(); - document.content_changed(document.upcast(), - NodeDamage::OtherNodeDamage); + document.upcast::().dirty(NodeDamage::OtherNodeDamage); let window = window_from_node(document.r()); window.reflow(ReflowGoal::ForDisplay, ReflowQueryType::NoQuery, ReflowReason::FirstLoad);