Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-24 03:19:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 991742 part 8. Remove the "aScope" argument of WebIDL/nsWrapperCache WrapObject() methods. r=bholley

Browse Source 
This patch was mostly generated with the following command:

find . -name "*.h" -o -name "*.cpp" | xargs sed -e '/WrapObject(JSContext/ {; N; s/\(WrapObject(JSContext *\* *a\{0,1\}[Cc]x\),\n\{0,1\} *JS::Handle<JSObject\*> a\{0,1\}[sS]cope/\1/ ; }' -i ""

and then reverting the changes that made to
dom/bindings/BindingUtils.h, since those WrapObject methods are not
the ones we're trying to change here, plus a bunch of manual fixups
for cases that this command did not catch (including all the callsites
of WrapObject()).
This commit is contained in:
Boris Zbarsky 2014-04-08 18:27:18 -04:00
parent 846fc2fd78
commit 79dab91ff6
487 changed files with 555 additions and 772 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -53,8 +53,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(nsChildContentList)
// nsWrapperCache
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
// nsIDOMNodeList interface
NS_DECL_NSIDOMNODELIST

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

@ -462,8 +462,7 @@ public:
NS_DECL_NSIDOMFILELIST
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
nsISupports* GetParentObject()
{

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

@ -2241,8 +2241,7 @@ public:
virtual nsHTMLDocument* AsHTMLDocument() { return nullptr; }
virtual JSObject* WrapObject(JSContext *aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *aCx) MOZ_OVERRIDE;
private:
uint64_t mWarnedAbout;

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

@ -394,8 +394,7 @@ public:
*/
virtual bool IsNodeOfType(uint32_t aFlags) const = 0;
virtual JSObject* WrapObject(JSContext *aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *aCx) MOZ_OVERRIDE;
protected:
/**

2
content/base/src/Attr.cpp
View File

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

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

@ -80,8 +80,7 @@ public:
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
// XPCOM GetName() is OK
// XPCOM GetValue() is OK

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

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

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

@ -53,8 +53,7 @@ public:
return mOwner;
}
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
// nsIDOMDOMImplementation
NS_DECL_NSIDOMDOMIMPLEMENTATION

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

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

2
content/base/src/DOMPoint.cpp
View File

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

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

@ -63,8 +63,7 @@ public:
double aZ, double aW, ErrorResult& aRV);
nsISupports* GetParentObject() const { return mParent; }
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
void SetX(double aX) { mX = aX; }
void SetY(double aY) { mY = aY; }

2
content/base/src/DOMQuad.cpp
View File

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

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

@ -34,8 +34,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(DOMQuad)
nsISupports* GetParentObject() const { return mParent; }
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
static already_AddRefed<DOMQuad>
Constructor(const GlobalObject& aGlobal,

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

@ -21,7 +21,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMRectReadOnly)
NS_INTERFACE_MAP_END
JSObject*
DOMRectReadOnly::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
DOMRectReadOnly::WrapObject(JSContext* aCx)
{
MOZ_ASSERT(mParent);
return DOMRectReadOnlyBinding::Wrap(aCx, this);
@ -47,7 +47,7 @@ FORWARD_GETTER(Width)
FORWARD_GETTER(Height)
JSObject*
DOMRect::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
DOMRect::WrapObject(JSContext* aCx)
{
MOZ_ASSERT(mParent);
return DOMRectBinding::Wrap(aCx, this);
@ -99,7 +99,7 @@ DOMRectList::Item(uint32_t aIndex, nsIDOMClientRect** aReturn)
}
JSObject*
DOMRectList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
DOMRectList::WrapObject(JSContext *cx)
{
return mozilla::dom::DOMRectListBinding::Wrap(cx, this);
}

9
content/base/src/DOMRect.h
View File

@ -43,8 +43,7 @@ public:
MOZ_ASSERT(mParent);
return mParent;
}
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual double X() const = 0;
virtual double Y() const = 0;
@ -99,8 +98,7 @@ public:
Constructor(const GlobalObject& aGlobal, double aX, double aY,
double aWidth, double aHeight, ErrorResult& aRV);
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
void SetRect(float aX, float aY, float aWidth, float aHeight) {
mX = aX; mY = aY; mWidth = aWidth; mHeight = aHeight;
@ -159,8 +157,7 @@ public:
NS_DECL_NSIDOMCLIENTRECTLIST
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
nsISupports* GetParentObject()
{

2
content/base/src/DOMStringList.cpp
View File

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

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

@ -27,7 +27,7 @@ public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMStringList)
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope);
virtual JSObject* WrapObject(JSContext* aCx);
nsISupports* GetParentObject()
{
return nullptr;

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

@ -350,9 +350,9 @@ Element::GetBindingURL(nsIDocument *aDocument, css::URLValue **aResult)
}
JSObject*
Element::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aScope)
Element::WrapObject(JSContext *aCx)
{
JS::Rooted<JSObject*> obj(aCx, nsINode::WrapObject(aCx, aScope));
JS::Rooted<JSObject*> obj(aCx, nsINode::WrapObject(aCx));
if (!obj) {
return nullptr;
}

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

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

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

@ -59,8 +59,7 @@ public:
NS_DECL_NSIINTERFACEREQUESTOR
// nsWrapperCache
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
// WebIDL
nsPIDOMWindow*

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

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

2
content/base/src/NodeIterator.cpp
View File

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

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

@ -70,7 +70,7 @@ public:
}
// The XPCOM Detach() is fine for our purposes
JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope);
JSObject* WrapObject(JSContext *cx);
private:
struct NodePointer {

2
content/base/src/ShadowRoot.cpp
View File

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

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

@ -105,7 +105,7 @@ public:
nsIContent* GetPoolHost() { return mPoolHost; }
nsTArray<HTMLShadowElement*>& ShadowDescendants() { return mShadowDescendants; }
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
static bool IsPooledNode(nsIContent* aChild, nsIContent* aContainer,
nsIContent* aHost);

2
content/base/src/TreeWalker.cpp
View File

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

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

@ -64,7 +64,7 @@ public:
already_AddRefed<nsINode> PreviousNode(ErrorResult& aResult);
already_AddRefed<nsINode> NextNode(ErrorResult& aResult);
JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope);
JSObject* WrapObject(JSContext *cx);
private:
nsCOMPtr<nsINode> mCurrentNode;

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

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

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

@ -68,8 +68,7 @@ public:
// nsWrapperCache
nsPIDOMWindow* GetParentObject() { return GetOwner(); }
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
public: // static helpers:

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

@ -145,7 +145,7 @@ NS_IMPL_ADDREF_INHERITED(nsSimpleContentList, nsBaseContentList)
NS_IMPL_RELEASE_INHERITED(nsSimpleContentList, nsBaseContentList)
JSObject*
nsSimpleContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
nsSimpleContentList::WrapObject(JSContext *cx)
{
return NodeListBinding::Wrap(cx, this);
}
@ -268,14 +268,14 @@ const nsCacheableFuncStringContentList::ContentListType
#endif
JSObject*
nsCacheableFuncStringNodeList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
nsCacheableFuncStringNodeList::WrapObject(JSContext *cx)
{
return NodeListBinding::Wrap(cx, this);
}
JSObject*
nsCacheableFuncStringHTMLCollection::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
nsCacheableFuncStringHTMLCollection::WrapObject(JSContext *cx)
{
return HTMLCollectionBinding::Wrap(cx, this);
}
@ -487,7 +487,7 @@ nsContentList::~nsContentList()
}
JSObject*
nsContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
nsContentList::WrapObject(JSContext *cx)
{
return HTMLCollectionBinding::Wrap(cx, this);
}

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

@ -92,7 +92,7 @@ public:
virtual int32_t IndexOf(nsIContent *aContent, bool aDoFlush);
virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
virtual JSObject* WrapObject(JSContext *cx)
MOZ_OVERRIDE = 0;
void SetCapacity(uint32_t aCapacity)
@ -128,8 +128,7 @@ public:
{
return mRoot;
}
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
private:
// This has to be a strong reference, the root might go away before the list.
@ -253,8 +252,7 @@ public:
// nsWrapperCache
using nsWrapperCache::GetWrapperPreserveColor;
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
protected:
virtual JSObject* GetWrapperPreserveColorInternal() MOZ_OVERRIDE
{
@ -536,8 +534,7 @@ public:
#endif
}
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
#ifdef DEBUG
static const ContentListType sType;
@ -561,8 +558,7 @@ public:
#endif
}
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
#ifdef DEBUG
static const ContentListType sType;

2
content/base/src/nsDOMAttributeMap.cpp
View File

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

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

@ -141,8 +141,7 @@ public:
{
return mContent;
}
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
// WebIDL
Attr* GetNamedItem(const nsAString& aAttrName);

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

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

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

@ -85,7 +85,7 @@ public:
return GetOffsetNode();
}
virtual JSObject* WrapObject(JSContext *aCx, JS::Handle<JSObject*> aScope)
virtual JSObject* WrapObject(JSContext *aCx)
MOZ_OVERRIDE MOZ_FINAL;
protected:

2
content/base/src/nsDOMDataChannel.cpp
View File

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

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

@ -39,7 +39,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMDataChannel,
mozilla::DOMEventTargetHelper)
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
virtual JSObject* WrapObject(JSContext* aCx)
MOZ_OVERRIDE;
nsPIDOMWindow* GetParentObject() const
{

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

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

2
content/base/src/nsDOMFileReader.cpp
View File

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

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

@ -61,8 +61,7 @@ public:
{
return GetOwner();
}
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
// WebIDL
static already_AddRefed<nsDOMFileReader>

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

@ -46,8 +46,7 @@ public:
return mOwner;
}
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
{
return mozilla::dom::MutationRecordBinding::Wrap(aCx, this);
}
@ -360,8 +359,7 @@ public:
mozilla::dom::MutationCallback& aCb,
mozilla::ErrorResult& aRv);
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
{
return mozilla::dom::MutationObserverBinding::Wrap(aCx, this);
}

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

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

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

@ -21,7 +21,7 @@ nsDOMSettableTokenList::SetValue(const nsAString& aValue, mozilla::ErrorResult&
}
JSObject*
nsDOMSettableTokenList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
nsDOMSettableTokenList::WrapObject(JSContext *cx)
{
return mozilla::dom::DOMSettableTokenListBinding::Wrap(cx, 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,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
// WebIDL
void GetValue(nsAString& aResult) { Stringify(aResult); }

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

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

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

@ -37,8 +37,7 @@ public:
nsDOMTokenList(Element* aElement, nsIAtom* aAttrAtom);
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
Element* GetParentObject()
{

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

@ -12129,11 +12129,11 @@ nsDocument::Evaluate(const nsAString& aExpression, nsIDOMNode* aContextNode,
// This is just a hack around the fact that window.document is not
// [Unforgeable] yet.
JSObject*
nsIDocument::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aScope)
nsIDocument::WrapObject(JSContext *aCx)
{
MOZ_ASSERT(IsDOMBinding());
JS::Rooted<JSObject*> obj(aCx, nsINode::WrapObject(aCx, aScope));
JS::Rooted<JSObject*> obj(aCx, nsINode::WrapObject(aCx));
if (!obj) {
return nullptr;
}

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

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

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

@ -42,8 +42,7 @@ public:
NS_DECL_NSIXHRSENDABLE
// nsWrapperCache
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
// WebIDL
nsISupports*

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

@ -2627,7 +2627,7 @@ nsINode::GetElementById(const nsAString& aId)
}
JSObject*
nsINode::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aScope)
nsINode::WrapObject(JSContext *aCx)
{
MOZ_ASSERT(IsDOMBinding());
@ -2648,7 +2648,6 @@ nsINode::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aScope)
return nullptr;
}
MOZ_ASSERT(js::IsObjectInContextCompartment(aScope, aCx));
JS::Rooted<JSObject*> obj(aCx, WrapNode(aCx));
MOZ_ASSERT_IF(ChromeOnlyAccess(),
xpc::IsInXBLScope(obj) || !xpc::UseXBLScope(js::GetObjectCompartment(obj)));

2
content/base/src/nsRange.cpp
View File

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

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

@ -219,8 +219,7 @@ public:
already_AddRefed<DOMRectList> GetClientRects();
nsINode* GetParentObject() const { return mOwner; }
virtual JSObject* WrapObject(JSContext* cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE MOZ_FINAL;
virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE MOZ_FINAL;
private:
// no copy's or assigns

2
content/base/src/nsXMLHttpRequest.cpp
View File

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

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

@ -147,8 +147,7 @@ public:
NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget)
NS_DECL_NSIXMLHTTPREQUESTUPLOAD
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
nsISupports* GetParentObject()
{
return GetOwner();
@ -182,8 +181,7 @@ public:
nsXMLHttpRequest();
virtual ~nsXMLHttpRequest();
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE
{
return mozilla::dom::XMLHttpRequestBinding::Wrap(cx, this);
}

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

@ -53,7 +53,7 @@ public:
// WebIDL
void AddColorStop(float offset, const nsAString& colorstr, ErrorResult& rv);
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
{
return CanvasGradientBinding::Wrap(aCx, this);
}

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

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

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

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

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

@ -54,7 +54,7 @@ public:
nsCOMPtr<nsISupports> GetParentObject() { return mParent; }
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope);
JSObject* WrapObject(JSContext* aCx);
static already_AddRefed<CanvasPath> Constructor(const GlobalObject& aGlobal,
ErrorResult& rv);
@ -119,8 +119,7 @@ public:
CanvasRenderingContext2D();
virtual ~CanvasRenderingContext2D();
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
HTMLCanvasElement* GetCanvas() const
{

2
content/canvas/src/ImageData.cpp
View File

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

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

@ -71,7 +71,7 @@ public:
return mData;
}
JSObject* WrapObject(JSContext* cx, JS::Handle<JSObject*> scope);
JSObject* WrapObject(JSContext* cx);
private:
void HoldData();

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

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

2
content/canvas/src/WebGL1Context.cpp
View File

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

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

@ -36,8 +36,7 @@ public:
// -------------------------------------------------------------------------
// IMPLEMENT nsWrapperCache
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
};

2
content/canvas/src/WebGL2Context.cpp
View File

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

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

@ -43,8 +43,7 @@ public:
// -------------------------------------------------------------------------
// IMPLEMENT nsWrapperCache
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
// -----------------------------------------------------------------------------

2
content/canvas/src/WebGLActiveInfo.cpp
View File

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

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

@ -35,7 +35,7 @@ public:
retval = mName;
}
JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope);
JSObject* WrapObject(JSContext *cx);
NS_INLINE_DECL_REFCOUNTING(WebGLActiveInfo)

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

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

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

@ -53,8 +53,7 @@ public:
return Context();
}
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLBuffer)
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLBuffer)

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

@ -152,8 +152,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(WebGLContext,
nsIDOMWebGLRenderingContext)
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) = 0;
virtual JSObject* WrapObject(JSContext *cx) = 0;
NS_DECL_NSIDOMWEBGLRENDERINGCONTEXT

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

@ -40,12 +40,11 @@ protected:
};
#define DECL_WEBGL_EXTENSION_GOOP \
virtual JSObject* WrapObject(JSContext *cx, \
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
#define IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionType) \
JSObject* \
WebGLExtensionType::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) { \
WebGLExtensionType::WrapObject(JSContext *cx) { \
return dom::WebGLExtensionType##Binding::Wrap(cx, this); \
}

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

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

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

@ -163,8 +163,7 @@ public:
void FinalizeAttachments() const;
virtual JSObject* WrapObject(JSContext* cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE;
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLFramebuffer)
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLFramebuffer)

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

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

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

@ -104,8 +104,7 @@ public:
return Context();
}
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLProgram)
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLProgram)

2
content/canvas/src/WebGLQuery.cpp
View File

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

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

@ -58,8 +58,7 @@ public:
// -------------------------------------------------------------------------
// IMPLEMENT NS
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLQuery)
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLQuery)

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

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

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

@ -61,8 +61,7 @@ public:
// Only handles a subset of `pname`s.
GLint GetRenderbufferParameter(GLenum target, GLenum pname) const;
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLRenderbuffer)
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLRenderbuffer)

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

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

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

@ -78,8 +78,7 @@ public:
return Context();
}
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLShader)
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLShader)

2
content/canvas/src/WebGLShaderPrecisionFormat.cpp
View File

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

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

@ -24,7 +24,7 @@ public:
{
}
JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope);
JSObject* WrapObject(JSContext *cx);
// WebIDL WebGLShaderPrecisionFormat API
GLint RangeMin() const {

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

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

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

@ -58,8 +58,7 @@ public:
return Context();
}
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLTexture)
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLTexture)

2
content/canvas/src/WebGLUniformLocation.cpp
View File

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

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

@ -33,7 +33,7 @@ public:
uint32_t ProgramGeneration() const { return mProgramGeneration; }
int ElementSize() const { return mElementSize; }
JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope);
JSObject* WrapObject(JSContext *cx);
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLUniformLocation)
NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(WebGLUniformLocation)

2
content/canvas/src/WebGLVertexArray.cpp
View File

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

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

@ -45,8 +45,7 @@ public:
return Context();
}
virtual JSObject* WrapObject(JSContext *cx,
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLVertexArray)
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLVertexArray)

2
content/html/content/public/HTMLCanvasElement.h
View File

@ -277,7 +277,7 @@ public:
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(HTMLCanvasPrintState)
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(HTMLCanvasPrintState)
virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
HTMLCanvasElement* GetParentObject()
{

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

@ -78,7 +78,7 @@ public:
{
return GetWrapperPreserveColorInternal();
}
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) = 0;
virtual JSObject* WrapObject(JSContext* aCx) = 0;
protected:
virtual JSObject* GetWrapperPreserveColorInternal() = 0;
};

2
content/html/content/src/HTMLCanvasElement.cpp
View File

@ -72,7 +72,7 @@ HTMLCanvasPrintState::~HTMLCanvasPrintState()
}
/* virtual */ JSObject*
HTMLCanvasPrintState::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
HTMLCanvasPrintState::WrapObject(JSContext* aCx)
{
return MozCanvasPrintStateBinding::Wrap(aCx, this);
}

2
content/html/content/src/HTMLContentElement.cpp
View File

@ -315,7 +315,7 @@ DistributedContentList::IndexOf(nsIContent* aContent)
}
JSObject*
DistributedContentList::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
DistributedContentList::WrapObject(JSContext* aCx)
{
return NodeListBinding::Wrap(aCx, this);
}

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

@ -97,7 +97,7 @@ public:
virtual int32_t IndexOf(nsIContent* aContent);
virtual nsINode* GetParentObject() { return mParent; }
virtual uint32_t Length() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
protected:
nsRefPtr<HTMLContentElement> mParent;
nsCOMArray<nsIContent> mDistributedNodes;

3
content/html/content/src/HTMLFormControlsCollection.cpp
View File

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

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

@ -80,8 +80,7 @@ public:
// nsWrapperCache
using nsWrapperCache::GetWrapperPreserveColor;
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
protected:
virtual JSObject* GetWrapperPreserveColorInternal() MOZ_OVERRIDE
{

2
content/html/content/src/HTMLOptionsCollection.cpp
View File

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

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

@ -42,8 +42,7 @@ public:
// nsWrapperCache
using nsWrapperCache::GetWrapperPreserveColor;
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
protected:
virtual JSObject* GetWrapperPreserveColorInternal() MOZ_OVERRIDE
{

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

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

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