Bug 991742 part 6. Remove the "aScope" argument of binding Wrap() methods. r=bholley

This patch was mostly generated with this command:

find . -name "*.h" -o -name "*.cpp" | xargs sed -e 's/Binding::Wrap(aCx, aScope, this/Binding::Wrap(aCx, this/' -e 's/Binding_workers::Wrap(aCx, aScope, this/Binding_workers::Wrap(aCx, this/' -e 's/Binding::Wrap(cx, scope, this/Binding::Wrap(cx, this/' -i ""

plus a few manual fixes to dom/bindings/Codegen.py, js/xpconnect/src/event_impl_gen.py, and a few C++ files that were not caught in the search-and-replace above.

content/base/src/Attr.cpp

@@ -401,7 +401,7 @@ Attr::Shutdown()
 JSObject*
 Attr::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return AttrBinding::Wrap(aCx, aScope, this);
+  return AttrBinding::Wrap(aCx, this);
 }
 
 Element*

content/base/src/Comment.cpp

@@ -76,7 +76,7 @@ Comment::Constructor(const GlobalObject& aGlobal,
 JSObject*
 Comment::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return CommentBinding::Wrap(aCx, aScope, this);
+  return CommentBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/base/src/DOMImplementation.cpp

@@ -31,7 +31,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMImplementation)
 JSObject*
 DOMImplementation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return DOMImplementationBinding::Wrap(aCx, aScope, this);
+  return DOMImplementationBinding::Wrap(aCx, this);
 }
 
 bool

content/base/src/DOMParser.h

@@ -76,7 +76,7 @@ public:
   virtual JSObject* WrapObject(JSContext* aCx,
                                JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
   {
-    return mozilla::dom::DOMParserBinding::Wrap(aCx, aScope, this);
+    return mozilla::dom::DOMParserBinding::Wrap(aCx, this);
   }
 
 private:

content/base/src/DOMPoint.cpp

@@ -39,5 +39,5 @@ DOMPoint::Constructor(const GlobalObject& aGlobal, double aX, double aY,
 JSObject*
 DOMPoint::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return DOMPointBinding::Wrap(aCx, aScope, this);
+  return DOMPointBinding::Wrap(aCx, this);
 }

content/base/src/DOMQuad.cpp

@@ -42,7 +42,7 @@ DOMQuad::~DOMQuad()
 JSObject*
 DOMQuad::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return DOMQuadBinding::Wrap(aCx, aScope, this);
+  return DOMQuadBinding::Wrap(aCx, this);
 }
 
 already_AddRefed<DOMQuad>

content/base/src/DOMRect.cpp

@@ -24,7 +24,7 @@ JSObject*
 DOMRectReadOnly::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
   MOZ_ASSERT(mParent);
-  return DOMRectReadOnlyBinding::Wrap(aCx, aScope, this);
+  return DOMRectReadOnlyBinding::Wrap(aCx, this);
 }
 
 // -----------------------------------------------------------------------------
@@ -50,7 +50,7 @@ JSObject*
 DOMRect::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
   MOZ_ASSERT(mParent);
-  return DOMRectBinding::Wrap(aCx, aScope, this);
+  return DOMRectBinding::Wrap(aCx, this);
 }
 
 already_AddRefed<DOMRect>
@@ -101,7 +101,7 @@ DOMRectList::Item(uint32_t aIndex, nsIDOMClientRect** aReturn)
 JSObject*
 DOMRectList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-  return mozilla::dom::DOMRectListBinding::Wrap(cx, scope, this);
+  return mozilla::dom::DOMRectListBinding::Wrap(cx, this);
 }
 
 static double

content/base/src/DOMStringList.cpp

@@ -26,7 +26,7 @@ DOMStringList::~DOMStringList()
 JSObject*
 DOMStringList::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return DOMStringListBinding::Wrap(aCx, aScope, this);
+  return DOMStringListBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/base/src/DocumentFragment.cpp

@@ -26,7 +26,7 @@ namespace dom {
 JSObject*
 DocumentFragment::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return DocumentFragmentBinding::Wrap(aCx, aScope, this);
+  return DocumentFragmentBinding::Wrap(aCx, this);
 }
 
 bool

content/base/src/DocumentType.cpp

@@ -62,7 +62,7 @@ namespace dom {
 JSObject*
 DocumentType::WrapNode(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-  return DocumentTypeBinding::Wrap(cx, scope, this);
+  return DocumentTypeBinding::Wrap(cx, this);
 }
 
 DocumentType::DocumentType(already_AddRefed<nsINodeInfo>& aNodeInfo,

content/base/src/EventSource.cpp

@@ -273,7 +273,7 @@ EventSource::Init(nsISupports* aOwner,
 /* virtual */ JSObject*
 EventSource::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return EventSourceBinding::Wrap(aCx, aScope, this);
+  return EventSourceBinding::Wrap(aCx, this);
 }
 
 /* static */ already_AddRefed<EventSource>

content/base/src/FragmentOrElement.cpp

@@ -382,7 +382,7 @@ NS_INTERFACE_MAP_END
 JSObject*
 nsChildContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-  return NodeListBinding::Wrap(cx, scope, this);
+  return NodeListBinding::Wrap(cx, this);
 }
 
 NS_IMETHODIMP

content/base/src/NodeIterator.cpp

@@ -291,7 +291,7 @@ void NodeIterator::ContentRemoved(nsIDocument *aDocument,
 JSObject*
 NodeIterator::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-    return NodeIteratorBinding::Wrap(cx, scope, this);
+    return NodeIteratorBinding::Wrap(cx, this);
 }
 
 } // namespace dom

