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

auto merge of #1118 : Ms2ger/servo/NodeList, r=kmcallister

Browse source
This commit is contained in:
bors-servo 2013-10-24 06:43:03 -07:00
commit d97249cc8c
2 changed files with 27 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -664,8 +664,8 @@ impl Node<ScriptView> {
pub fn ChildNodes(&mut self, abstract_self: AbstractNode<ScriptView>) -> @mut NodeList { pub fn ChildNodes(&mut self, abstract_self: AbstractNode<ScriptView>) -> @mut NodeList {
match self.child_list { match self.child_list {
None => { None => {
let (scope, cx) = self.get_scope_and_cx(); let window = self.owner_doc().document().window;
let list = NodeList::new_child_list(abstract_self, cx, scope); let list = NodeList::new_child_list(window, abstract_self);
self.child_list = Some(list); self.child_list = Some(list);
list list
} }

53
src/components/script/dom/nodelist.rs
View file

@ -3,9 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::codegen::NodeListBinding; use dom::bindings::codegen::NodeListBinding;
use dom::bindings::utils::{Reflectable, Reflector}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::node::{AbstractNode, ScriptView}; use dom::node::{AbstractNode, ScriptView};
use script_task::page_from_context; use dom::window::Window;
use js::jsapi::{JSObject, JSContext}; use js::jsapi::{JSObject, JSContext};
@ -16,32 +16,32 @@ enum NodeListType {
pub struct NodeList { pub struct NodeList {
list_type: NodeListType, list_type: NodeListType,
reflector_: Reflector reflector_: Reflector,
window: @mut Window,
} }
impl NodeList { impl NodeList {
pub fn new_simple_list(elements: ~[AbstractNode<ScriptView>], cx: *JSContext, scope: *JSObject) -> @mut NodeList { pub fn new_inherited(window: @mut Window,
let list = @mut NodeList { list_type: NodeListType) -> NodeList {
list_type: Simple(elements), NodeList {
reflector_: Reflector::new() list_type: list_type,
}; reflector_: Reflector::new(),
window: window,
list.init_wrapper(cx, scope); }
list
} }
pub fn new_child_list(node: AbstractNode<ScriptView>, cx: *JSContext, scope: *JSObject) -> @mut NodeList { pub fn new(window: @mut Window,
let list = @mut NodeList { list_type: NodeListType) -> @mut NodeList {
list_type: Children(node), reflect_dom_object(@mut NodeList::new_inherited(window, list_type),
reflector_: Reflector::new() window, NodeListBinding::Wrap)
};
list.init_wrapper(cx, scope);
list
} }
fn init_wrapper(@mut self, cx: *JSContext, scope: *JSObject) { pub fn new_simple_list(window: @mut Window, elements: ~[AbstractNode<ScriptView>]) -> @mut NodeList {
self.wrap_object_shared(cx, scope); NodeList::new(window, Simple(elements))
}
pub fn new_child_list(window: @mut Window, node: AbstractNode<ScriptView>) -> @mut NodeList {
NodeList::new(window, Children(node))
} }
pub fn Length(&self) -> u32 { pub fn Length(&self) -> u32 {
@ -75,14 +75,11 @@ impl Reflectable for NodeList {
&mut self.reflector_ &mut self.reflector_
} }
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject {
NodeListBinding::Wrap(cx, scope, self) unreachable!();
} }
fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> {
let page = page_from_context(cx); Some(self.window as @mut Reflectable)
unsafe {
Some((*page).frame.get_ref().window as @mut Reflectable)
}
} }
} }