aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/script')
-rw-r--r--src/components/script/dom/bindings/codegen/CodegenRust.py14
-rw-r--r--src/components/script/dom/bindings/domparser.rs3
-rw-r--r--src/components/script/dom/bindings/element.rs3
-rw-r--r--src/components/script/dom/blob.rs3
-rw-r--r--src/components/script/dom/clientrect.rs3
-rw-r--r--src/components/script/dom/clientrectlist.rs3
-rw-r--r--src/components/script/dom/document.rs3
-rw-r--r--src/components/script/dom/event.rs3
-rw-r--r--src/components/script/dom/eventtarget.rs3
-rw-r--r--src/components/script/dom/formdata.rs3
-rw-r--r--src/components/script/dom/htmlcollection.rs3
-rw-r--r--src/components/script/dom/htmldocument.rs3
-rw-r--r--src/components/script/dom/mouseevent.rs3
-rw-r--r--src/components/script/dom/navigator.rs3
-rw-r--r--src/components/script/dom/nodelist.rs3
-rw-r--r--src/components/script/dom/uievent.rs3
-rw-r--r--src/components/script/dom/validitystate.rs3
-rw-r--r--src/components/script/dom/window.rs3
18 files changed, 22 insertions, 43 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 70977eb6e6b..18e590fc30d 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2496,18 +2496,15 @@ class CGWrapWithCacheMethod(CGAbstractMethod):
def __init__(self, descriptor):
assert descriptor.interface.hasInterfacePrototypeObject()
args = [Argument('*JSContext', 'aCx'), Argument('*JSObject', 'aScope'),
- Argument('@mut ' + descriptor.concreteType, 'aObject'),
- Argument('*mut bool', 'aTriedToWrap')]
+ Argument('@mut ' + descriptor.concreteType, 'aObject')]
CGAbstractMethod.__init__(self, descriptor, 'Wrap_', '*JSObject', args)
def definition_body(self):
if self.descriptor.workers:
- return """ *aTriedToWrap = true;
- return aObject->GetJSObject();"""
+ return """return aObject->GetJSObject();"""
if not self.descriptor.createGlobal:
- return """ *aTriedToWrap = true;
- let mut parent = aObject.GetParentObject(aCx);
+ return """let mut parent = aObject.GetParentObject(aCx);
let parent = WrapNativeParent(aCx, aScope, parent);
if parent.is_null() {
return ptr::null();
@@ -2541,12 +2538,11 @@ class CGWrapMethod(CGAbstractMethod):
# XXX can we wrap if we don't have an interface prototype object?
assert descriptor.interface.hasInterfacePrototypeObject()
args = [Argument('*JSContext', 'aCx'), Argument('*JSObject', 'aScope'),
- Argument('@mut ' + descriptor.concreteType, 'aObject'),
- Argument('*mut bool', 'aTriedToWrap')]
+ Argument('@mut ' + descriptor.concreteType, 'aObject')]
CGAbstractMethod.__init__(self, descriptor, 'Wrap', '*JSObject', args, inline=True, pub=True)
def definition_body(self):
- return "return Wrap_(aCx, aScope, aObject, aTriedToWrap);"
+ return "return Wrap_(aCx, aScope, aObject);"
class CGWrapNonWrapperCacheMethod(CGAbstractMethod):
def __init__(self, descriptor):
diff --git a/src/components/script/dom/bindings/domparser.rs b/src/components/script/dom/bindings/domparser.rs
index 09117e1c758..12534ca6d3f 100644
--- a/src/components/script/dom/bindings/domparser.rs
+++ b/src/components/script/dom/bindings/domparser.rs
@@ -20,8 +20,7 @@ impl Reflectable for DOMParser {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- DOMParserBinding::Wrap(cx, scope, self, &mut unused)
+ DOMParserBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/bindings/element.rs b/src/components/script/dom/bindings/element.rs
index 84923cdbd0c..83e1667b149 100644
--- a/src/components/script/dom/bindings/element.rs
+++ b/src/components/script/dom/bindings/element.rs
@@ -51,8 +51,7 @@ macro_rules! generate_cacheable_wrapper_base(
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- $wrap(cx, scope, self, &mut unused)
+ $wrap(cx, scope, self)
}
}
)
diff --git a/src/components/script/dom/blob.rs b/src/components/script/dom/blob.rs
index 34d7399d871..ccac0a702af 100644
--- a/src/components/script/dom/blob.rs
+++ b/src/components/script/dom/blob.rs
@@ -30,8 +30,7 @@ impl Reflectable for Blob {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- BlobBinding::Wrap(cx, scope, self, &mut unused)
+ BlobBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/clientrect.rs b/src/components/script/dom/clientrect.rs
index acbd2a42916..55ccaa8dfa9 100644
--- a/src/components/script/dom/clientrect.rs
+++ b/src/components/script/dom/clientrect.rs
@@ -69,8 +69,7 @@ impl Reflectable for ClientRect {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- ClientRectBinding::Wrap(cx, scope, self, &mut unused)
+ ClientRectBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/clientrectlist.rs b/src/components/script/dom/clientrectlist.rs
index 2c6af49971e..47c1538b7ed 100644
--- a/src/components/script/dom/clientrectlist.rs
+++ b/src/components/script/dom/clientrectlist.rs
@@ -56,8 +56,7 @@ impl Reflectable for ClientRectList {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- ClientRectListBinding::Wrap(cx, scope, self, &mut unused)
+ ClientRectListBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs
index 62fab67b51c..ef8f7ec12ec 100644
--- a/src/components/script/dom/document.rs
+++ b/src/components/script/dom/document.rs
@@ -209,8 +209,7 @@ impl Reflectable for Document {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- DocumentBinding::Wrap(cx, scope, self, &mut unused)
+ DocumentBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs
index 5d2380f4b13..fb5be7a1d6b 100644
--- a/src/components/script/dom/event.rs
+++ b/src/components/script/dom/event.rs
@@ -120,8 +120,7 @@ impl Reflectable for Event {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- EventBinding::Wrap(cx, scope, self, &mut unused)
+ EventBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/eventtarget.rs b/src/components/script/dom/eventtarget.rs
index b95fee8ffa4..3ea1bead0eb 100644
--- a/src/components/script/dom/eventtarget.rs
+++ b/src/components/script/dom/eventtarget.rs
@@ -35,8 +35,7 @@ impl Reflectable for EventTarget {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- EventTargetBinding::Wrap(cx, scope, self, &mut unused)
+ EventTargetBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/formdata.rs b/src/components/script/dom/formdata.rs
index 55f14b481dd..b5551bbea2b 100644
--- a/src/components/script/dom/formdata.rs
+++ b/src/components/script/dom/formdata.rs
@@ -58,8 +58,7 @@ impl Reflectable for FormData {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- FormDataBinding::Wrap(cx, scope, self, &mut unused)
+ FormDataBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/htmlcollection.rs b/src/components/script/dom/htmlcollection.rs
index b14825ed732..e76e65c4a66 100644
--- a/src/components/script/dom/htmlcollection.rs
+++ b/src/components/script/dom/htmlcollection.rs
@@ -77,7 +77,6 @@ impl Reflectable for HTMLCollection {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- HTMLCollectionBinding::Wrap(cx, scope, self, &mut unused)
+ HTMLCollectionBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs
index 77151d15d01..7acd47bc154 100644
--- a/src/components/script/dom/htmldocument.rs
+++ b/src/components/script/dom/htmldocument.rs
@@ -194,8 +194,7 @@ impl Reflectable for HTMLDocument {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- HTMLDocumentBinding::Wrap(cx, scope, self, &mut unused)
+ HTMLDocumentBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/mouseevent.rs b/src/components/script/dom/mouseevent.rs
index 2ce0e558efd..b4f567046ca 100644
--- a/src/components/script/dom/mouseevent.rs
+++ b/src/components/script/dom/mouseevent.rs
@@ -152,8 +152,7 @@ impl Reflectable for MouseEvent {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- MouseEventBinding::Wrap(cx, scope, self, &mut unused)
+ MouseEventBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/navigator.rs b/src/components/script/dom/navigator.rs
index d6970da34b2..69db9f18453 100644
--- a/src/components/script/dom/navigator.rs
+++ b/src/components/script/dom/navigator.rs
@@ -95,8 +95,7 @@ impl Reflectable for Navigator {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- NavigatorBinding::Wrap(cx, scope, self, &mut unused)
+ NavigatorBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/nodelist.rs b/src/components/script/dom/nodelist.rs
index 8781dc4b72a..47a9c527972 100644
--- a/src/components/script/dom/nodelist.rs
+++ b/src/components/script/dom/nodelist.rs
@@ -85,7 +85,6 @@ impl Reflectable for NodeList {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- NodeListBinding::Wrap(cx, scope, self, &mut unused)
+ NodeListBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/uievent.rs b/src/components/script/dom/uievent.rs
index 7b021b08673..ff71df37f17 100644
--- a/src/components/script/dom/uievent.rs
+++ b/src/components/script/dom/uievent.rs
@@ -125,8 +125,7 @@ impl Reflectable for UIEvent {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- UIEventBinding::Wrap(cx, scope, self, &mut unused)
+ UIEventBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/validitystate.rs b/src/components/script/dom/validitystate.rs
index 73819ca9839..523c2a0cb01 100644
--- a/src/components/script/dom/validitystate.rs
+++ b/src/components/script/dom/validitystate.rs
@@ -68,8 +68,7 @@ impl Reflectable for ValidityState {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- ValidityStateBinding::Wrap(cx, scope, self, &mut unused)
+ ValidityStateBinding::Wrap(cx, scope, self)
}
}
diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs
index 52850873ae7..f13d767e8e1 100644
--- a/src/components/script/dom/window.rs
+++ b/src/components/script/dom/window.rs
@@ -150,8 +150,7 @@ impl Reflectable for Window {
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
- let mut unused = false;
- WindowBinding::Wrap(cx, scope, self, &mut unused)
+ WindowBinding::Wrap(cx, scope, self)
}
}