content/base/src/ShadowRoot.cpp

@@ -99,7 +99,7 @@ ShadowRoot::~ShadowRoot()
 JSObject*
 ShadowRoot::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return mozilla::dom::ShadowRootBinding::Wrap(aCx, aScope, this);
+  return mozilla::dom::ShadowRootBinding::Wrap(aCx, this);
 }
 
 ShadowRoot*

content/base/src/TreeWalker.cpp

@@ -453,7 +453,7 @@ TreeWalker::NextSiblingInternal(bool aReversed, ErrorResult& aResult)
 JSObject*
 TreeWalker::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-    return TreeWalkerBinding::Wrap(cx, scope, this);
+    return TreeWalkerBinding::Wrap(cx, this);
 }
 
 } // namespace dom

content/base/src/WebSocket.cpp

@@ -473,7 +473,7 @@ WebSocket::~WebSocket()
 JSObject*
 WebSocket::WrapObject(JSContext* cx, JS::Handle<JSObject*> scope)
 {
-  return WebSocketBinding::Wrap(cx, scope, this);
+  return WebSocketBinding::Wrap(cx, this);
 }
 
 //---------------------------------------------------------------------------

content/base/src/nsContentList.cpp

@@ -147,7 +147,7 @@ NS_IMPL_RELEASE_INHERITED(nsSimpleContentList, nsBaseContentList)
 JSObject*
 nsSimpleContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-  return NodeListBinding::Wrap(cx, scope, this);
+  return NodeListBinding::Wrap(cx, this);
 }
 
 // Hashtable for storing nsContentLists
@@ -270,14 +270,14 @@ const nsCacheableFuncStringContentList::ContentListType
 JSObject*
 nsCacheableFuncStringNodeList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-  return NodeListBinding::Wrap(cx, scope, this);
+  return NodeListBinding::Wrap(cx, this);
 }
 
 
 JSObject*
 nsCacheableFuncStringHTMLCollection::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-  return HTMLCollectionBinding::Wrap(cx, scope, this);
+  return HTMLCollectionBinding::Wrap(cx, this);
 }
 
 // Hashtable for storing nsCacheableFuncStringContentList
@@ -489,7 +489,7 @@ nsContentList::~nsContentList()
 JSObject*
 nsContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-  return HTMLCollectionBinding::Wrap(cx, scope, this);
+  return HTMLCollectionBinding::Wrap(cx, this);
 }
 
 NS_IMPL_ISUPPORTS_INHERITED3(nsContentList, nsBaseContentList,

content/base/src/nsDOMAttributeMap.cpp

@@ -555,5 +555,5 @@ nsDOMAttributeMap::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
 /* virtual */ JSObject*
 nsDOMAttributeMap::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return MozNamedAttrMapBinding::Wrap(aCx, aScope, this);
+  return MozNamedAttrMapBinding::Wrap(aCx, this);
 }

content/base/src/nsDOMCaretPosition.cpp

@@ -59,7 +59,7 @@ nsDOMCaretPosition::GetClientRect() const
 JSObject*
 nsDOMCaretPosition::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return mozilla::dom::CaretPositionBinding::Wrap(aCx, aScope, this);
+  return mozilla::dom::CaretPositionBinding::Wrap(aCx, this);
 }
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(nsDOMCaretPosition,

content/base/src/nsDOMDataChannel.cpp

@@ -60,7 +60,7 @@ nsDOMDataChannel::~nsDOMDataChannel()
 /* virtual */ JSObject*
 nsDOMDataChannel::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return DataChannelBinding::Wrap(aCx, aScope, this);
+  return DataChannelBinding::Wrap(aCx, this);
 }
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsDOMDataChannel)

content/base/src/nsDOMFile.cpp

@@ -743,7 +743,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMFileList)
 JSObject*
 nsDOMFileList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-  return FileListBinding::Wrap(cx, scope, this);
+  return FileListBinding::Wrap(cx, this);
 }
 
 NS_IMETHODIMP

content/base/src/nsDOMFileReader.cpp

@@ -554,5 +554,5 @@ nsDOMFileReader::GetAsDataURL(nsIDOMBlob *aFile,
 /* virtual */ JSObject*
 nsDOMFileReader::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return FileReaderBinding::Wrap(aCx, aScope, this);
+  return FileReaderBinding::Wrap(aCx, this);
 }

content/base/src/nsDOMMutationObserver.h

