Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-24 09:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #1789 : lpy/servo/issue1761, r=jdm

Browse source 
see #1761
This commit is contained in:
bors-servo 2014-03-01 09:37:34 -05:00
commit 478c9bfc57
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/script/dom/element.rs
View file

@ -21,7 +21,7 @@ use dom::eventtarget::{EventTarget, NodeTargetTypeId};
use dom::htmlimageelement::HTMLImageElement;
use dom::htmliframeelement::HTMLIFrameElement;
use dom::htmlobjectelement::HTMLObjectElement;
use dom::node::{ElementNodeTypeId, Node, NodeHelpers, NodeIterator};
use dom::node::{ElementNodeTypeId, Node, NodeHelpers, NodeIterator, document_from_node};
use dom::htmlserializer::serialize;
use layout_interface::{ContentBoxQuery, ContentBoxResponse, ContentBoxesQuery};
use layout_interface::{ContentBoxesResponse, ContentChangedDocumentDamage};
@ -586,7 +586,7 @@ impl IElement for JS<Element> {
fn bind_to_tree_impl(&self) {
match self.get().get_attribute(Null, "id") {
Some(attr) => {
let mut doc = self.get().node.owner_doc();
let mut doc = document_from_node(self);
doc.get_mut().register_named_element(self, attr.get().Value());
}
_ => ()
@ -596,7 +596,7 @@ impl IElement for JS<Element> {
fn unbind_from_tree_impl(&self) {
match self.get().get_attribute(Null, "id") {
Some(attr) => {
let mut doc = self.get().node.owner_doc();
let mut doc = document_from_node(self);
doc.get_mut().unregister_named_element(attr.get().Value());
}
_ => ()

6
src/components/script/dom/htmlimageelement.rs
View file

@ -11,7 +11,7 @@ use dom::document::Document;
use dom::element::{Element, HTMLImageElementTypeId};
use dom::eventtarget::{EventTarget, NodeTargetTypeId};
use dom::htmlelement::HTMLElement;
use dom::node::{Node, ElementNodeTypeId, NodeHelpers};
use dom::node::{Node, ElementNodeTypeId, NodeHelpers, window_from_node};
use extra::url::Url;
use servo_util::geometry::to_px;
use layout_interface::{ContentBoxQuery, ContentBoxResponse};
@ -146,8 +146,8 @@ impl HTMLImageElement {
pub fn Width(&self, abstract_self: &JS<HTMLImageElement>) -> u32 {
let node: JS<Node> = NodeCast::from(abstract_self);
let doc = node.get().owner_doc();
let page = doc.get().window.get().page();
let window = window_from_node(&node);
let page = window.get().page();
let (port, chan) = Chan::new();
let addr = node.to_trusted_node_address();
match page.query_layout(ContentBoxQuery(addr, chan), port) {

22
src/components/script/dom/node.rs
View file

@ -19,6 +19,7 @@ use dom::eventtarget::{EventTarget, NodeTargetTypeId};
use dom::nodelist::{NodeList};
use dom::text::Text;
use dom::processinginstruction::ProcessingInstruction;
use dom::window::Window;
use layout_interface::{LayoutChan, ReapLayoutDataMsg, UntrustedNodeAddress};
use layout_interface::TrustedNodeAddress;
use servo_util::str::{DOMString, null_str_as_empty};
@ -396,7 +397,7 @@ impl NodeHelpers for JS<Node> {
// http://dom.spec.whatwg.org/#node-is-inserted
fn node_inserted(&self) {
assert!(self.parent_node().is_some());
let document = self.get().owner_doc();
let document = document_from_node(self);
for node in self.traverse_preorder() {
if node.is_element() {
@ -411,7 +412,7 @@ impl NodeHelpers for JS<Node> {
// http://dom.spec.whatwg.org/#node-is-removed
fn node_removed(&self) {
assert!(self.parent_node().is_none());
let document = self.get().owner_doc();
let document = document_from_node(self);
for node in self.traverse_preorder() {
if node.is_element() {
@ -964,7 +965,7 @@ impl Node {
}
// Step 2.
if node.get().owner_doc() != *document {
if document_from_node(node) != *document {
for mut descendant in node.traverse_preorder() {
descendant.get_mut().set_owner_doc(document);
}
@ -1101,7 +1102,7 @@ impl Node {
};
// Step 9.
Node::adopt(node, &parent.get().owner_doc());
Node::adopt(node, &document_from_node(parent));
// Step 10.
Node::insert(node, parent, referenceChild, Unsuppressed);
@ -1156,7 +1157,7 @@ impl Node {
pub fn replace_all(mut node: Option<JS<Node>>, parent: &mut JS<Node>) {
// Step 1.
match node {
Some(ref mut node) => Node::adopt(node, &parent.get().owner_doc()),
Some(ref mut node) => Node::adopt(node, &document_from_node(parent)),
None => (),
}
@ -1381,7 +1382,7 @@ impl Node {
};
// Step 9.
Node::adopt(node, &parent.get().owner_doc());
Node::adopt(node, &document_from_node(parent));
{
// Step 10.
@ -1627,3 +1628,12 @@ impl Reflectable for Node {
}
}
pub fn document_from_node<T: NodeBase>(derived: &JS<T>) -> JS<Document> {
let node: JS<Node> = NodeCast::from(derived);
node.get().owner_doc().clone()
}
pub fn window_from_node<T: NodeBase>(derived: &JS<T>) -> JS<Window> {
let document: JS<Document> = document_from_node(derived);
document.get().window.clone()
}