From 9046085506e30b5fbcd92d51a122abe077be0caf Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 17 Oct 2013 21:44:14 +0200 Subject: [PATCH 1/2] Make Blob create its binding eagerly. --- src/components/script/dom/blob.rs | 34 ++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/components/script/dom/blob.rs b/src/components/script/dom/blob.rs index 3d17c44bc26..b981786f0f0 100644 --- a/src/components/script/dom/blob.rs +++ b/src/components/script/dom/blob.rs @@ -4,20 +4,33 @@ use dom::bindings::utils::{Reflectable, Reflector}; use dom::bindings::codegen::BlobBinding; -use script_task::{page_from_context}; +use dom::window::Window; use js::jsapi::{JSContext, JSObject}; pub struct Blob { - reflector_: Reflector + reflector_: Reflector, + window: @mut Window, } impl Blob { - pub fn new() -> @mut Blob { - @mut Blob { - reflector_: Reflector::new() + pub fn new_inherited(window: @mut Window) -> Blob { + Blob { + reflector_: Reflector::new(), + window: window, } } + + pub fn new(window: @mut Window) -> @mut Blob { + let blob = @mut Blob::new_inherited(window); + let cx = window.get_cx(); + let scope = window.reflector().get_jsobject(); + if BlobBinding::Wrap(cx, scope, blob).is_null() { + fail!("BlobBinding::Wrap failed"); + } + assert!(blob.reflector().get_jsobject().is_not_null()); + blob + } } impl Reflectable for Blob { @@ -29,14 +42,11 @@ impl Reflectable for Blob { &mut self.reflector_ } - fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { - BlobBinding::Wrap(cx, scope, self) + fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { + unreachable!(); } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { - let page = page_from_context(cx); - unsafe { - Some((*page).frame.get_ref().window as @mut Reflectable) - } + fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { + Some(self.window as @mut Reflectable) } } From 40fde80e1a738f392e5741ac8b88e7655728d371 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 18 Oct 2013 19:30:32 +0200 Subject: [PATCH 2/2] Implement the no-argument Blob constructor. --- src/components/script/dom/bindings/codegen/Blob.webidl | 5 +++-- src/components/script/dom/blob.rs | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/script/dom/bindings/codegen/Blob.webidl b/src/components/script/dom/bindings/codegen/Blob.webidl index bc6ad78efa5..afa67719560 100644 --- a/src/components/script/dom/bindings/codegen/Blob.webidl +++ b/src/components/script/dom/bindings/codegen/Blob.webidl @@ -4,11 +4,12 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. * * The origin of this IDL file is - * http://www.w3.org/TR/2012/WD-dom-20120105/ + * http://dev.w3.org/2006/webapi/FileAPI/ * * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C * liability, trademark and document use rules apply. */ +[Constructor] interface Blob { -}; \ No newline at end of file +}; diff --git a/src/components/script/dom/blob.rs b/src/components/script/dom/blob.rs index b981786f0f0..9e265e4114b 100644 --- a/src/components/script/dom/blob.rs +++ b/src/components/script/dom/blob.rs @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::utils::{Reflectable, Reflector}; +use dom::bindings::utils::Fallible; use dom::bindings::codegen::BlobBinding; use dom::window::Window; @@ -33,6 +34,12 @@ impl Blob { } } +impl Blob { + pub fn Constructor(window: @mut Window) -> Fallible<@mut Blob> { + Ok(Blob::new(window)) + } +} + impl Reflectable for Blob { fn reflector<'a>(&'a self) -> &'a Reflector { &self.reflector_