aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/window.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-10-14 14:48:44 -0600
committerbors-servo <metajack+bors@gmail.com>2015-10-14 14:48:44 -0600
commitb34fd5bd7e55be1d577df5cf70b41af8a6cc716b (patch)
treeda75856d209b23755de169dcbfe798afb0487a4a /components/script/dom/window.rs
parentf35f809938792fbad61fd517187e46c1e009cd16 (diff)
parent3129fb2330251a38d0025766c28855eaa197afb8 (diff)
downloadservo-b34fd5bd7e55be1d577df5cf70b41af8a6cc716b.tar.gz
servo-b34fd5bd7e55be1d577df5cf70b41af8a6cc716b.zip
Auto merge of #7727 - michaelwu:update-bindings, r=jdm
Support the updated spidermonkey bindings Still need to finish the rust-mozjs update and make cargo use it, but it's close enough that I don't expect much to change on the servo side. Some changes here - bools are properly translated now - char16_t is handled as u16 now - JS_GlobalObjectTraceHook isn't mangled now - JSJitInfo has been adjusted - A const fn is used to generate bitfields in JSJitInfo - Manually generating handles now requires calling an unsafe function. It's not actually required, but it's too much of a hassle to generate them manually now due to bindgen++ adding base classes now. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7727) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/window.rs')
-rw-r--r--components/script/dom/window.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index c4d04b3ec1c..81b2900c19a 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -779,9 +779,9 @@ impl<'a, T: Reflectable> ScriptHelpers for &'a T {
let _ac = JSAutoCompartment::new(cx, globalhandle.get());
let options = CompileOptionsWrapper::new(cx, filename.as_ptr(), 0);
unsafe {
- if Evaluate2(cx, options.ptr, code.as_ptr() as *const i16,
- code.len() as libc::size_t,
- rval) == 0 {
+ if !Evaluate2(cx, options.ptr, code.as_ptr(),
+ code.len() as libc::size_t,
+ rval) {
debug!("error evaluating JS string");
report_pending_exception(cx, globalhandle.get());
}