wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 848339 - Remove the vestigial boolean outparam from nsWrapperCache::WrapObject. r=bz

Browse Source
This commit is contained in:
Masatoshi Kimura 2013-03-12 08:03:47 +09:00
parent bfa4872f35
commit e5e5a90814
349 changed files with 600 additions and 802 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/public/Element.h
View File

@ -887,8 +887,8 @@ public:
nsIDOMHTMLCollection** aResult);
void GetClassList(nsISupports** aClassList);
virtual JSObject* WrapObject(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_FINAL;
virtual JSObject* WrapObject(JSContext *aCx,
JSObject *aScope) MOZ_FINAL MOZ_OVERRIDE;
/**
* Locate an nsIEditor rooted at this content node, if there is one.

3
content/base/public/FragmentOrElement.h
View File

@ -54,8 +54,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(nsChildContentList)
// nsWrapperCache
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
// nsIDOMNodeList interface
NS_DECL_NSIDOMNODELIST

3
content/base/public/nsDOMFile.h
View File

@ -437,8 +437,7 @@ public:
NS_DECL_NSIDOMFILELIST
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
nsISupports* GetParentObject()
{

7
content/base/public/nsINode.h
View File

@ -379,8 +379,7 @@ public:
*/
virtual bool IsNodeOfType(uint32_t aFlags) const = 0;
virtual JSObject* WrapObject(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap);
virtual JSObject* WrapObject(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
protected:
/**
@ -388,11 +387,9 @@ protected:
* does some additional checks and fix-up that's common to all nodes. WrapNode
* should just call the DOM binding's Wrap function.
*/
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap)
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope)
{
MOZ_ASSERT(!IsDOMBinding(), "Someone forgot to override WrapNode");
*aTriedToWrap = false;
return nullptr;
}

4
content/base/src/Comment.cpp
View File

@ -82,9 +82,9 @@ Comment::List(FILE* out, int32_t aIndent) const
#endif
JSObject*
Comment::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
Comment::WrapNode(JSContext *aCx, JSObject *aScope)
{
return CommentBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return CommentBinding::Wrap(aCx, aScope, this);
}
} // namespace dom

3
content/base/src/Comment.h
View File

@ -54,8 +54,7 @@ public:
#endif
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
};
} // namespace dom

5
content/base/src/DOMImplementation.cpp
View File

@ -25,10 +25,9 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMImplementation)
NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMImplementation)
JSObject*
DOMImplementation::WrapObject(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap)
DOMImplementation::WrapObject(JSContext* aCx, JSObject* aScope)
{
return DOMImplementationBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return DOMImplementationBinding::Wrap(aCx, aScope, this);
}
bool

3
content/base/src/DOMImplementation.h
View File

@ -52,8 +52,7 @@ public:
return mOwner;
}
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
bool HasFeature(const nsAString& aFeature, const nsAString& aVersion);

4
content/base/src/DocumentFragment.cpp
View File

@ -54,9 +54,9 @@ DocumentFragment::DocumentFragment(already_AddRefed<nsINodeInfo> aNodeInfo)
}
JSObject*
DocumentFragment::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
DocumentFragment::WrapNode(JSContext *aCx, JSObject *aScope)
{
return DocumentFragmentBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return DocumentFragmentBinding::Wrap(aCx, aScope, this);
}
bool

3
content/base/src/DocumentFragment.h
View File

@ -41,8 +41,7 @@ public:
{
}
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap);
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
// nsIContent
virtual already_AddRefed<nsINodeInfo>

4
content/base/src/DocumentType.cpp
View File

