aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-02-08 16:09:08 +0100
committerMs2ger <ms2ger@gmail.com>2015-02-08 16:13:19 +0100
commit2992dbd41b64e526ed0550e735f3056772c40028 (patch)
tree3a2e7f4a5370f78f28868fad77a2ee1ca8b71a0f
parentaa5fecec5b2e7052891873f95f0d7bca5afb62a9 (diff)
downloadservo-2992dbd41b64e526ed0550e735f3056772c40028.tar.gz
servo-2992dbd41b64e526ed0550e735f3056772c40028.zip
Remove incorrect SetterThrows annotation.
This was copied from Gecko, which has an outdated throwing condition.
-rw-r--r--components/script/dom/treewalker.rs6
-rw-r--r--components/script/dom/webidls/TreeWalker.webidl2
2 files changed, 3 insertions, 5 deletions
diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs
index 25045e50c85..ad5cb81998c 100644
--- a/components/script/dom/treewalker.rs
+++ b/components/script/dom/treewalker.rs
@@ -11,7 +11,7 @@ use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilter;
// to move to the NodeFilter binding file (#3149).
// For now, it is defined in this file.
// use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilterConstants;
-use dom::bindings::error::{ErrorResult, Fallible};
+use dom::bindings::error::Fallible;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, JSRef, OptionalRootable, Temporary, MutHeap};
use dom::bindings::utils::{Reflector, reflect_dom_object};
@@ -84,10 +84,8 @@ impl<'a> TreeWalkerMethods for JSRef<'a, TreeWalker> {
Temporary::new(self.current_node.get())
}
- fn SetCurrentNode(self, node: JSRef<Node>) -> ErrorResult {
- // XXX Future: check_same_origin(root_node, node) (throws)
+ fn SetCurrentNode(self, node: JSRef<Node>) {
self.current_node.set(JS::from_rooted(node));
- Ok(())
}
fn ParentNode(self) -> Fallible<Option<Temporary<Node>>> {
diff --git a/components/script/dom/webidls/TreeWalker.webidl b/components/script/dom/webidls/TreeWalker.webidl
index d879678f615..cdd1f2d8c4c 100644
--- a/components/script/dom/webidls/TreeWalker.webidl
+++ b/components/script/dom/webidls/TreeWalker.webidl
@@ -14,7 +14,7 @@ interface TreeWalker {
readonly attribute unsigned long whatToShow;
[Constant]
readonly attribute NodeFilter? filter;
- [Pure, SetterThrows]
+ [Pure]
attribute Node currentNode;
[Throws]