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

Inlined content_changed

Browse source
This commit is contained in:
Adrian Utrilla 2016-04-04 11:03:30 +02:00
parent 88d29e537c
commit bc1b8ef4c6
6 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ impl CharacterData {
fn content_changed(&self) { fn content_changed(&self) {
let node = self.upcast::<Node>(); let node = self.upcast::<Node>();
node.owner_doc().content_changed(node, NodeDamage::OtherNodeDamage); node.dirty(NodeDamage::OtherNodeDamage);
} }
} }

17
components/script/dom/cssstyledeclaration.rs
View file

@ -9,7 +9,7 @@ use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, Root}; use dom::bindings::js::{JS, Root};
use dom::bindings::reflector::{Reflector, reflect_dom_object}; use dom::bindings::reflector::{Reflector, reflect_dom_object};
use dom::element::{Element, StylePriority}; 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 dom::window::Window;
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::borrow::ToOwned; use std::borrow::ToOwned;
@ -257,9 +257,8 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration {
element.update_inline_style(decl, priority); element.update_inline_style(decl, priority);
} }
let document = document_from_node(element); let node = element.upcast::<Node>();
let node = element.upcast(); node.dirty(NodeDamage::NodeStyleDamaged);
document.content_changed(node, NodeDamage::NodeStyleDamaged);
Ok(()) Ok(())
} }
@ -292,9 +291,8 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration {
None => element.set_inline_style_property_priority(&[&*property], priority), None => element.set_inline_style_property_priority(&[&*property], priority),
} }
let document = document_from_node(element); let node = element.upcast::<Node>();
let node = element.upcast(); node.dirty(NodeDamage::NodeStyleDamaged);
document.content_changed(node, NodeDamage::NodeStyleDamaged);
Ok(()) Ok(())
} }
@ -329,9 +327,8 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration {
None => elem.remove_inline_style_property(&property), None => elem.remove_inline_style_property(&property),
} }
let document = document_from_node(elem); let node = elem.upcast::<Node>();
let node = elem.upcast(); node.dirty(NodeDamage::NodeStyleDamaged);
document.content_changed(node, NodeDamage::NodeStyleDamaged);
// Step 6 // Step 6
Ok(value) Ok(value)

4
components/script/dom/document.rs
View file

@ -399,10 +399,6 @@ impl Document {
self.encoding.set(encoding); 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) { pub fn content_and_heritage_changed(&self, node: &Node, damage: NodeDamage) {
node.force_dirty_ancestors(damage); node.force_dirty_ancestors(damage);
} }

7
components/script/dom/element.rs
View file

@ -1690,7 +1690,7 @@ impl VirtualMethods for Element {
parse_style_attribute(&value, &doc.base_url(), win.css_error_reporter()) parse_style_attribute(&value, &doc.base_url(), win.css_error_reporter())
}); });
if node.is_in_doc() { if node.is_in_doc() {
doc.content_changed(node, NodeDamage::NodeStyleDamaged); node.dirty(NodeDamage::NodeStyleDamaged);
} }
}, },
&atom!("id") => { &atom!("id") => {
@ -1728,7 +1728,7 @@ impl VirtualMethods for Element {
common_style_affecting_attributes().iter().any(|a| &a.atom == attr.local_name()) || common_style_affecting_attributes().iter().any(|a| &a.atom == attr.local_name()) ||
rare_style_affecting_attributes().iter().any(|a| a == 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) { pub fn set_focus_state(&self, value: bool) {
self.set_state(IN_FOCUS_STATE, value); self.set_state(IN_FOCUS_STATE, value);
let doc = document_from_node(self); self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
doc.content_changed(self.upcast(), NodeDamage::OtherNodeDamage);
} }
pub fn get_hover_state(&self) -> bool { pub fn get_hover_state(&self) -> bool {

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

@ -81,7 +81,7 @@ impl Runnable for ImageResponseHandlerRunnable {
// Mark the node dirty // Mark the node dirty
let document = document_from_node(&*element); let document = document_from_node(&*element);
document.content_changed(element.upcast(), NodeDamage::OtherNodeDamage); element.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
// Fire image.onload // Fire image.onload
if trigger_image_load { if trigger_image_load {

3
components/script/script_thread.rs
View file

@ -2117,8 +2117,7 @@ impl ScriptThread {
// Kick off the initial reflow of the page. // Kick off the initial reflow of the page.
debug!("kicking off initial reflow of {:?}", final_url); debug!("kicking off initial reflow of {:?}", final_url);
document.disarm_reflow_timeout(); document.disarm_reflow_timeout();
document.content_changed(document.upcast(), document.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
NodeDamage::OtherNodeDamage);
let window = window_from_node(document.r()); let window = window_from_node(document.r());
window.reflow(ReflowGoal::ForDisplay, ReflowQueryType::NoQuery, ReflowReason::FirstLoad); window.reflow(ReflowGoal::ForDisplay, ReflowQueryType::NoQuery, ReflowReason::FirstLoad);