@ -64,9 +64,9 @@ namespace mozilla {
namespace dom {
JSObject*
DocumentType::WrapNode(JSContext *cx, JSObject *scope, bool *triedToWrap)
DocumentType::WrapNode(JSContext *cx, JSObject *scope)
{
return DocumentTypeBinding::Wrap(cx, scope, this, triedToWrap);
return DocumentTypeBinding::Wrap(cx, scope, this);
}
DocumentType::DocumentType(already_AddRefed<nsINodeInfo> aNodeInfo,

2
content/base/src/DocumentType.h
View File

@ -76,7 +76,7 @@ public:
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *cx, JSObject *scope, bool *triedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
nsString mPublicId;
nsString mSystemId;

5
content/base/src/Element.cpp
View File

@ -339,10 +339,9 @@ Element::GetBindingURL(nsIDocument *aDocument, css::URLValue **aResult)
}
JSObject*
Element::WrapObject(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap)
Element::WrapObject(JSContext *aCx, JSObject *aScope)
{
JSObject* obj = nsINode::WrapObject(aCx, aScope, aTriedToWrap);
JSObject* obj = nsINode::WrapObject(aCx, aScope);
if (!obj) {
return nullptr;
}

4
content/base/src/EventSource.cpp
View File

@ -278,9 +278,9 @@ EventSource::Init(nsISupports* aOwner,
}
/* virtual */ JSObject*
EventSource::WrapObject(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap)
EventSource::WrapObject(JSContext* aCx, JSObject* aScope)
{
return EventSourceBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return EventSourceBinding::Wrap(aCx, aScope, this);
}
/* static */ already_AddRefed<EventSource>

2
content/base/src/EventSource.h
View File

@ -66,7 +66,7 @@ public:
// nsWrapperCache
virtual JSObject*
WrapObject(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap) MOZ_OVERRIDE;
WrapObject(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
// WebIDL
nsPIDOMWindow*

5
content/base/src/FragmentOrElement.cpp
View File

@ -381,10 +381,9 @@ NS_INTERFACE_TABLE_HEAD(nsChildContentList)
NS_INTERFACE_MAP_END
JSObject*
nsChildContentList::WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap)
nsChildContentList::WrapObject(JSContext *cx, JSObject *scope)
{
return NodeListBinding::Wrap(cx, scope, this, triedToWrap);
return NodeListBinding::Wrap(cx, scope, this);
}
NS_IMETHODIMP

4
content/base/src/WebSocket.cpp
View File

@ -476,9 +476,9 @@ WebSocket::~WebSocket()
}
JSObject*
WebSocket::WrapObject(JSContext* cx, JSObject* scope, bool* triedToWrap)
WebSocket::WrapObject(JSContext* cx, JSObject* scope)
{
return WebSocketBinding::Wrap(cx, scope, this, triedToWrap);
return WebSocketBinding::Wrap(cx, scope, this);
}
//---------------------------------------------------------------------------

4
content/base/src/WebSocket.h
View File

@ -86,9 +86,7 @@ public:
// nsWrapperCache
nsPIDOMWindow* GetParentObject() { return GetOwner(); }
JSObject* WrapObject(JSContext *cx,
JSObject *scope,
bool *triedToWrap);
JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
public: // static helpers:

19
content/base/src/nsContentList.cpp
View File

@ -155,10 +155,9 @@ NS_IMPL_ADDREF_INHERITED(nsSimpleContentList, nsBaseContentList)
NS_IMPL_RELEASE_INHERITED(nsSimpleContentList, nsBaseContentList)
JSObject*
nsSimpleContentList::WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap)
nsSimpleContentList::WrapObject(JSContext *cx, JSObject *scope)
{
return NodeListBinding::Wrap(cx, scope, this, triedToWrap);
return NodeListBinding::Wrap(cx, scope, this);
}
// nsFormContentList
@ -289,18 +288,16 @@ const nsCacheableFuncStringContentList::ContentListType
#endif
JSObject*
nsCacheableFuncStringNodeList::WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap)
nsCacheableFuncStringNodeList::WrapObject(JSContext *cx, JSObject *scope)
{
return NodeListBinding::Wrap(cx, scope, this, triedToWrap);
return NodeListBinding::Wrap(cx, scope, this);
}
JSObject*
nsCacheableFuncStringHTMLCollection::WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap)
nsCacheableFuncStringHTMLCollection::WrapObject(JSContext *cx, JSObject *scope)
{
return HTMLCollectionBinding::Wrap(cx, scope, this, triedToWrap);
return HTMLCollectionBinding::Wrap(cx, scope, this);
}
// Hashtable for storing nsCacheableFuncStringContentList
@ -516,9 +513,9 @@ nsContentList::~nsContentList()
}
JSObject*
nsContentList::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap)
nsContentList::WrapObject(JSContext *cx, JSObject *scope)
{
return HTMLCollectionBinding::Wrap(cx, scope, this, triedToWrap);
return HTMLCollectionBinding::Wrap(cx, scope, this);
}
NS_IMPL_ISUPPORTS_INHERITED3(nsContentList, nsBaseContentList,

16
content/base/src/nsContentList.h
View File

@ -105,8 +105,8 @@ public:
virtual int32_t IndexOf(nsIContent *aContent, bool aDoFlush);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap) = 0;
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope)
MOZ_OVERRIDE = 0;
protected:
nsTArray< nsCOMPtr<nsIContent> > mElements;
@ -129,8 +129,7 @@ public:
{
return mRoot;
}
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
private:
// This has to be a strong reference, the root might go away before the list.
@ -261,8 +260,7 @@ public:
// nsWrapperCache
using nsWrapperCache::GetWrapperPreserveColor;
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
// nsIDOMHTMLCollection
NS_DECL_NSIDOMHTMLCOLLECTION
@ -539,8 +537,7 @@ public:
#endif
}
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
#ifdef DEBUG
static const ContentListType sType;
@ -564,8 +561,7 @@ public:
#endif
}
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
#ifdef DEBUG
static const ContentListType sType;

5
content/base/src/nsDOMCaretPosition.cpp
View File

