Make DOMString an alias for Option<~str>

Fixes #898.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/components/script/dom/htmlframeelement.rs b/src/components/script/dom/htmlframeelement.rs
index 64ce1537363..4dc263f7cb2 100644
--- a/src/components/script/dom/htmlframeelement.rs
+++ b/src/components/script/dom/htmlframeelement.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use dom::bindings::utils::{DOMString, null_string, ErrorResult};
+use dom::bindings::utils::{DOMString, ErrorResult};
 use dom::document::AbstractDocument;
 use dom::htmlelement::HTMLElement;
 use dom::windowproxy::WindowProxy;
@@ -13,35 +13,35 @@ pub struct HTMLFrameElement {
 
 impl HTMLFrameElement {
     pub fn Name(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetName(&mut self, _name: &DOMString, _rv: &mut ErrorResult) {
     }
 
     pub fn Scrolling(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetScrolling(&mut self, _scrolling: &DOMString, _rv: &mut ErrorResult) {
     }
 
     pub fn Src(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetSrc(&mut self, _src: &DOMString, _rv: &mut ErrorResult) {
     }
 
     pub fn FrameBorder(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetFrameBorder(&mut self, _frameborder: &DOMString, _rv: &mut ErrorResult) {
     }
 
     pub fn LongDesc(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetLongDesc(&mut self, _longdesc: &DOMString, _rv: &mut ErrorResult) {
@@ -63,14 +63,14 @@ impl HTMLFrameElement {
     }
 
     pub fn MarginHeight(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetMarginHeight(&mut self, _height: &DOMString, _rv: &mut ErrorResult) {
     }
 
     pub fn MarginWidth(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetMarginWidth(&mut self, _height: &DOMString, _rv: &mut ErrorResult) {