@@ -49,7 +49,7 @@ public:
   virtual JSObject* WrapObject(JSContext* aCx,
                                JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
   {
-    return mozilla::dom::MutationRecordBinding::Wrap(aCx, aScope, this);
+    return mozilla::dom::MutationRecordBinding::Wrap(aCx, this);
   }
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -363,7 +363,7 @@ public:
   virtual JSObject* WrapObject(JSContext* aCx,
                                JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
   {
-    return mozilla::dom::MutationObserverBinding::Wrap(aCx, aScope, this);
+    return mozilla::dom::MutationObserverBinding::Wrap(aCx, this);
   }
 
   nsISupports* GetParentObject() const

content/base/src/nsDOMSerializer.h

@@ -52,7 +52,7 @@ public:
   virtual JSObject* WrapObject(JSContext* aCx,
                                JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
   {
-    return mozilla::dom::XMLSerializerBinding::Wrap(aCx, aScope, this);
+    return mozilla::dom::XMLSerializerBinding::Wrap(aCx, this);
   }
 
 private:

content/base/src/nsDOMSettableTokenList.cpp

@@ -23,5 +23,5 @@ nsDOMSettableTokenList::SetValue(const nsAString& aValue, mozilla::ErrorResult&
 JSObject*
 nsDOMSettableTokenList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-  return mozilla::dom::DOMSettableTokenListBinding::Wrap(cx, scope, this);
+  return mozilla::dom::DOMSettableTokenListBinding::Wrap(cx, this);
 }

content/base/src/nsDOMTokenList.cpp

@@ -311,6 +311,6 @@ nsDOMTokenList::Stringify(nsAString& aResult)
 JSObject*
 nsDOMTokenList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-  return DOMTokenListBinding::Wrap(cx, scope, this);
+  return DOMTokenListBinding::Wrap(cx, this);
 }
 

content/base/src/nsFormData.cpp

@@ -103,7 +103,7 @@ nsFormData::Append(const nsAString& aName, nsIVariant* aValue)
 /* virtual */ JSObject*
 nsFormData::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return FormDataBinding::Wrap(aCx, aScope, this);
+  return FormDataBinding::Wrap(aCx, this);
 }
 
 /* static */ already_AddRefed<nsFormData>

content/base/src/nsRange.cpp

@@ -41,7 +41,7 @@ using namespace mozilla::dom;
 JSObject*
 nsRange::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return RangeBinding::Wrap(aCx, aScope, this);
+  return RangeBinding::Wrap(aCx, this);
 }
 
 /******************************************************

content/base/src/nsTextNode.cpp

@@ -102,7 +102,7 @@ NS_IMPL_ISUPPORTS_INHERITED3(nsTextNode, nsGenericDOMDataNode, nsIDOMNode,
 JSObject*
 nsTextNode::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return TextBinding::Wrap(aCx, aScope, this);
+  return TextBinding::Wrap(aCx, this);
 }
 
 bool

content/base/src/nsXMLHttpRequest.cpp

@@ -266,7 +266,7 @@ NS_IMPL_RELEASE_INHERITED(nsXMLHttpRequestUpload, nsXHREventTarget)
 /* virtual */ JSObject*
 nsXMLHttpRequestUpload::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return XMLHttpRequestUploadBinding::Wrap(aCx, aScope, this);
+  return XMLHttpRequestUploadBinding::Wrap(aCx, this);
 }
 
 /////////////////////////////////////////////

content/base/src/nsXMLHttpRequest.h

@@ -185,7 +185,7 @@ public:
   virtual JSObject* WrapObject(JSContext *cx,
                                JS::Handle<JSObject*> scope) MOZ_OVERRIDE
   {
-    return mozilla::dom::XMLHttpRequestBinding::Wrap(cx, scope, this);
+    return mozilla::dom::XMLHttpRequestBinding::Wrap(cx, this);
   }
   nsISupports* GetParentObject()
   {

content/canvas/src/CanvasGradient.h

@@ -55,7 +55,7 @@ public:
 
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
   {
-    return CanvasGradientBinding::Wrap(aCx, aScope, this);
+    return CanvasGradientBinding::Wrap(aCx, this);
   }
 
   CanvasRenderingContext2D* GetParentObject()

content/canvas/src/CanvasPattern.h

@@ -53,7 +53,7 @@ public:
 
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
   {
-    return CanvasPatternBinding::Wrap(aCx, aScope, this);
+    return CanvasPatternBinding::Wrap(aCx, this);
   }
 
   CanvasRenderingContext2D* GetParentObject()

content/canvas/src/CanvasRenderingContext2D.cpp

@@ -564,7 +564,7 @@ CanvasRenderingContext2D::~CanvasRenderingContext2D()
 JSObject*
 CanvasRenderingContext2D::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-  return CanvasRenderingContext2DBinding::Wrap(cx, scope, this);
+  return CanvasRenderingContext2DBinding::Wrap(cx, this);
 }
 
 bool
@@ -4370,7 +4370,7 @@ CanvasPath::CanvasPath(nsCOMPtr<nsISupports> aParent, RefPtr<PathBuilder> aPathB
 JSObject*
 CanvasPath::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return Path2DBinding::Wrap(aCx, aScope, this);
+  return Path2DBinding::Wrap(aCx, this);
 }
 
 already_AddRefed<CanvasPath>

content/canvas/src/ImageData.cpp