@ -22,10 +22,9 @@ nsINode* nsDOMCaretPosition::GetOffsetNode() const
}
JSObject*
nsDOMCaretPosition::WrapObject(JSContext *aCx, JSObject *aScope,
bool *aTried)
nsDOMCaretPosition::WrapObject(JSContext *aCx, JSObject *aScope)
{
return mozilla::dom::CaretPositionBinding::Wrap(aCx, aScope, this, aTried);
return mozilla::dom::CaretPositionBinding::Wrap(aCx, aScope, this);
}
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsDOMCaretPosition, mOffsetNode)

2
content/base/src/nsDOMCaretPosition.h
View File

@ -51,7 +51,7 @@ public:
return GetOffsetNode();
}
virtual JSObject* WrapObject(JSContext *aCx, JSObject *aScope, bool *aTried)
virtual JSObject* WrapObject(JSContext *aCx, JSObject *aScope)
MOZ_OVERRIDE MOZ_FINAL;
protected:

5
content/base/src/nsDOMFile.cpp
View File

@ -741,10 +741,9 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMFileList)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMFileList)
JSObject*
nsDOMFileList::WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap)
nsDOMFileList::WrapObject(JSContext *cx, JSObject *scope)
{
return FileListBinding::Wrap(cx, scope, this, triedToWrap);
return FileListBinding::Wrap(cx, scope, this);
}
NS_IMETHODIMP

12
content/base/src/nsDOMMutationObserver.h
View File

@ -44,11 +44,9 @@ public:
return mOwner;
}
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap)
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE
{
return mozilla::dom::MutationRecordBinding::Wrap(aCx, aScope, this,
aTriedToWrap);
return mozilla::dom::MutationRecordBinding::Wrap(aCx, aScope, this);
}
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@ -359,11 +357,9 @@ public:
mozilla::dom::MutationCallback& aCb,
mozilla::ErrorResult& aRv);
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap)
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE
{
return mozilla::dom::MutationObserverBinding::Wrap(aCx, aScope,
this, aTriedToWrap);
return mozilla::dom::MutationObserverBinding::Wrap(aCx, aScope, this);
}
nsISupports* GetParentObject() const

6
content/base/src/nsDOMParser.h
View File

@ -67,11 +67,9 @@ public:
return mOwner;
}
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap) MOZ_OVERRIDE
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE
{
return mozilla::dom::DOMParserBinding::Wrap(aCx, aScope, this,
aTriedToWrap);
return mozilla::dom::DOMParserBinding::Wrap(aCx, aScope, this);
}
private:

6
content/base/src/nsDOMSerializer.h
View File

@ -49,11 +49,9 @@ public:
return mOwner;
}
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap) MOZ_OVERRIDE
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE
{
return mozilla::dom::XMLSerializerBinding::Wrap(aCx, aScope, this,
aTriedToWrap);
return mozilla::dom::XMLSerializerBinding::Wrap(aCx, aScope, this);
}
private:

6
content/base/src/nsDOMSettableTokenList.cpp
View File

@ -21,9 +21,7 @@ nsDOMSettableTokenList::SetValue(const nsAString& aValue, mozilla::ErrorResult&
}
JSObject*
nsDOMSettableTokenList::WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap)
nsDOMSettableTokenList::WrapObject(JSContext *cx, JSObject *scope)
{
return mozilla::dom::DOMSettableTokenListBinding::Wrap(cx, scope, this,
triedToWrap);
return mozilla::dom::DOMSettableTokenListBinding::Wrap(cx, scope, this);
}

3
content/base/src/nsDOMSettableTokenList.h
View File

@ -22,8 +22,7 @@ public:
nsDOMSettableTokenList(mozilla::dom::Element* aElement, nsIAtom* aAttrAtom)
: nsDOMTokenList(aElement, aAttrAtom) {}
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
// WebIDL
void GetValue(nsAString& aResult) { Stringify(aResult); }

4
content/base/src/nsDOMTokenList.cpp
View File

@ -261,8 +261,8 @@ nsDOMTokenList::Stringify(nsAString& aResult)
}
JSObject*
nsDOMTokenList::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap)
nsDOMTokenList::WrapObject(JSContext *cx, JSObject *scope)
{
return DOMTokenListBinding::Wrap(cx, scope, this, triedToWrap);
return DOMTokenListBinding::Wrap(cx, scope, this);
}

3
content/base/src/nsDOMTokenList.h
View File

