From 6f569dee928e4fb021f24829d34372bf7feba867 Mon Sep 17 00:00:00 2001
From: yodalee <lc85301@gmail.com>
Date: Sun, 28 Dec 2014 22:42:13 +0800
Subject: [PATCH] add str ToJSValConvertible for str type

---
 components/script/dom/bindings/conversions.rs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs
index 7cc6ef2cdaf..a08e8dbb7e8 100644
--- a/components/script/dom/bindings/conversions.rs
+++ b/components/script/dom/bindings/conversions.rs
@@ -44,7 +44,7 @@ pub trait IDLInterface {
 }
 
 /// A trait to convert Rust types to `JSVal`s.
-pub trait ToJSValConvertible {
+pub trait ToJSValConvertible for Sized? {
     /// Convert `self` to a `JSVal`. JSAPI failure causes a task failure.
     fn to_jsval(&self, cx: *mut JSContext) -> JSVal;
 }
@@ -232,6 +232,19 @@ impl FromJSValConvertible<()> for f64 {
     }
 }
 
+impl ToJSValConvertible for str {
+    fn to_jsval(&self, cx: *mut JSContext) -> JSVal {
+        unsafe {
+            let string_utf16: Vec<u16> = self.utf16_units().collect();
+            let jsstr = JS_NewUCStringCopyN(cx, string_utf16.as_ptr(), string_utf16.len() as libc::size_t);
+            if jsstr.is_null() {
+                panic!("JS_NewUCStringCopyN failed");
+            }
+            StringValue(&*jsstr)
+        }
+    }
+}
+
 impl ToJSValConvertible for DOMString {
     fn to_jsval(&self, cx: *mut JSContext) -> JSVal {
         unsafe {