diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-05-06 01:31:26 -0500 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-05-06 01:31:26 -0500 |
commit | 16a7c792b564a6eab48391865a7060b8dba38284 (patch) | |
tree | 451212188c1784028e4f1f556825a2ccd9209296 /components/script/dom/range.rs | |
parent | 5e59e77c416dbe35e8c30ca1c21c9088ed17a079 (diff) | |
parent | 06436e9c79e8dde69bde60b1652ccb8648ab7f75 (diff) | |
download | servo-16a7c792b564a6eab48391865a7060b8dba38284.tar.gz servo-16a7c792b564a6eab48391865a7060b8dba38284.zip |
Auto merge of #5931 - nox:rm-helpers, r=jdm
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5931)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/range.rs')
-rw-r--r-- | components/script/dom/range.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs index c9124f1eb3d..bf5cf088953 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -133,25 +133,25 @@ impl<'a> RangeMethods for JSRef<'a, Range> { // https://dom.spec.whatwg.org/#dom-range-setstartbeforenode fn SetStartBefore(self, node: JSRef<Node>) -> ErrorResult { - let parent = try!(node.parent_node().ok_or(Error::InvalidNodeType)).root(); + let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)).root(); self.SetStart(parent.r(), node.index()) } // https://dom.spec.whatwg.org/#dom-range-setstartafternode fn SetStartAfter(self, node: JSRef<Node>) -> ErrorResult { - let parent = try!(node.parent_node().ok_or(Error::InvalidNodeType)).root(); + let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)).root(); self.SetStart(parent.r(), node.index() + 1) } // https://dom.spec.whatwg.org/#dom-range-setendbeforenode fn SetEndBefore(self, node: JSRef<Node>) -> ErrorResult { - let parent = try!(node.parent_node().ok_or(Error::InvalidNodeType)).root(); + let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)).root(); self.SetEnd(parent.r(), node.index()) } // https://dom.spec.whatwg.org/#dom-range-setendafternode fn SetEndAfter(self, node: JSRef<Node>) -> ErrorResult { - let parent = try!(node.parent_node().ok_or(Error::InvalidNodeType)).root(); + let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)).root(); self.SetEnd(parent.r(), node.index() + 1) } @@ -259,7 +259,7 @@ impl<'a> RangeMethods for JSRef<'a, Range> { // Step 1. return false; } - let parent = match node.parent_node() { + let parent = match node.GetParentNode() { Some(parent) => parent, None => { // Step 3. @@ -364,7 +364,7 @@ impl RangeInner { // https://dom.spec.whatwg.org/#dom-range-selectnodenode fn select_node(&mut self, node: JSRef<Node>) -> ErrorResult { // Steps 1, 2. - let parent = try!(node.parent_node().ok_or(Error::InvalidNodeType)).root(); + let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)).root(); // Step 3. let index = node.index(); // Step 4. @@ -497,7 +497,7 @@ fn bp_position(a_node: JSRef<Node>, a_offset: u32, // Step 3-1, 3-2. let b_ancestors = b_node.inclusive_ancestors(); let ref child = b_ancestors.map(|child| child.root()).find(|child| { - child.r().parent_node().unwrap().root().r() == a_node + child.r().GetParentNode().unwrap().root().r() == a_node }).unwrap(); // Step 3-3. if child.r().index() < a_offset { |