diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2014-08-14 18:33:31 +0530 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2014-08-14 18:33:31 +0530 |
commit | 6b78b93be19bd269edb683a7030f42aca6c2d3ea (patch) | |
tree | abb9606d602fdcac7e3f627f7d2d5911a18211ef /src/components/script/dom/node.rs | |
parent | 76ba6f669e90b9304fde344cfd0eb2eb6439e2f6 (diff) | |
download | servo-6b78b93be19bd269edb683a7030f42aca6c2d3ea.tar.gz servo-6b78b93be19bd269edb683a7030f42aca6c2d3ea.zip |
node.textContent and node.nodeValue should not throw
Diffstat (limited to 'src/components/script/dom/node.rs')
-rw-r--r-- | src/components/script/dom/node.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 8ebd4a3f874..5850779692c 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -18,7 +18,7 @@ use dom::bindings::codegen::InheritTypes::{CharacterDataCast, NodeBase, NodeDeri use dom::bindings::codegen::InheritTypes::{ProcessingInstructionCast, EventTargetCast}; use dom::bindings::codegen::InheritTypes::{HTMLLegendElementDerived, HTMLFieldSetElementDerived}; use dom::bindings::codegen::InheritTypes::HTMLOptGroupElementDerived; -use dom::bindings::error::{ErrorResult, Fallible, NotFound, HierarchyRequest, Syntax}; +use dom::bindings::error::{Fallible, NotFound, HierarchyRequest, Syntax}; use dom::bindings::global::{GlobalRef, Window}; use dom::bindings::js::{JS, JSRef, RootedReference, Temporary, Root, OptionalUnrootable}; use dom::bindings::js::{OptionalSettable, TemporaryPushable, OptionalRootedRootable}; @@ -1557,14 +1557,14 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-nodevalue - fn SetNodeValue(&self, val: Option<DOMString>) -> ErrorResult { + fn SetNodeValue(&self, val: Option<DOMString>) { match self.type_id { CommentNodeTypeId | TextNodeTypeId | ProcessingInstructionNodeTypeId => { self.SetTextContent(val) } - _ => Ok(()) + _ => {} } } @@ -1596,7 +1596,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-textcontent - fn SetTextContent(&self, value: Option<DOMString>) -> ErrorResult { + fn SetTextContent(&self, value: Option<DOMString>) { let value = null_str_as_empty(&value); match self.type_id { DocumentFragmentNodeTypeId | @@ -1627,7 +1627,6 @@ impl<'a> NodeMethods for JSRef<'a, Node> { DoctypeNodeTypeId | DocumentNodeTypeId => {} } - Ok(()) } // http://dom.spec.whatwg.org/#dom-node-insertbefore |