@ -40,8 +40,7 @@ public:
void DropReference();
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
Element* GetParentObject()
{

4
content/base/src/nsFormData.cpp
View File

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

2
content/base/src/nsFormData.h
View File

@ -41,7 +41,7 @@ public:
// nsWrapperCache
virtual JSObject*
WrapObject(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap) MOZ_OVERRIDE;
WrapObject(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
// WebIDL
nsISupports*

5
content/base/src/nsINode.cpp
View File

@ -2346,7 +2346,7 @@ nsINode::QuerySelectorAll(const nsAString& aSelector, ErrorResult& aResult)
}
JSObject*
nsINode::WrapObject(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
nsINode::WrapObject(JSContext *aCx, JSObject *aScope)
{
MOZ_ASSERT(IsDOMBinding());
@ -2364,11 +2364,10 @@ nsINode::WrapObject(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
!hasHadScriptHandlingObject &&
!nsContentUtils::IsCallerChrome()) {
Throw<true>(aCx, NS_ERROR_UNEXPECTED);
*aTriedToWrap = true;
return nullptr;
}
JSObject* obj = WrapNode(aCx, aScope, aTriedToWrap);
JSObject* obj = WrapNode(aCx, aScope);
if (obj && ChromeOnlyAccess() &&
!nsContentUtils::IsSystemPrincipal(NodePrincipal()))
{

4
content/base/src/nsTextNode.cpp
View File

@ -121,9 +121,9 @@ NS_IMPL_ISUPPORTS_INHERITED3(nsTextNode, nsGenericDOMDataNode, nsIDOMNode,
nsIDOMText, nsIDOMCharacterData)
JSObject*
nsTextNode::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
nsTextNode::WrapNode(JSContext *aCx, JSObject *aScope)
{
return TextBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return TextBinding::Wrap(aCx, aScope, this);
}
bool

3
content/base/src/nsTextNode.h
View File

@ -66,8 +66,7 @@ public:
#endif
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
};
#endif // nsTextNode_h

10
content/base/src/nsXMLHttpRequest.h
View File

@ -94,10 +94,9 @@ public:
NS_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget::)
NS_DECL_NSIXMLHTTPREQUESTUPLOAD
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap)
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE
{
return mozilla::dom::XMLHttpRequestUploadBinding::Wrap(cx, scope, this, triedToWrap);
return mozilla::dom::XMLHttpRequestUploadBinding::Wrap(cx, scope, this);
}
nsISupports* GetParentObject()
{
@ -132,10 +131,9 @@ public:
nsXMLHttpRequest();
virtual ~nsXMLHttpRequest();
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap)
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE
{
return mozilla::dom::XMLHttpRequestBinding::Wrap(cx, scope, this, triedToWrap);
return mozilla::dom::XMLHttpRequestBinding::Wrap(cx, scope, this);
}
nsISupports* GetParentObject()
{

5
content/canvas/src/CanvasRenderingContext2D.cpp
View File

@ -569,10 +569,9 @@ CanvasRenderingContext2D::~CanvasRenderingContext2D()
}
JSObject*
CanvasRenderingContext2D::WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap)
CanvasRenderingContext2D::WrapObject(JSContext *cx, JSObject *scope)
{
return CanvasRenderingContext2DBinding::Wrap(cx, scope, this, triedToWrap);
return CanvasRenderingContext2DBinding::Wrap(cx, scope, this);
}
bool

3
content/canvas/src/CanvasRenderingContext2D.h
View File

@ -139,8 +139,7 @@ public:
CanvasRenderingContext2D();
virtual ~CanvasRenderingContext2D();
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
HTMLCanvasElement* GetCanvas() const
{

4
content/canvas/src/WebGLBuffer.cpp
View File

@ -56,8 +56,8 @@ WebGLBuffer::ElementArrayCacheBufferSubData(size_t pos, const void* ptr, size_t
}
JSObject*
WebGLBuffer::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap) {
return dom::WebGLBufferBinding::Wrap(cx, scope, this, triedToWrap);
WebGLBuffer::WrapObject(JSContext *cx, JSObject *scope) {
return dom::WebGLBufferBinding::Wrap(cx, scope, this);
}
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WebGLBuffer)

2
content/canvas/src/WebGLBuffer.h
View File

@ -56,7 +56,7 @@ public:
return Context();
}
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(WebGLBuffer)

6
content/canvas/src/WebGLContext.cpp
View File

@ -207,11 +207,9 @@ WebGLContext::~WebGLContext()
}
JSObject*
WebGLContext::WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap)
WebGLContext::WrapObject(JSContext *cx, JSObject *scope)
{
return dom::WebGLRenderingContextBinding::Wrap(cx, scope, this,
triedToWrap);
return dom::WebGLRenderingContextBinding::Wrap(cx, scope, this);
}
void

3
content/canvas/src/WebGLContext.h
View File

@ -196,8 +196,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(WebGLContext,
nsIDOMWebGLRenderingContext)
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
NS_DECL_NSIDOMWEBGLRENDERINGCONTEXT

6
content/canvas/src/WebGLExtensions.h
View File

