From da81464372156cc6a21511c2e9f1b6df30ae2005 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sun, 10 Jul 2016 10:23:42 -0400 Subject: [PATCH 1/2] Update rust-mozjs for cross-crate inlining fixes. --- components/servo/Cargo.lock | 2 +- ports/cef/Cargo.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 5f2d29cee62..dad006a243c 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1082,7 +1082,7 @@ dependencies = [ [[package]] name = "js" version = "0.1.3" -source = "git+https://github.com/servo/rust-mozjs#7ccfee50f407841b8cd03b6520a2b9db866ac90a" +source = "git+https://github.com/servo/rust-mozjs#3ea62135ba1316b4aa845b18cf621bf127b56211" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index b8258ccb8df..019f1b0d484 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -991,7 +991,7 @@ dependencies = [ [[package]] name = "js" version = "0.1.3" -source = "git+https://github.com/servo/rust-mozjs#7ccfee50f407841b8cd03b6520a2b9db866ac90a" +source = "git+https://github.com/servo/rust-mozjs#3ea62135ba1316b4aa845b18cf621bf127b56211" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", From d0e3e612ab308d8d5139370dedda54c0c28b9e50 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sun, 10 Jul 2016 10:24:16 -0400 Subject: [PATCH 2/2] Avoid memmove in HTMLDivElement constructor. --- components/script/dom/htmldivelement.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/script/dom/htmldivelement.rs b/components/script/dom/htmldivelement.rs index 585bc7e2e03..f3fcd6d8a3c 100644 --- a/components/script/dom/htmldivelement.rs +++ b/components/script/dom/htmldivelement.rs @@ -28,8 +28,9 @@ impl HTMLDivElement { pub fn new(localName: Atom, prefix: Option, document: &Document) -> Root { - let element = HTMLDivElement::new_inherited(localName, prefix, document); - Node::reflect_node(box element, document, HTMLDivElementBinding::Wrap) + Node::reflect_node(box HTMLDivElement::new_inherited(localName, prefix, document), + document, + HTMLDivElementBinding::Wrap) } }