@@ -107,7 +107,7 @@ ImageData::DropData()
 JSObject*
 ImageData::WrapObject(JSContext* cx, JS::Handle<JSObject*> scope)
 {
-  return ImageDataBinding::Wrap(cx, scope, this);
+  return ImageDataBinding::Wrap(cx, this);
 }
 
 } // namespace dom

content/canvas/src/TextMetrics.h

@@ -33,7 +33,7 @@ public:
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope,
                        bool* aTookOwnership)
   {
-    return TextMetricsBinding::Wrap(aCx, aScope, this, aTookOwnership);
+    return TextMetricsBinding::Wrap(aCx, this, aTookOwnership);
   }
 
 private:

content/canvas/src/WebGL1Context.cpp

@@ -31,7 +31,7 @@ WebGL1Context::~WebGL1Context()
 JSObject*
 WebGL1Context::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-    return dom::WebGLRenderingContextBinding::Wrap(cx, scope, this);
+    return dom::WebGLRenderingContextBinding::Wrap(cx, this);
 }
 
 

content/canvas/src/WebGL2Context.cpp

@@ -50,7 +50,7 @@ WebGL2Context::Create()
 JSObject*
 WebGL2Context::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-    return dom::WebGL2RenderingContextBinding::Wrap(cx, scope, this);
+    return dom::WebGL2RenderingContextBinding::Wrap(cx, this);
 }
 
 

content/canvas/src/WebGLActiveInfo.cpp

@@ -11,5 +11,5 @@ using namespace mozilla;
 
 JSObject*
 WebGLActiveInfo::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
-    return dom::WebGLActiveInfoBinding::Wrap(cx, scope, this);
+    return dom::WebGLActiveInfoBinding::Wrap(cx, this);
 }

content/canvas/src/WebGLBuffer.cpp

@@ -75,7 +75,7 @@ WebGLBuffer::Validate(GLenum type, uint32_t max_allowed,
 
 JSObject*
 WebGLBuffer::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
-    return dom::WebGLBufferBinding::Wrap(cx, scope, this);
+    return dom::WebGLBufferBinding::Wrap(cx, this);
 }
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WebGLBuffer)

content/canvas/src/WebGLExtensions.h

@@ -46,7 +46,7 @@ protected:
 #define IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionType) \
     JSObject* \
     WebGLExtensionType::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) { \
-        return dom::WebGLExtensionType##Binding::Wrap(cx, scope, this); \
+        return dom::WebGLExtensionType##Binding::Wrap(cx, this); \
     }
 
 class WebGLExtensionCompressedTextureATC

content/canvas/src/WebGLFramebuffer.cpp

@@ -20,7 +20,7 @@ using namespace mozilla::gl;
 JSObject*
 WebGLFramebuffer::WrapObject(JSContext* cx, JS::Handle<JSObject*> scope)
 {
-    return dom::WebGLFramebufferBinding::Wrap(cx, scope, this);
+    return dom::WebGLFramebufferBinding::Wrap(cx, this);
 }
 
 WebGLFramebuffer::WebGLFramebuffer(WebGLContext* context)

content/canvas/src/WebGLProgram.cpp

@@ -46,7 +46,7 @@ static bool SplitLastSquareBracket(nsACString& string, nsCString& bracketPart)
 
 JSObject*
 WebGLProgram::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
-    return dom::WebGLProgramBinding::Wrap(cx, scope, this);
+    return dom::WebGLProgramBinding::Wrap(cx, this);
 }
 
 WebGLProgram::WebGLProgram(WebGLContext *context)

content/canvas/src/WebGLQuery.cpp

@@ -13,7 +13,7 @@ using namespace mozilla;
 
 JSObject*
 WebGLQuery::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
-    return dom::WebGLQueryBinding::Wrap(cx, scope, this);
+    return dom::WebGLQueryBinding::Wrap(cx, this);
 }
 
 WebGLQuery::WebGLQuery(WebGLContext* context)

content/canvas/src/WebGLRenderbuffer.cpp

@@ -39,7 +39,7 @@ NeedsDepthStencilEmu(GLContext* gl, GLenum internalFormat) {
 
 JSObject*
 WebGLRenderbuffer::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
-    return dom::WebGLRenderbufferBinding::Wrap(cx, scope, this);
+    return dom::WebGLRenderbufferBinding::Wrap(cx, this);
 }
 
 WebGLRenderbuffer::WebGLRenderbuffer(WebGLContext *context)

content/canvas/src/WebGLShader.cpp

@@ -14,7 +14,7 @@ using namespace mozilla;
 
 JSObject*
 WebGLShader::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
-    return dom::WebGLShaderBinding::Wrap(cx, scope, this);
+    return dom::WebGLShaderBinding::Wrap(cx, this);
 }
 
 WebGLShader::WebGLShader(WebGLContext *context, GLenum stype)

content/canvas/src/WebGLShaderPrecisionFormat.cpp

@@ -12,5 +12,5 @@ using namespace mozilla;
 JSObject*
 WebGLShaderPrecisionFormat::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-    return dom::WebGLShaderPrecisionFormatBinding::Wrap(cx, scope, this);
+    return dom::WebGLShaderPrecisionFormatBinding::Wrap(cx, this);
 }

content/canvas/src/WebGLTexture.cpp