@ -28,12 +28,12 @@ public:
};
#define DECL_WEBGL_EXTENSION_GOOP \
JSObject* WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap);
JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
#define IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionType) \
JSObject* \
WebGLExtensionType::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap) { \
return dom::WebGLExtensionType##Binding::Wrap(cx, scope, this, triedToWrap); \
WebGLExtensionType::WrapObject(JSContext *cx, JSObject *scope) { \
return dom::WebGLExtensionType##Binding::Wrap(cx, scope, this); \
}
class WebGLExtensionCompressedTextureATC

4
content/canvas/src/WebGLFramebuffer.cpp
View File

@ -11,8 +11,8 @@
using namespace mozilla;
JSObject*
WebGLFramebuffer::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap) {
return dom::WebGLFramebufferBinding::Wrap(cx, scope, this, triedToWrap);
WebGLFramebuffer::WrapObject(JSContext *cx, JSObject *scope) {
return dom::WebGLFramebufferBinding::Wrap(cx, scope, this);
}
WebGLFramebuffer::WebGLFramebuffer(WebGLContext *context)

2
content/canvas/src/WebGLFramebuffer.h
View File

@ -158,7 +158,7 @@ public:
return Context();
}
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(WebGLFramebuffer)

4
content/canvas/src/WebGLProgram.cpp
View File

@ -44,8 +44,8 @@ static bool SplitLastSquareBracket(nsACString& string, nsCString& bracketPart)
}
JSObject*
WebGLProgram::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap) {
return dom::WebGLProgramBinding::Wrap(cx, scope, this, triedToWrap);
WebGLProgram::WrapObject(JSContext *cx, JSObject *scope) {
return dom::WebGLProgramBinding::Wrap(cx, scope, this);
}
WebGLProgram::WebGLProgram(WebGLContext *context)

2
content/canvas/src/WebGLProgram.h
View File

@ -102,7 +102,7 @@ public:
return Context();
}
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(WebGLProgram)

4
content/canvas/src/WebGLRenderbuffer.cpp
View File

@ -11,8 +11,8 @@
using namespace mozilla;
JSObject*
WebGLRenderbuffer::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap) {
return dom::WebGLRenderbufferBinding::Wrap(cx, scope, this, triedToWrap);
WebGLRenderbuffer::WrapObject(JSContext *cx, JSObject *scope) {
return dom::WebGLRenderbufferBinding::Wrap(cx, scope, this);
}
WebGLRenderbuffer::WebGLRenderbuffer(WebGLContext *context)

2
content/canvas/src/WebGLRenderbuffer.h
View File

@ -50,7 +50,7 @@ public:
return Context();
}
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(WebGLRenderbuffer)

4
content/canvas/src/WebGLShader.cpp
View File

@ -11,8 +11,8 @@
using namespace mozilla;
JSObject*
WebGLShader::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap) {
return dom::WebGLShaderBinding::Wrap(cx, scope, this, triedToWrap);
WebGLShader::WrapObject(JSContext *cx, JSObject *scope) {
return dom::WebGLShaderBinding::Wrap(cx, scope, this);
}
WebGLShader::WebGLShader(WebGLContext *context, WebGLenum stype)

2
content/canvas/src/WebGLShader.h
View File

@ -115,7 +115,7 @@ public:
return Context();
}
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(WebGLShader)

4
content/canvas/src/WebGLTexture.cpp
View File

@ -12,8 +12,8 @@
using namespace mozilla;
JSObject*
WebGLTexture::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap) {
return dom::WebGLTextureBinding::Wrap(cx, scope, this, triedToWrap);
WebGLTexture::WrapObject(JSContext *cx, JSObject *scope) {
return dom::WebGLTextureBinding::Wrap(cx, scope, this);
}
WebGLTexture::WebGLTexture(WebGLContext *context)

2
content/canvas/src/WebGLTexture.h
View File

@ -52,7 +52,7 @@ public:
return Context();
}
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(WebGLTexture)

4
content/events/src/nsDOMEvent.h
View File

@ -79,9 +79,9 @@ public:
return mOwner;
}
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap)
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE
{
return mozilla::dom::EventBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return mozilla::dom::EventBinding::Wrap(aCx, aScope, this);
}
// nsIDOMEvent Interface

10
content/events/src/nsPaintRequest.cpp
View File

@ -25,9 +25,9 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPaintRequest)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsPaintRequest)
/* virtual */ JSObject*
nsPaintRequest::WrapObject(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap)
nsPaintRequest::WrapObject(JSContext* aCx, JSObject* aScope)
{
return PaintRequestBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return PaintRequestBinding::Wrap(aCx, aScope, this);
}
already_AddRefed<nsClientRect>
@ -65,11 +65,9 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPaintRequestList)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsPaintRequestList)
JSObject*
nsPaintRequestList::WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap)
nsPaintRequestList::WrapObject(JSContext *cx, JSObject *scope)
{
return mozilla::dom::PaintRequestListBinding::Wrap(cx, scope, this,
triedToWrap);
return mozilla::dom::PaintRequestListBinding::Wrap(cx, scope, this);
}
NS_IMETHODIMP

6
content/events/src/nsPaintRequest.h
View File

