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

auto merge of #3562 : Ms2ger/servo/cleanup-fragment-node, r=jdm

Browse source
This commit is contained in:
bors-servo 2014-10-03 03:48:25 -06:00
commit a2531cd8aa
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@ use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
use dom::bindings::codegen::InheritTypes::{DocumentDerived, EventCast, HTMLElementCast}; use dom::bindings::codegen::InheritTypes::{DocumentDerived, EventCast, HTMLElementCast};
use dom::bindings::codegen::InheritTypes::{HTMLHeadElementCast, TextCast, ElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLHeadElementCast, TextCast, ElementCast};
use dom::bindings::codegen::InheritTypes::{DocumentTypeCast, HTMLHtmlElementCast, NodeCast}; use dom::bindings::codegen::InheritTypes::{DocumentTypeCast, HTMLHtmlElementCast, NodeCast};
use dom::bindings::codegen::InheritTypes::EventTargetCast; use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLAnchorElementCast};
use dom::bindings::codegen::InheritTypes::{HTMLAnchorElementDerived, HTMLAppletElementDerived}; use dom::bindings::codegen::InheritTypes::{HTMLAnchorElementDerived, HTMLAppletElementDerived};
use dom::bindings::codegen::InheritTypes::{HTMLAreaElementDerived, HTMLEmbedElementDerived}; use dom::bindings::codegen::InheritTypes::{HTMLAreaElementDerived, HTMLEmbedElementDerived};
use dom::bindings::codegen::InheritTypes::{HTMLFormElementDerived, HTMLImageElementDerived}; use dom::bindings::codegen::InheritTypes::{HTMLFormElementDerived, HTMLImageElementDerived};
@ -36,6 +36,7 @@ use dom::element::{HTMLHtmlElementTypeId, HTMLHeadElementTypeId, HTMLTitleElemen
use dom::element::{HTMLBodyElementTypeId, HTMLFrameSetElementTypeId}; use dom::element::{HTMLBodyElementTypeId, HTMLFrameSetElementTypeId};
use dom::event::Event; use dom::event::Event;
use dom::eventtarget::{EventTarget, NodeTargetTypeId, EventTargetHelpers}; use dom::eventtarget::{EventTarget, NodeTargetTypeId, EventTargetHelpers};
use dom::htmlanchorelement::HTMLAnchorElement;
use dom::htmlcollection::{HTMLCollection, CollectionFilter}; use dom::htmlcollection::{HTMLCollection, CollectionFilter};
use dom::htmlelement::HTMLElement; use dom::htmlelement::HTMLElement;
use dom::htmlheadelement::HTMLHeadElement; use dom::htmlheadelement::HTMLHeadElement;
@ -279,21 +280,21 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
} }
/// Attempt to find a named element in this page's document. /// Attempt to find a named element in this page's document.
/// https://html.spec.whatwg.org/multipage/#the-indicated-part-of-the-document
fn find_fragment_node(self, fragid: DOMString) -> Option<Temporary<Element>> { fn find_fragment_node(self, fragid: DOMString) -> Option<Temporary<Element>> {
match self.GetElementById(fragid.clone()) { self.GetElementById(fragid.clone()).or_else(|| {
Some(node) => Some(node), let check_anchor = |&node: &JSRef<HTMLAnchorElement>| {
None => { let elem: JSRef<Element> = ElementCast::from_ref(node);
let doc_node: JSRef<Node> = NodeCast::from_ref(self); elem.get_attribute(ns!(""), "name").root().map_or(false, |attr| {
let mut anchors = doc_node.traverse_preorder() attr.deref().value().as_slice() == fragid.as_slice()
.filter(|node| node.is_anchor_element()); })
anchors.find(|node| { };
let elem: JSRef<Element> = ElementCast::to_ref(*node).unwrap(); let doc_node: JSRef<Node> = NodeCast::from_ref(self);
elem.get_attribute(ns!(""), "name").root().map_or(false, |attr| { doc_node.traverse_preorder()
attr.deref().value().as_slice() == fragid.as_slice() .filter_map(|node| HTMLAnchorElementCast::to_ref(node))
}) .find(check_anchor)
}).map(|node| Temporary::from_rooted(ElementCast::to_ref(node).unwrap())) .map(|node| Temporary::from_rooted(ElementCast::from_ref(node)))
} })
}
} }
} }