From a9671550ffb44a6c5f252a6c317e7d926c00c524 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 18 Aug 2015 12:20:46 +0200 Subject: [PATCH] Update js. --- components/script/dom/bindings/utils.rs | 2 +- components/script/dom/browsercontext.rs | 2 +- components/servo/Cargo.lock | 11 ++++++++++- ports/cef/Cargo.lock | 11 ++++++++++- ports/gonk/Cargo.lock | 11 ++++++++++- 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 @@ -630,6 +630,14 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[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" @@ -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 @@ -622,6 +622,14 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[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" @@ -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 @@ -554,6 +554,14 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[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" @@ -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)",