@ -29,8 +29,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsPaintRequest)
NS_DECL_NSIDOMPAINTREQUEST
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
nsIDOMEvent* GetParentObject() const
{
@ -66,8 +65,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsPaintRequestList)
NS_DECL_NSIDOMPAINTREQUESTLIST
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap);
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
nsISupports* GetParentObject()
{
return mParent;

3
content/html/content/public/nsIHTMLCollection.h
View File

@ -76,8 +76,7 @@ public:
CallQueryInterface(this, &cache);
return cache->GetWrapperPreserveColor();
}
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
bool *triedToWrap) = 0;
virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) = 0;
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsIHTMLCollection, NS_IHTMLCOLLECTION_IID)

4
content/html/content/src/HTMLAnchorElement.cpp
View File

@ -57,9 +57,9 @@ NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLAnchorElement)
JSObject*
HTMLAnchorElement::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
HTMLAnchorElement::WrapNode(JSContext *aCx, JSObject *aScope)
{
return HTMLAnchorElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLAnchorElementBinding::Wrap(aCx, aScope, this);
}
NS_IMPL_STRING_ATTR(HTMLAnchorElement, Charset, charset)

3
content/html/content/src/HTMLAnchorElement.h
View File

@ -201,8 +201,7 @@ public:
protected:
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
};
} // namespace dom

4
content/html/content/src/HTMLAreaElement.cpp
View File

@ -244,9 +244,9 @@ HTMLAreaElement::SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const
}
JSObject*
HTMLAreaElement::WrapNode(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap)
HTMLAreaElement::WrapNode(JSContext* aCx, JSObject* aScope)
{
return HTMLAreaElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLAreaElementBinding::Wrap(aCx, aScope, this);
}
} // namespace dom

3
content/html/content/src/HTMLAreaElement.h
View File

@ -161,8 +161,7 @@ public:
}
protected:
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);

5
content/html/content/src/HTMLBRElement.cpp
View File

@ -106,10 +106,9 @@ HTMLBRElement::GetAttributeMappingFunction() const
}
JSObject*
HTMLBRElement::WrapNode(JSContext *aCx, JSObject *aScope,
bool* aTriedToWrap)
HTMLBRElement::WrapNode(JSContext *aCx, JSObject *aScope)
{
return HTMLBRElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLBRElementBinding::Wrap(aCx, aScope, this);
}
} // namespace dom

3
content/html/content/src/HTMLBRElement.h
View File

@ -53,8 +53,7 @@ public:
return SetHTMLAttr(nsGkAtoms::clear, aClear, aError);
}
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap);
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
};
} // namespace dom

4
content/html/content/src/HTMLBodyElement.cpp
View File

@ -194,9 +194,9 @@ HTMLBodyElement::~HTMLBodyElement()
}
JSObject*
HTMLBodyElement::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
HTMLBodyElement::WrapNode(JSContext *aCx, JSObject *aScope)
{
return HTMLBodyElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLBodyElementBinding::Wrap(aCx, aScope, this);
}
NS_IMPL_ADDREF_INHERITED(HTMLBodyElement, Element)

3
content/html/content/src/HTMLBodyElement.h
View File

@ -149,8 +149,7 @@ private:
nsresult GetColorHelper(nsIAtom* aAtom, nsAString& aColor);
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
nsRefPtr<BodyRule> mContentStyleRule;
};

5
content/html/content/src/HTMLButtonElement.cpp
View File

@ -548,10 +548,9 @@ HTMLButtonElement::IntrinsicState() const
}
JSObject*
HTMLButtonElement::WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap)
HTMLButtonElement::WrapNode(JSContext* aCx, JSObject* aScope)
{
return HTMLButtonElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLButtonElementBinding::Wrap(aCx, aScope, this);
}
} // namespace dom

2
content/html/content/src/HTMLButtonElement.h
View File

@ -60,7 +60,7 @@ public:
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual JSObject*
WrapNode(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap) MOZ_OVERRIDE;
WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
// nsIContent
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,

4
content/html/content/src/HTMLDataElement.cpp
View File

@ -34,9 +34,9 @@ NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLDataElement)
JSObject*
HTMLDataElement::WrapNode(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap)
HTMLDataElement::WrapNode(JSContext* aCx, JSObject* aScope)
{
return HTMLDataElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLDataElementBinding::Wrap(aCx, aScope, this);
}
void

3
content/html/content/src/HTMLDataElement.h
View File

@ -49,8 +49,7 @@ public:
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
};
} // namespace dom

5
content/html/content/src/HTMLDataListElement.cpp
View File