@@ -15,7 +15,7 @@ using namespace mozilla;
 
 JSObject*
 WebGLTexture::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
-    return dom::WebGLTextureBinding::Wrap(cx, scope, this);
+    return dom::WebGLTextureBinding::Wrap(cx, this);
 }
 
 WebGLTexture::WebGLTexture(WebGLContext *context)

content/canvas/src/WebGLUniformLocation.cpp

@@ -14,7 +14,7 @@ using namespace mozilla;
 JSObject*
 WebGLUniformLocation::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-    return dom::WebGLUniformLocationBinding::Wrap(cx, scope, this);
+    return dom::WebGLUniformLocationBinding::Wrap(cx, this);
 }
 
 WebGLUniformLocation::WebGLUniformLocation(WebGLContext *context, WebGLProgram *program, GLint location, const WebGLUniformInfo& info)

content/canvas/src/WebGLVertexArray.cpp

@@ -13,7 +13,7 @@ using namespace mozilla;
 
 JSObject*
 WebGLVertexArray::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
-    return dom::WebGLVertexArrayBinding::Wrap(cx, scope, this);
+    return dom::WebGLVertexArrayBinding::Wrap(cx, this);
 }
 
 WebGLVertexArray::WebGLVertexArray(WebGLContext* context)

content/html/content/src/HTMLAnchorElement.cpp

@@ -71,7 +71,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLAnchorElement)
 JSObject*
 HTMLAnchorElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLAnchorElementBinding::Wrap(aCx, aScope, this);
+  return HTMLAnchorElementBinding::Wrap(aCx, this);
 }
 
 NS_IMPL_STRING_ATTR(HTMLAnchorElement, Charset, charset)

content/html/content/src/HTMLAreaElement.cpp

@@ -262,7 +262,7 @@ HTMLAreaElement::SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
 JSObject*
 HTMLAreaElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLAreaElementBinding::Wrap(aCx, aScope, this);
+  return HTMLAreaElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLAudioElement.cpp

@@ -97,7 +97,7 @@ nsresult HTMLAudioElement::SetAcceptHeader(nsIHttpChannel* aChannel)
 JSObject*
 HTMLAudioElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLAudioElementBinding::Wrap(aCx, aScope, this);
+  return HTMLAudioElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLBRElement.cpp

@@ -97,7 +97,7 @@ HTMLBRElement::GetAttributeMappingFunction() const
 JSObject*
 HTMLBRElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLBRElementBinding::Wrap(aCx, aScope, this);
+  return HTMLBRElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLBodyElement.cpp

@@ -191,7 +191,7 @@ HTMLBodyElement::~HTMLBodyElement()
 JSObject*
 HTMLBodyElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLBodyElementBinding::Wrap(aCx, aScope, this);
+  return HTMLBodyElementBinding::Wrap(aCx, this);
 }
 
 NS_IMPL_ISUPPORTS_INHERITED1(HTMLBodyElement, nsGenericHTMLElement,

content/html/content/src/HTMLButtonElement.cpp

@@ -542,7 +542,7 @@ HTMLButtonElement::IntrinsicState() const
 JSObject*
 HTMLButtonElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLButtonElementBinding::Wrap(aCx, aScope, this);
+  return HTMLButtonElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLCanvasElement.cpp

@@ -74,7 +74,7 @@ HTMLCanvasPrintState::~HTMLCanvasPrintState()
 /* virtual */ JSObject*
 HTMLCanvasPrintState::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return MozCanvasPrintStateBinding::Wrap(aCx, aScope, this);
+  return MozCanvasPrintStateBinding::Wrap(aCx, this);
 }
 
 nsISupports*
@@ -141,7 +141,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLCanvasElement)
 /* virtual */ JSObject*
 HTMLCanvasElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLCanvasElementBinding::Wrap(aCx, aScope, this);
+  return HTMLCanvasElementBinding::Wrap(aCx, this);
 }
 
 nsIntSize

content/html/content/src/HTMLContentElement.cpp

@@ -46,7 +46,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLContentElement)
 JSObject*
 HTMLContentElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLContentElementBinding::Wrap(aCx, aScope, this);
+  return HTMLContentElementBinding::Wrap(aCx, this);
 }
 
 nsresult
@@ -317,6 +317,6 @@ DistributedContentList::IndexOf(nsIContent* aContent)
 JSObject*
 DistributedContentList::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return NodeListBinding::Wrap(aCx, aScope, this);
+  return NodeListBinding::Wrap(aCx, this);
 }
 

content/html/content/src/HTMLDataElement.cpp

@@ -26,7 +26,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLDataElement)
 JSObject*
 HTMLDataElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLDataElementBinding::Wrap(aCx, aScope, this);
+  return HTMLDataElementBinding::Wrap(aCx, this);
 }
 
 void

content/html/content/src/HTMLDataListElement.cpp

@@ -18,7 +18,7 @@ HTMLDataListElement::~HTMLDataListElement()
 JSObject*
 HTMLDataListElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLDataListElementBinding::Wrap(aCx, aScope, this);
