Make the traits for the IDL interfaces take &self

This commit is contained in:
Anthony Ramine 2015-08-27 22:15:54 +02:00
parent 856fda7f2e
commit 709d347872
99 changed files with 1192 additions and 1192 deletions

View file

@ -132,40 +132,40 @@ impl Range {
}
}
impl<'a> RangeMethods for &'a Range {
impl RangeMethods for Range {
// https://dom.spec.whatwg.org/#dom-range-startcontainer
fn StartContainer(self) -> Root<Node> {
fn StartContainer(&self) -> Root<Node> {
self.inner().borrow().start.node()
}
// https://dom.spec.whatwg.org/#dom-range-startoffset
fn StartOffset(self) -> u32 {
fn StartOffset(&self) -> u32 {
self.inner().borrow().start.offset
}
// https://dom.spec.whatwg.org/#dom-range-endcontainer
fn EndContainer(self) -> Root<Node> {
fn EndContainer(&self) -> Root<Node> {
self.inner().borrow().end.node()
}
// https://dom.spec.whatwg.org/#dom-range-endoffset
fn EndOffset(self) -> u32 {
fn EndOffset(&self) -> u32 {
self.inner().borrow().end.offset
}
// https://dom.spec.whatwg.org/#dom-range-collapsed
fn Collapsed(self) -> bool {
fn Collapsed(&self) -> bool {
let inner = self.inner().borrow();
inner.start == inner.end
}
// https://dom.spec.whatwg.org/#dom-range-commonancestorcontainer
fn CommonAncestorContainer(self) -> Root<Node> {
fn CommonAncestorContainer(&self) -> Root<Node> {
self.inner().borrow().common_ancestor_container()
}
// https://dom.spec.whatwg.org/#dom-range-setstartnode-offset
fn SetStart(self, node: &Node, offset: u32) -> ErrorResult {
fn SetStart(&self, node: &Node, offset: u32) -> ErrorResult {
if node.is_doctype() {
// Step 1.
Err(Error::InvalidNodeType)
@ -180,7 +180,7 @@ impl<'a> RangeMethods for &'a Range {
}
// https://dom.spec.whatwg.org/#dom-range-setendnode-offset
fn SetEnd(self, node: &Node, offset: u32) -> ErrorResult {
fn SetEnd(&self, node: &Node, offset: u32) -> ErrorResult {
if node.is_doctype() {
// Step 1.
Err(Error::InvalidNodeType)
@ -195,46 +195,46 @@ impl<'a> RangeMethods for &'a Range {
}
// https://dom.spec.whatwg.org/#dom-range-setstartbeforenode
fn SetStartBefore(self, node: &Node) -> ErrorResult {
fn SetStartBefore(&self, node: &Node) -> ErrorResult {
let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType));
self.SetStart(parent.r(), node.index())
}
// https://dom.spec.whatwg.org/#dom-range-setstartafternode
fn SetStartAfter(self, node: &Node) -> ErrorResult {
fn SetStartAfter(&self, node: &Node) -> ErrorResult {
let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType));
self.SetStart(parent.r(), node.index() + 1)
}
// https://dom.spec.whatwg.org/#dom-range-setendbeforenode
fn SetEndBefore(self, node: &Node) -> ErrorResult {
fn SetEndBefore(&self, node: &Node) -> ErrorResult {
let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType));
self.SetEnd(parent.r(), node.index())
}
// https://dom.spec.whatwg.org/#dom-range-setendafternode
fn SetEndAfter(self, node: &Node) -> ErrorResult {
fn SetEndAfter(&self, node: &Node) -> ErrorResult {
let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType));
self.SetEnd(parent.r(), node.index() + 1)
}
// https://dom.spec.whatwg.org/#dom-range-collapsetostart
fn Collapse(self, to_start: bool) {
fn Collapse(&self, to_start: bool) {
self.inner().borrow_mut().collapse(to_start);
}
// https://dom.spec.whatwg.org/#dom-range-selectnodenode
fn SelectNode(self, node: &Node) -> ErrorResult {
fn SelectNode(&self, node: &Node) -> ErrorResult {
self.inner().borrow_mut().select_node(node)
}
// https://dom.spec.whatwg.org/#dom-range-selectnodecontentsnode
fn SelectNodeContents(self, node: &Node) -> ErrorResult {
fn SelectNodeContents(&self, node: &Node) -> ErrorResult {
self.inner().borrow_mut().select_node_contents(node)
}
// https://dom.spec.whatwg.org/#dom-range-compareboundarypointshow-sourcerange
fn CompareBoundaryPoints(self, how: u16, source_range: &Range)
fn CompareBoundaryPoints(&self, how: u16, source_range: &Range)
-> Fallible<i16> {
if how > RangeConstants::END_TO_START {
// Step 1.
@ -275,7 +275,7 @@ impl<'a> RangeMethods for &'a Range {
}
// https://dom.spec.whatwg.org/#dom-range-clonerange
fn CloneRange(self) -> Root<Range> {
fn CloneRange(&self) -> Root<Range> {
let inner = self.inner().borrow();
let start = &inner.start;
let end = &inner.end;
@ -286,7 +286,7 @@ impl<'a> RangeMethods for &'a Range {
}
// https://dom.spec.whatwg.org/#dom-range-ispointinrangenode-offset
fn IsPointInRange(self, node: &Node, offset: u32) -> Fallible<bool> {
fn IsPointInRange(&self, node: &Node, offset: u32) -> Fallible<bool> {
match self.inner().borrow().compare_point(node, offset) {
Ok(Ordering::Less) => Ok(false),
Ok(Ordering::Equal) => Ok(true),
@ -300,7 +300,7 @@ impl<'a> RangeMethods for &'a Range {
}
// https://dom.spec.whatwg.org/#dom-range-comparepointnode-offset
fn ComparePoint(self, node: &Node, offset: u32) -> Fallible<i16> {
fn ComparePoint(&self, node: &Node, offset: u32) -> Fallible<i16> {
self.inner().borrow().compare_point(node, offset).map(|order| {
match order {
Ordering::Less => -1,
@ -311,7 +311,7 @@ impl<'a> RangeMethods for &'a Range {
}
// https://dom.spec.whatwg.org/#dom-range-intersectsnode
fn IntersectsNode(self, node: &Node) -> bool {
fn IntersectsNode(&self, node: &Node) -> bool {
let inner = self.inner().borrow();
let start = &inner.start;
let start_node = start.node();
@ -343,7 +343,7 @@ impl<'a> RangeMethods for &'a Range {
// https://dom.spec.whatwg.org/#dom-range-clonecontents
// https://dom.spec.whatwg.org/#concept-range-clone
fn CloneContents(self) -> Fallible<Root<DocumentFragment>> {
fn CloneContents(&self) -> Fallible<Root<DocumentFragment>> {
let inner = self.inner.borrow();
let start = &inner.start;
let end = &inner.end;
@ -452,7 +452,7 @@ impl<'a> RangeMethods for &'a Range {
// https://dom.spec.whatwg.org/#dom-range-extractcontents
// https://dom.spec.whatwg.org/#concept-range-extract
fn ExtractContents(self) -> Fallible<Root<DocumentFragment>> {
fn ExtractContents(&self) -> Fallible<Root<DocumentFragment>> {
// Step 3.
let (start_node, start_offset, end_node, end_offset) = {
@ -581,13 +581,13 @@ impl<'a> RangeMethods for &'a Range {
}
// https://dom.spec.whatwg.org/#dom-range-detach
fn Detach(self) {
fn Detach(&self) {
// This method intentionally left blank.
}
// https://dom.spec.whatwg.org/#dom-range-insertnode
// https://dom.spec.whatwg.org/#concept-range-insert
fn InsertNode(self, node: &Node) -> ErrorResult {
fn InsertNode(&self, node: &Node) -> ErrorResult {
let (start_node, start_offset) = {
let inner = self.inner().borrow();
let start = &inner.start;