@ -16,10 +16,9 @@ HTMLDataListElement::~HTMLDataListElement()
}
JSObject*
HTMLDataListElement::WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap)
HTMLDataListElement::WrapNode(JSContext *aCx, JSObject *aScope)
{
return HTMLDataListElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLDataListElementBinding::Wrap(aCx, aScope, this);
}
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(HTMLDataListElement,

3
content/html/content/src/HTMLDataListElement.h
View File

@ -59,8 +59,7 @@ public:
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
// <option>'s list inside the datalist element.
nsRefPtr<nsContentList> mOptions;

4
content/html/content/src/HTMLDivElement.cpp
View File

@ -33,9 +33,9 @@ NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLDivElement)
JSObject*
HTMLDivElement::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
HTMLDivElement::WrapNode(JSContext *aCx, JSObject *aScope)
{
return dom::HTMLDivElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return dom::HTMLDivElementBinding::Wrap(aCx, aScope, this);
}
bool

3
content/html/content/src/HTMLDivElement.h
View File

@ -69,8 +69,7 @@ public:
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
};
} // namespace dom

7
content/html/content/src/HTMLElement.cpp
View File

@ -38,8 +38,7 @@ public:
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
};
HTMLElement::HTMLElement(already_AddRefed<nsINodeInfo> aNodeInfo)
@ -83,9 +82,9 @@ HTMLElement::GetInnerHTML(nsAString& aInnerHTML, ErrorResult& aError)
}
JSObject*
HTMLElement::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
HTMLElement::WrapNode(JSContext *aCx, JSObject *aScope)
{
return dom::HTMLElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return dom::HTMLElementBinding::Wrap(aCx, aScope, this);
}
} // namespace dom

5
content/html/content/src/HTMLFieldSetElement.cpp
View File

@ -244,10 +244,9 @@ HTMLFieldSetElement::NotifyElementsForFirstLegendChange(bool aNotify)
}
JSObject*
HTMLFieldSetElement::WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap)
HTMLFieldSetElement::WrapNode(JSContext* aCx, JSObject* aScope)
{
return HTMLFieldSetElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLFieldSetElementBinding::Wrap(aCx, aScope, this);
}
} // namespace dom

3
content/html/content/src/HTMLFieldSetElement.h
View File

@ -107,8 +107,7 @@ public:
// XPCOM SetCustomValidity is OK for us
protected:
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
private:

4
content/html/content/src/HTMLFontElement.cpp
View File

@ -22,9 +22,9 @@ HTMLFontElement::~HTMLFontElement()
}
JSObject*
HTMLFontElement::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
HTMLFontElement::WrapNode(JSContext *aCx, JSObject *aScope)
{
return HTMLFontElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLFontElementBinding::Wrap(aCx, aScope, this);
}
NS_IMPL_ADDREF_INHERITED(HTMLFontElement, Element)

3
content/html/content/src/HTMLFontElement.h
View File

@ -72,8 +72,7 @@ public:
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
};
} // namespace dom

5
content/html/content/src/HTMLFrameElement.cpp
View File

@ -117,10 +117,9 @@ HTMLFrameElement::GetAttributeMappingFunction() const
}
JSObject*
HTMLFrameElement::WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap)
HTMLFrameElement::WrapNode(JSContext* aCx, JSObject* aScope)
{
return HTMLFrameElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLFrameElementBinding::Wrap(aCx, aScope, this);
}
} // namespace mozilla

3
content/html/content/src/HTMLFrameElement.h
View File

@ -106,8 +106,7 @@ public:
using nsGenericHTMLFrameElement::GetContentWindow;
protected:
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
};
} // namespace dom

5
content/html/content/src/HTMLFrameSetElement.cpp
View File

@ -18,10 +18,9 @@ HTMLFrameSetElement::~HTMLFrameSetElement()
}
JSObject*
HTMLFrameSetElement::WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap)
HTMLFrameSetElement::WrapNode(JSContext *aCx, JSObject *aScope)
{
return HTMLFrameSetElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLFrameSetElementBinding::Wrap(aCx, aScope, this);
}
NS_IMPL_ADDREF_INHERITED(HTMLFrameSetElement, Element)

3
content/html/content/src/HTMLFrameSetElement.h
View File

@ -151,8 +151,7 @@ public:
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
private:
nsresult ParseRowCol(const nsAString& aValue,

5
content/html/content/src/HTMLHRElement.cpp
View File

@ -267,10 +267,9 @@ HTMLHRElement::GetAttributeMappingFunction() const
}
JSObject*
HTMLHRElement::WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap)
HTMLHRElement::WrapNode(JSContext* aCx, JSObject* aScope)
{
return HTMLHRElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLHRElementBinding::Wrap(aCx, aScope, this);
}
} // namespace mozilla

3
content/html/content/src/HTMLHRElement.h
View File

@ -82,8 +82,7 @@ public:
}
protected:
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
};
} // namespace dom

4
content/html/content/src/HTMLHeadingElement.cpp
View File

@ -37,9 +37,9 @@ NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLHeadingElement)
JSObject*
HTMLHeadingElement::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
HTMLHeadingElement::WrapNode(JSContext *aCx, JSObject *aScope)
{
return HTMLHeadingElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLHeadingElementBinding::Wrap(aCx, aScope, this);
}
NS_IMPL_STRING_ATTR(HTMLHeadingElement, Align, align)