+  return HTMLDataListElementBinding::Wrap(aCx, this);
 }
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED_1(HTMLDataListElement, nsGenericHTMLElement,

content/html/content/src/HTMLDivElement.cpp

@@ -26,7 +26,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLDivElement)
 JSObject*
 HTMLDivElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return dom::HTMLDivElementBinding::Wrap(aCx, aScope, this);
+  return dom::HTMLDivElementBinding::Wrap(aCx, this);
 }
 
 bool

content/html/content/src/HTMLElement.cpp

@@ -61,7 +61,7 @@ HTMLElement::GetInnerHTML(nsAString& aInnerHTML)
 JSObject*
 HTMLElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return dom::HTMLElementBinding::Wrap(aCx, aScope, this);
+  return dom::HTMLElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLFieldSetElement.cpp

@@ -372,7 +372,7 @@ HTMLFieldSetElement::IntrinsicState() const
 JSObject*
 HTMLFieldSetElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLFieldSetElementBinding::Wrap(aCx, aScope, this);
+  return HTMLFieldSetElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLFontElement.cpp

@@ -22,7 +22,7 @@ HTMLFontElement::~HTMLFontElement()
 JSObject*
 HTMLFontElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLFontElementBinding::Wrap(aCx, aScope, this);
+  return HTMLFontElementBinding::Wrap(aCx, this);
 }
 
 NS_IMPL_ELEMENT_CLONE(HTMLFontElement)

content/html/content/src/HTMLFormControlsCollection.cpp

@@ -408,7 +408,7 @@ HTMLFormControlsCollection::GetSupportedNames(nsTArray<nsString>& aNames)
 HTMLFormControlsCollection::WrapObject(JSContext* aCx,
                                        JS::Handle<JSObject*> aScope)
 {
-  return HTMLFormControlsCollectionBinding::Wrap(aCx, aScope, this);
+  return HTMLFormControlsCollectionBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLFormElement.cpp

@@ -2368,7 +2368,7 @@ HTMLFormElement::AddToPastNamesMap(const nsAString& aName,
 JSObject*
 HTMLFormElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLFormElementBinding::Wrap(aCx, aScope, this);
+  return HTMLFormElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLFrameElement.cpp

@@ -83,7 +83,7 @@ HTMLFrameElement::ParseAttribute(int32_t aNamespaceID,
 JSObject*
 HTMLFrameElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLFrameElementBinding::Wrap(aCx, aScope, this);
+  return HTMLFrameElementBinding::Wrap(aCx, this);
 }
 
 } // namespace mozilla

content/html/content/src/HTMLFrameSetElement.cpp

@@ -20,7 +20,7 @@ HTMLFrameSetElement::~HTMLFrameSetElement()
 JSObject*
 HTMLFrameSetElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLFrameSetElementBinding::Wrap(aCx, aScope, this);
+  return HTMLFrameSetElementBinding::Wrap(aCx, this);
 }
 
 NS_IMPL_ISUPPORTS_INHERITED1(HTMLFrameSetElement, nsGenericHTMLElement,

content/html/content/src/HTMLHRElement.cpp

@@ -259,7 +259,7 @@ HTMLHRElement::GetAttributeMappingFunction() const
 JSObject*
 HTMLHRElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLHRElementBinding::Wrap(aCx, aScope, this);
+  return HTMLHRElementBinding::Wrap(aCx, this);
 }
 
 } // namespace mozilla

content/html/content/src/HTMLHeadingElement.cpp

@@ -29,7 +29,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLHeadingElement)
 JSObject*
 HTMLHeadingElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLHeadingElementBinding::Wrap(aCx, aScope, this);
+  return HTMLHeadingElementBinding::Wrap(aCx, this);
 }
 
 NS_IMPL_STRING_ATTR(HTMLHeadingElement, Align, align)

content/html/content/src/HTMLIFrameElement.cpp

@@ -249,7 +249,7 @@ HTMLIFrameElement::GetSandboxFlags()
 JSObject*
 HTMLIFrameElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLIFrameElementBinding::Wrap(aCx, aScope, this);
+  return HTMLIFrameElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLImageElement.cpp

@@ -650,7 +650,7 @@ HTMLImageElement::GetCORSMode()
 JSObject*
 HTMLImageElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLImageElementBinding::Wrap(aCx, aScope, this);
+  return HTMLImageElementBinding::Wrap(aCx, this);
 }
 
 #ifdef DEBUG

content/html/content/src/HTMLInputElement.cpp

@@ -7411,7 +7411,7 @@ HTMLInputElement::PickerClosed()
 JSObject*
 HTMLInputElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLInputElementBinding::Wrap(aCx, aScope, this);
+  return HTMLInputElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLLIElement.cpp

@@ -111,7 +111,7 @@ HTMLLIElement::GetAttributeMappingFunction() const
 JSObject*
 HTMLLIElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLLIElementBinding::Wrap(aCx, aScope, this);
+  return HTMLLIElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLLabelElement.cpp

@@ -27,7 +27,7 @@ HTMLLabelElement::~HTMLLabelElement()
 JSObject*
 HTMLLabelElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLLabelElementBinding::Wrap(aCx, aScope, this);
