Auto merge of #7263 - servo:update-js, r=nox

Update js.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7263)
<!-- Reviewable:end -->

5 files changed, 32 insertions, 5 deletions

diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index 54ca9c1caa3..9f458f83c2e 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -690,7 +690,7 @@ unsafe extern fn wrap(cx: *mut JSContext,
                       -> *mut JSObject {
     // FIXME terrible idea. need security wrappers
     // https://github.com/servo/servo/issues/2382
-    WrapperNew(cx, obj, GetCrossCompartmentWrapper())
+    WrapperNew(cx, obj, GetCrossCompartmentWrapper(), ptr::null(), false)
 }
 
 unsafe extern fn pre_wrap(cx: *mut JSContext, _existing: HandleObject,
diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
index 8fe518844ba..bab6ca7a5f2 100644
--- a/components/script/dom/browsercontext.rs
+++ b/components/script/dom/browsercontext.rs
@@ -78,7 +78,7 @@ impl BrowsingContext {
         let _ar = JSAutoRequest::new(cx);
         let parent = win.reflector().get_jsobject();
         let _ac = JSAutoCompartment::new(cx, parent.get());
-        let wrapper = unsafe { WrapperNew(cx, parent, handler) };
+        let wrapper = unsafe { WrapperNew(cx, parent, handler, ptr::null(), false) };
         assert!(!wrapper.is_null());
         self.window_proxy.set(wrapper);
     }
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 76b71e38998..02a96a64acd 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -631,6 +631,14 @@ dependencies = [
 ]
 
 [[package]]
+name = "heapsize"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "hpack"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -720,8 +728,9 @@ dependencies = [
 [[package]]
 name = "js"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-mozjs#e1a8c46045c698ed7c02c381334b9305a7088bbd"
+source = "git+https://github.com/servo/rust-mozjs#85e4eff9936889436b24ceefd689d4467db302a9"
 dependencies = [
+ "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 9bc322af160..04470eea902 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -623,6 +623,14 @@ dependencies = [
 ]
 
 [[package]]
+name = "heapsize"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "hpack"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -712,8 +720,9 @@ dependencies = [
 [[package]]
 name = "js"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-mozjs#e1a8c46045c698ed7c02c381334b9305a7088bbd"
+source = "git+https://github.com/servo/rust-mozjs#85e4eff9936889436b24ceefd689d4467db302a9"
 dependencies = [
+ "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 795e76e2d96..9e5f5c4d1d8 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -555,6 +555,14 @@ dependencies = [
 ]
 
 [[package]]
+name = "heapsize"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "hpack"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -644,8 +652,9 @@ dependencies = [
 [[package]]
 name = "js"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-mozjs#e1a8c46045c698ed7c02c381334b9305a7088bbd"
+source = "git+https://github.com/servo/rust-mozjs#85e4eff9936889436b24ceefd689d4467db302a9"
 dependencies = [
+ "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)",