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

auto merge of #5127 : KiChjang/servo/partial-eq-jsref, r=Ms2ger

Browse source 
Fixes #5112, #3960
This commit is contained in:
bors-servo 2015-03-05 01:15:44 -07:00
commit 67548a6244
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/bindings/js.rs
View file

@ -727,7 +727,7 @@ impl<'a, T> Clone for JSRef<'a, T> {
}
}
impl<'a, T> PartialEq for JSRef<'a, T> {
impl<'a, 'b, T> PartialEq<JSRef<'b, T>> for JSRef<'a, T> {
fn eq(&self, other: &JSRef<T>) -> bool {
self.ptr == other.ptr
}

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

@ -244,7 +244,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
let browser_context = browser_context.as_ref().unwrap();
let active_document = browser_context.active_document().root();
if self.clone() != active_document.r() {
if self != active_document.r() {
return false;
}
// FIXME: It should also check whether the browser context is top-level or not

10
components/script/dom/node.rs
View file

@ -409,7 +409,7 @@ pub trait NodeHelpers<'a> {
fn child_elements(self) -> ChildElementIterator<'a>;
fn following_siblings(self) -> NodeChildrenIterator<'a>;
fn is_in_doc(self) -> bool;
fn is_inclusive_ancestor_of(self, parent: JSRef<'a, Node>) -> bool; // FIXME: See #3960
fn is_inclusive_ancestor_of(self, parent: JSRef<Node>) -> bool;
fn is_parent_of(self, child: JSRef<Node>) -> bool;
fn type_id(self) -> NodeTypeId;
@ -724,7 +724,7 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> {
}
}
fn is_inclusive_ancestor_of(self, parent: JSRef<'a, Node>) -> bool {
fn is_inclusive_ancestor_of(self, parent: JSRef<Node>) -> bool {
self == parent || parent.ancestors().any(|ancestor| ancestor == self)
}
@ -1385,7 +1385,7 @@ impl Node {
// Step 7-8.
let reference_child = match child {
Some(child) if child.clone() == node => node.next_sibling().map(|node| node.root().get_unsound_ref_forever()),
Some(child) if child == node => node.next_sibling().map(|node| node.root().get_unsound_ref_forever()),
_ => child
};
@ -1955,7 +1955,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
}
// Ok if not caught by previous error checks.
if node.clone() == child {
if node == child {
return Ok(Temporary::from_rooted(child));
}
@ -2115,7 +2115,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
// http://dom.spec.whatwg.org/#dom-node-comparedocumentposition
fn CompareDocumentPosition(self, other: JSRef<Node>) -> u16 {
if self.clone() == other { // FIXME: See issue #3960
if self == other {
// step 2.
0
} else {