+  return HTMLLabelElementBinding::Wrap(aCx, this);
 }
 
 // nsISupports

content/html/content/src/HTMLLegendElement.cpp

@@ -148,7 +148,7 @@ HTMLLegendElement::GetForm()
 JSObject*
 HTMLLegendElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLLegendElementBinding::Wrap(aCx, aScope, this);
+  return HTMLLegendElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLLinkElement.cpp

@@ -435,7 +435,7 @@ HTMLLinkElement::SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
 JSObject*
 HTMLLinkElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLLinkElementBinding::Wrap(aCx, aScope, this);
+  return HTMLLinkElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLMapElement.cpp

@@ -69,7 +69,7 @@ NS_IMPL_STRING_ATTR(HTMLMapElement, Name, name)
 JSObject*
 HTMLMapElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLMapElementBinding::Wrap(aCx, aScope, this);
+  return HTMLMapElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLMenuElement.cpp

@@ -261,7 +261,7 @@ HTMLMenuElement::AddSeparator(nsIMenuBuilder* aBuilder, int8_t& aSeparator)
 JSObject*
 HTMLMenuElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLMenuElementBinding::Wrap(aCx, aScope, this);
+  return HTMLMenuElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLMenuItemElement.cpp

@@ -487,7 +487,7 @@ HTMLMenuItemElement::InitChecked()
 JSObject*
 HTMLMenuItemElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLMenuItemElementBinding::Wrap(aCx, aScope, this);
+  return HTMLMenuItemElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLMetaElement.cpp

@@ -91,7 +91,7 @@ HTMLMetaElement::CreateAndDispatchEvent(nsIDocument* aDoc,
 JSObject*
 HTMLMetaElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLMetaElementBinding::Wrap(aCx, aScope, this);
+  return HTMLMetaElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLMeterElement.cpp

@@ -258,7 +258,7 @@ HTMLMeterElement::GetOptimumState() const
 JSObject*
 HTMLMeterElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLMeterElementBinding::Wrap(aCx, aScope, this);
+  return HTMLMeterElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLModElement.cpp

@@ -26,7 +26,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLModElement)
 JSObject*
 HTMLModElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLModElementBinding::Wrap(aCx, aScope, this);
+  return HTMLModElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLObjectElement.cpp

@@ -445,7 +445,7 @@ JSObject*
 HTMLObjectElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
   JS::Rooted<JSObject*> obj(aCx,
-    HTMLObjectElementBinding::Wrap(aCx, aScope, this));
+    HTMLObjectElementBinding::Wrap(aCx, this));
   if (!obj) {
     return nullptr;
   }

content/html/content/src/HTMLOptGroupElement.cpp

@@ -144,7 +144,7 @@ HTMLOptGroupElement::IntrinsicState() const
 JSObject*
 HTMLOptGroupElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLOptGroupElementBinding::Wrap(aCx, aScope, this);
+  return HTMLOptGroupElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLOptionElement.cpp

@@ -430,7 +430,7 @@ HTMLOptionElement::CopyInnerTo(Element* aDest)
 JSObject*
 HTMLOptionElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLOptionElementBinding::Wrap(aCx, aScope, this);
+  return HTMLOptionElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLOptionsCollection.cpp

@@ -110,7 +110,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(HTMLOptionsCollection)
 JSObject*
 HTMLOptionsCollection::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLOptionsCollectionBinding::Wrap(aCx, aScope, this);
+  return HTMLOptionsCollectionBinding::Wrap(aCx, this);
 }
 
 NS_IMETHODIMP

content/html/content/src/HTMLOutputElement.cpp

