Don't pass nullable strings to native DOM methods that want non-nullable strings. Fixes #1207.

1 files changed, 42 insertions, 42 deletions

diff --git a/src/components/script/dom/htmlobjectelement.rs b/src/components/script/dom/htmlobjectelement.rs
index 745a223645b..ce73cb0c830 100644
--- a/src/components/script/dom/htmlobjectelement.rs
+++ b/src/components/script/dom/htmlobjectelement.rs
@@ -29,35 +29,35 @@ impl HTMLObjectElement {
 }
 
 impl HTMLObjectElement {
-    pub fn Data(&self) -> Option<DOMString> {
-        None
+    pub fn Data(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetData(&mut self, _data: &Option<DOMString>) -> ErrorResult {
+    pub fn SetData(&mut self, _data: &DOMString) -> ErrorResult {
         Ok(())
     }
 
-    pub fn Type(&self) -> Option<DOMString> {
-        None
+    pub fn Type(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetType(&mut self, _type: &Option<DOMString>) -> ErrorResult {
+    pub fn SetType(&mut self, _type: &DOMString) -> ErrorResult {
         Ok(())
     }
 
-    pub fn Name(&self) -> Option<DOMString> {
-        None
+    pub fn Name(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetName(&mut self, _name: &Option<DOMString>) -> ErrorResult {
+    pub fn SetName(&mut self, _name: &DOMString) -> ErrorResult {
         Ok(())
     }
 
-    pub fn UseMap(&self) -> Option<DOMString> {
-        None
+    pub fn UseMap(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetUseMap(&mut self, _use_map: &Option<DOMString>) -> ErrorResult {
+    pub fn SetUseMap(&mut self, _use_map: &DOMString) -> ErrorResult {
         Ok(())
     }
 
@@ -65,19 +65,19 @@ impl HTMLObjectElement {
         None
     }
 
-    pub fn Width(&self) -> Option<DOMString> {
-        None
+    pub fn Width(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetWidth(&mut self, _width: &Option<DOMString>) -> ErrorResult {
+    pub fn SetWidth(&mut self, _width: &DOMString) -> ErrorResult {
         Ok(())
     }
 
-    pub fn Height(&self) -> Option<DOMString> {
-        None
+    pub fn Height(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetHeight(&mut self, _height: &Option<DOMString>) -> ErrorResult {
+    pub fn SetHeight(&mut self, _height: &DOMString) -> ErrorResult {
         Ok(())
     }
 
@@ -98,38 +98,38 @@ impl HTMLObjectElement {
         ValidityState::new(global)
     }
 
-    pub fn ValidationMessage(&self) -> Option<DOMString> {
-        None
+    pub fn ValidationMessage(&self) -> DOMString {
+        ~""
     }
 
     pub fn CheckValidity(&self) -> bool {
         false
     }
 
-    pub fn SetCustomValidity(&mut self, _error: &Option<DOMString>) {
+    pub fn SetCustomValidity(&mut self, _error: &DOMString) {
     }
 
-    pub fn Align(&self) -> Option<DOMString> {
-        None
+    pub fn Align(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetAlign(&mut self, _align: &Option<DOMString>) -> ErrorResult {
+    pub fn SetAlign(&mut self, _align: &DOMString) -> ErrorResult {
         Ok(())
     }
 
-    pub fn Archive(&self) -> Option<DOMString> {
-        None
+    pub fn Archive(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetArchive(&mut self, _archive: &Option<DOMString>) -> ErrorResult {
+    pub fn SetArchive(&mut self, _archive: &DOMString) -> ErrorResult {
         Ok(())
     }
 
-    pub fn Code(&self) -> Option<DOMString> {
-        None
+    pub fn Code(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetCode(&mut self, _code: &Option<DOMString>) -> ErrorResult {
+    pub fn SetCode(&mut self, _code: &DOMString) -> ErrorResult {
         Ok(())
     }
 
@@ -149,11 +149,11 @@ impl HTMLObjectElement {
         Ok(())
     }
 
-    pub fn Standby(&self) -> Option<DOMString> {
-        None
+    pub fn Standby(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetStandby(&mut self, _standby: &Option<DOMString>) -> ErrorResult {
+    pub fn SetStandby(&mut self, _standby: &DOMString) -> ErrorResult {
         Ok(())
     }
 
@@ -165,27 +165,27 @@ impl HTMLObjectElement {
         Ok(())
     }
 
-    pub fn CodeBase(&self) -> Option<DOMString> {
-        None
+    pub fn CodeBase(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetCodeBase(&mut self, _codebase: &Option<DOMString>) -> ErrorResult {
+    pub fn SetCodeBase(&mut self, _codebase: &DOMString) -> ErrorResult {
         Ok(())
     }
 
-    pub fn CodeType(&self) -> Option<DOMString> {
-        None
+    pub fn CodeType(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetCodeType(&mut self, _codetype: &Option<DOMString>) -> ErrorResult {
+    pub fn SetCodeType(&mut self, _codetype: &DOMString) -> ErrorResult {
         Ok(())
     }
 
-    pub fn Border(&self) -> Option<DOMString> {
-        None
+    pub fn Border(&self) -> DOMString {
+        ~""
     }
 
-    pub fn SetBorder(&mut self, _border: &Option<DOMString>) -> ErrorResult {
+    pub fn SetBorder(&mut self, _border: &DOMString) -> ErrorResult {
         Ok(())
     }