eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-05-01 03:47:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update rust-mozjs dependency

Browse Source
This commit is contained in:
Guillaume Gomez
2016-08-20 14:05:47 +02:00
parent 278bef474c
commit 2f3f4a5bd6
9 changed files with 137 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/script/script_thread.rs
View File

@@ -26,7 +26,7 @@ use dom::bindings::cell::DOMRefCell;
use dom::bindings::codegen::Bindings::DocumentBinding::{DocumentMethods, DocumentReadyState};
use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods;
use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
use dom::bindings::conversions::{FromJSValConvertible, StringificationBehavior};
use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, StringificationBehavior};
use dom::bindings::global::GlobalRef;
use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, MutNullableHeap, Root, RootCollection};
@@ -1789,7 +1789,10 @@ impl ScriptThread {
let strval = DOMString::from_jsval(self.get_cx(),
jsval.handle(),
StringificationBehavior::Empty);
strval.unwrap_or(DOMString::new())
match strval {
Ok(ConversionResult::Success(s)) => s,
_ => DOMString::new(),
}
}
} else {
DOMString::new()