3
content/html/content/src/HTMLHeadingElement.h
View File

@ -51,8 +51,7 @@ public:
// use from WebIDL.
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
};
} // namespace mozilla

5
content/html/content/src/HTMLImageElement.cpp
View File

@ -574,10 +574,9 @@ HTMLImageElement::GetCORSMode()
}
JSObject*
HTMLImageElement::WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap)
HTMLImageElement::WrapNode(JSContext* aCx, JSObject* aScope)
{
return HTMLImageElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLImageElementBinding::Wrap(aCx, aScope, this);
}
} // namespace dom

3
content/html/content/src/HTMLImageElement.h
View File

@ -168,8 +168,7 @@ protected:
nsIntPoint GetXY();
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
};
} // namespace dom

4
content/html/content/src/HTMLLIElement.cpp
View File

@ -117,9 +117,9 @@ HTMLLIElement::GetAttributeMappingFunction() const
}
JSObject*
HTMLLIElement::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
HTMLLIElement::WrapNode(JSContext *aCx, JSObject *aScope)
{
return HTMLLIElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLLIElementBinding::Wrap(aCx, aScope, this);
}
} // namespace dom

3
content/html/content/src/HTMLLIElement.h
View File

@ -67,8 +67,7 @@ public:
}
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
};
} // namespace dom

4
content/html/content/src/HTMLLabelElement.cpp
View File

@ -23,9 +23,9 @@ HTMLLabelElement::~HTMLLabelElement()
}
JSObject*
HTMLLabelElement::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)
HTMLLabelElement::WrapNode(JSContext *aCx, JSObject *aScope)
{
return HTMLLabelElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLLabelElementBinding::Wrap(aCx, aScope, this);
}
// nsISupports

3
content/html/content/src/HTMLLabelElement.h
View File

@ -77,8 +77,7 @@ public:
nsGenericHTMLElement* GetLabeledElement() const;
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
nsGenericHTMLElement* GetFirstLabelableDescendant() const;

5
content/html/content/src/HTMLLegendElement.cpp
View File

@ -174,10 +174,9 @@ HTMLLegendElement::GetForm()
}
JSObject*
HTMLLegendElement::WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap)
HTMLLegendElement::WrapNode(JSContext* aCx, JSObject* aScope)
{
return HTMLLegendElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLLegendElementBinding::Wrap(aCx, aScope, this);
}
} // namespace dom

3
content/html/content/src/HTMLLegendElement.h
View File

@ -99,8 +99,7 @@ public:
}
protected:
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
/**
* Get the fieldset content element that contains this legend.

4
content/html/content/src/HTMLLinkElement.cpp
View File

@ -426,9 +426,9 @@ HTMLLinkElement::SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const
}
JSObject*
HTMLLinkElement::WrapNode(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap)
HTMLLinkElement::WrapNode(JSContext* aCx, JSObject* aScope)
{
return HTMLLinkElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLLinkElementBinding::Wrap(aCx, aScope, this);
}
} // namespace dom

2
content/html/content/src/HTMLLinkElement.h
View File

@ -59,7 +59,7 @@ public:
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual JSObject*
WrapNode(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap) MOZ_OVERRIDE;
WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
// nsIContent
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,

4
content/html/content/src/HTMLMapElement.cpp
View File

@ -68,9 +68,9 @@ NS_IMPL_STRING_ATTR(HTMLMapElement, Name, name)
JSObject*
HTMLMapElement::WrapNode(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap)
HTMLMapElement::WrapNode(JSContext* aCx, JSObject* aScope)
{
return HTMLMapElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLMapElementBinding::Wrap(aCx, aScope, this);
}
} // namespace dom

2
content/html/content/src/HTMLMapElement.h
View File

@ -52,7 +52,7 @@ public:
nsIHTMLCollection* Areas();
virtual JSObject*
WrapNode(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap) MOZ_OVERRIDE;
WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
protected:
nsRefPtr<nsContentList> mAreas;

5
content/html/content/src/HTMLMenuElement.cpp
View File

@ -267,10 +267,9 @@ HTMLMenuElement::AddSeparator(nsIMenuBuilder* aBuilder, int8_t& aSeparator)
}
JSObject*
HTMLMenuElement::WrapNode(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap)
HTMLMenuElement::WrapNode(JSContext* aCx, JSObject* aScope)
{
return HTMLMenuElementBinding::Wrap(aCx, aScope, this, aTriedToWrap);
return HTMLMenuElementBinding::Wrap(aCx, aScope, this);
}
} // namespace dom

3
content/html/content/src/HTMLMenuElement.h
View File

@ -82,8 +82,7 @@ public:
// The XPCOM Build is OK for us
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
protected:

Some files were not shown because too many files have changed in this diff Show More