@@ -214,7 +214,7 @@ void HTMLOutputElement::ContentRemoved(nsIDocument* aDocument,
 JSObject*
 HTMLOutputElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLOutputElementBinding::Wrap(aCx, aScope, this);
+  return HTMLOutputElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLParagraphElement.cpp

@@ -70,7 +70,7 @@ HTMLParagraphElement::GetAttributeMappingFunction() const
 JSObject*
 HTMLParagraphElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLParagraphElementBinding::Wrap(aCx, aScope, this);
+  return HTMLParagraphElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLPreElement.cpp

@@ -85,7 +85,7 @@ HTMLPreElement::GetAttributeMappingFunction() const
 JSObject*
 HTMLPreElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLPreElementBinding::Wrap(aCx, aScope, this);
+  return HTMLPreElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLProgressElement.cpp

@@ -101,7 +101,7 @@ HTMLProgressElement::IsIndeterminate() const
 JSObject*
 HTMLProgressElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLProgressElementBinding::Wrap(aCx, aScope, this);
+  return HTMLProgressElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLPropertiesCollection.cpp

@@ -96,7 +96,7 @@ HTMLPropertiesCollection::SetDocument(nsIDocument* aDocument) {
 JSObject*
 HTMLPropertiesCollection::WrapObject(JSContext* cx, JS::Handle<JSObject*> scope)
 {
-  return HTMLPropertiesCollectionBinding::Wrap(cx, scope, this);
+  return HTMLPropertiesCollectionBinding::Wrap(cx, this);
 }
 
 NS_IMETHODIMP
@@ -380,7 +380,7 @@ PropertyNodeList::GetParentObject()
 JSObject*
 PropertyNodeList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
 {
-  return PropertyNodeListBinding::Wrap(cx, scope, this);
+  return PropertyNodeListBinding::Wrap(cx, this);
 }
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(PropertyNodeList)

content/html/content/src/HTMLScriptElement.cpp

@@ -31,7 +31,7 @@ namespace dom {
 JSObject*
 HTMLScriptElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLScriptElementBinding::Wrap(aCx, aScope, this);
+  return HTMLScriptElementBinding::Wrap(aCx, this);
 }
 
 HTMLScriptElement::HTMLScriptElement(already_AddRefed<nsINodeInfo>& aNodeInfo,

content/html/content/src/HTMLSelectElement.cpp

@@ -1910,7 +1910,7 @@ HTMLSelectElement::UpdateSelectedOptions()
 JSObject*
 HTMLSelectElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLSelectElementBinding::Wrap(aCx, aScope, this);
+  return HTMLSelectElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLShadowElement.cpp

@@ -52,7 +52,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLShadowElement)
 JSObject*
 HTMLShadowElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLShadowElementBinding::Wrap(aCx, aScope, this);
+  return HTMLShadowElementBinding::Wrap(aCx, this);
 }
 
 void

content/html/content/src/HTMLSharedElement.cpp

@@ -317,23 +317,23 @@ JSObject*
 HTMLSharedElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
   if (mNodeInfo->Equals(nsGkAtoms::param)) {
-    return HTMLParamElementBinding::Wrap(aCx, aScope, this);
+    return HTMLParamElementBinding::Wrap(aCx, this);
   }
   if (mNodeInfo->Equals(nsGkAtoms::base)) {
-    return HTMLBaseElementBinding::Wrap(aCx, aScope, this);
+    return HTMLBaseElementBinding::Wrap(aCx, this);
   }
   if (mNodeInfo->Equals(nsGkAtoms::dir)) {
-    return HTMLDirectoryElementBinding::Wrap(aCx, aScope, this);
+    return HTMLDirectoryElementBinding::Wrap(aCx, this);
   }
   if (mNodeInfo->Equals(nsGkAtoms::q) ||
       mNodeInfo->Equals(nsGkAtoms::blockquote)) {
-    return HTMLQuoteElementBinding::Wrap(aCx, aScope, this);
+    return HTMLQuoteElementBinding::Wrap(aCx, this);
   }
   if (mNodeInfo->Equals(nsGkAtoms::head)) {
-    return HTMLHeadElementBinding::Wrap(aCx, aScope, this);
+    return HTMLHeadElementBinding::Wrap(aCx, this);
   }
   MOZ_ASSERT(mNodeInfo->Equals(nsGkAtoms::html));
-  return HTMLHtmlElementBinding::Wrap(aCx, aScope, this);
+  return HTMLHtmlElementBinding::Wrap(aCx, this);
 }
 
 } // namespace mozilla

content/html/content/src/HTMLSharedListElement.cpp

@@ -146,13 +146,13 @@ JSObject*
 HTMLSharedListElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
   if (mNodeInfo->Equals(nsGkAtoms::ol)) {
-    return HTMLOListElementBinding::Wrap(aCx, aScope, this);
+    return HTMLOListElementBinding::Wrap(aCx, this);
   }
   if (mNodeInfo->Equals(nsGkAtoms::dl)) {
-    return HTMLDListElementBinding::Wrap(aCx, aScope, this);
+    return HTMLDListElementBinding::Wrap(aCx, this);
   }
   MOZ_ASSERT(mNodeInfo->Equals(nsGkAtoms::ul));
-  return HTMLUListElementBinding::Wrap(aCx, aScope, this);
+  return HTMLUListElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLSharedObjectElement.cpp

@@ -347,10 +347,10 @@ HTMLSharedObjectElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
   JSObject* obj;
   if (mNodeInfo->Equals(nsGkAtoms::applet)) {
-    obj = HTMLAppletElementBinding::Wrap(aCx, aScope, this);
+    obj = HTMLAppletElementBinding::Wrap(aCx, this);
   } else {
     MOZ_ASSERT(mNodeInfo->Equals(nsGkAtoms::embed));
-    obj = HTMLEmbedElementBinding::Wrap(aCx, aScope, this);
+    obj = HTMLEmbedElementBinding::Wrap(aCx, this);
   }
   if (!obj) {
     return nullptr;

content/html/content/src/HTMLSourceElement.cpp

@@ -67,7 +67,7 @@ HTMLSourceElement::BindToTree(nsIDocument *aDocument,
 JSObject*
 HTMLSourceElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLSourceElementBinding::Wrap(aCx, aScope, this);
+  return HTMLSourceElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom

content/html/content/src/HTMLSpanElement.cpp

@@ -25,7 +25,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLSpanElement)
 JSObject*
 HTMLSpanElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
 {
-  return HTMLSpanElementBinding::Wrap(aCx, aScope, this);
+  return HTMLSpanElementBinding::Wrap(aCx, this);
 }
 
 } // namespace dom