corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1326507, rename Traverse to TraverseNative, r=mccr8

Browse Source
This commit is contained in:
Olli Pettay
2017-01-03 21:50:10 +02:00
parent 3898f7d882
commit 35461cd3d9
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/xpconnect/src/XPCWrappedJS.cpp
View File

@@ -93,7 +93,7 @@ nsXPCWrappedJS::CanSkip()
} }
NS_IMETHODIMP NS_IMETHODIMP
NS_CYCLE_COLLECTION_CLASSNAME(nsXPCWrappedJS)::Traverse NS_CYCLE_COLLECTION_CLASSNAME(nsXPCWrappedJS)::TraverseNative
(void* p, nsCycleCollectionTraversalCallback& cb) (void* p, nsCycleCollectionTraversalCallback& cb)
{ {
nsISupports* s = static_cast<nsISupports*>(p); nsISupports* s = static_cast<nsISupports*>(p);

7
xpcom/base/CycleCollectedJSContext.cpp
View File

@@ -296,8 +296,8 @@ CheckParticipatesInCycleCollection(JS::GCCellPtr aThing, const char* aName,
} }
NS_IMETHODIMP NS_IMETHODIMP
JSGCThingParticipant::Traverse(void* aPtr, JSGCThingParticipant::TraverseNative(void* aPtr,
nsCycleCollectionTraversalCallback& aCb) nsCycleCollectionTraversalCallback& aCb)
{ {
auto runtime = reinterpret_cast<CycleCollectedJSContext*>( auto runtime = reinterpret_cast<CycleCollectedJSContext*>(
reinterpret_cast<char*>(this) - offsetof(CycleCollectedJSContext, reinterpret_cast<char*>(this) - offsetof(CycleCollectedJSContext,
@@ -313,7 +313,8 @@ JSGCThingParticipant::Traverse(void* aPtr,
static JSGCThingParticipant sGCThingCycleCollectorGlobal; static JSGCThingParticipant sGCThingCycleCollectorGlobal;
NS_IMETHODIMP NS_IMETHODIMP
JSZoneParticipant::Traverse(void* aPtr, nsCycleCollectionTraversalCallback& aCb) JSZoneParticipant::TraverseNative(void* aPtr,
nsCycleCollectionTraversalCallback& aCb)
{ {
auto runtime = reinterpret_cast<CycleCollectedJSContext*>( auto runtime = reinterpret_cast<CycleCollectedJSContext*>(
reinterpret_cast<char*>(this) - offsetof(CycleCollectedJSContext, reinterpret_cast<char*>(this) - offsetof(CycleCollectedJSContext,

4
xpcom/base/CycleCollectedJSContext.h
View File

@@ -57,7 +57,7 @@ public:
MOZ_ASSERT(false, "Can't directly delete a cycle collectable GC thing"); MOZ_ASSERT(false, "Can't directly delete a cycle collectable GC thing");
} }
NS_IMETHOD Traverse(void* aPtr, nsCycleCollectionTraversalCallback& aCb) NS_IMETHOD TraverseNative(void* aPtr, nsCycleCollectionTraversalCallback& aCb)
override; override;
NS_DECL_CYCLE_COLLECTION_CLASS_NAME_METHOD(JSGCThingParticipant) NS_DECL_CYCLE_COLLECTION_CLASS_NAME_METHOD(JSGCThingParticipant)
@@ -90,7 +90,7 @@ public:
MOZ_ASSERT(false, "Can't directly delete a cycle collectable GC thing"); MOZ_ASSERT(false, "Can't directly delete a cycle collectable GC thing");
} }
NS_IMETHOD Traverse(void* aPtr, nsCycleCollectionTraversalCallback& aCb) NS_IMETHOD TraverseNative(void* aPtr, nsCycleCollectionTraversalCallback& aCb)
override; override;
NS_DECL_CYCLE_COLLECTION_CLASS_NAME_METHOD(JSZoneParticipant) NS_DECL_CYCLE_COLLECTION_CLASS_NAME_METHOD(JSZoneParticipant)

4
xpcom/base/nsAgg.h
View File

@@ -79,7 +79,7 @@ class NS_CYCLE_COLLECTION_INNERCLASS \
{ \ { \
public: \ public: \
NS_IMETHOD_(void) Unlink(void *p) override; \ NS_IMETHOD_(void) Unlink(void *p) override; \
NS_IMETHOD Traverse(void *p, nsCycleCollectionTraversalCallback &cb) \ NS_IMETHOD TraverseNative(void *p, nsCycleCollectionTraversalCallback &cb)\
override; \ override; \
NS_DECL_CYCLE_COLLECTION_CLASS_NAME_METHOD(_class) \ NS_DECL_CYCLE_COLLECTION_CLASS_NAME_METHOD(_class) \
NS_IMETHOD_(void) DeleteCycleCollectable(void* p) override \ NS_IMETHOD_(void) DeleteCycleCollectable(void* p) override \
@@ -278,7 +278,7 @@ _class::AggregatedQueryInterface(REFNSIID aIID, void** aInstancePtr) \
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_AGGREGATED(_class) \ #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_AGGREGATED(_class) \
NS_IMETHODIMP \ NS_IMETHODIMP \
NS_CYCLE_COLLECTION_CLASSNAME(_class)::Traverse \ NS_CYCLE_COLLECTION_CLASSNAME(_class)::TraverseNative \
(void *p, nsCycleCollectionTraversalCallback &cb) \ (void *p, nsCycleCollectionTraversalCallback &cb) \
{ \ { \
nsISupports *s = static_cast<nsISupports*>(p); \ nsISupports *s = static_cast<nsISupports*>(p); \

14
xpcom/glue/nsCycleCollectionParticipant.h
View File

@@ -126,12 +126,12 @@ public:
{ {
} }
NS_IMETHOD Traverse(void* aPtr, nsCycleCollectionTraversalCallback& aCb) = 0; NS_IMETHOD TraverseNative(void* aPtr, nsCycleCollectionTraversalCallback& aCb) = 0;
nsresult TraverseNativeAndJS(void* aPtr, nsresult TraverseNativeAndJS(void* aPtr,
nsCycleCollectionTraversalCallback& aCb) nsCycleCollectionTraversalCallback& aCb)
{ {
nsresult rv = Traverse(aPtr, aCb); nsresult rv = TraverseNative(aPtr, aCb);
if (mTraverseShouldTrace) { if (mTraverseShouldTrace) {
// Note, we always call Trace, even if Traverse returned // Note, we always call Trace, even if Traverse returned
// NS_SUCCESS_INTERRUPTED_TRAVERSE. // NS_SUCCESS_INTERRUPTED_TRAVERSE.
@@ -434,7 +434,7 @@ DowncastCCParticipant(void* aPtr)
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(_class) \ #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(_class) \
NS_IMETHODIMP \ NS_IMETHODIMP \
NS_CYCLE_COLLECTION_CLASSNAME(_class)::Traverse \ NS_CYCLE_COLLECTION_CLASSNAME(_class)::TraverseNative \
(void *p, nsCycleCollectionTraversalCallback &cb) \ (void *p, nsCycleCollectionTraversalCallback &cb) \
{ \ { \
_class *tmp = DowncastCCParticipant<_class >(p); _class *tmp = DowncastCCParticipant<_class >(p);
@@ -450,7 +450,7 @@ DowncastCCParticipant(void* aPtr)
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(_class, _base_class) \ #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(_class, _base_class) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(_class) \ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(_class) \
nsISupports *s = static_cast<nsISupports*>(p); \ nsISupports *s = static_cast<nsISupports*>(p); \
if (NS_CYCLE_COLLECTION_CLASSNAME(_base_class)::Traverse(s, cb) \ if (NS_CYCLE_COLLECTION_CLASSNAME(_base_class)::TraverseNative(s, cb) \
== NS_SUCCESS_INTERRUPTED_TRAVERSE) { \ == NS_SUCCESS_INTERRUPTED_TRAVERSE) { \
return NS_SUCCESS_INTERRUPTED_TRAVERSE; \ return NS_SUCCESS_INTERRUPTED_TRAVERSE; \
} }
@@ -532,7 +532,7 @@ DowncastCCParticipant(void* aPtr)
#define NS_DECL_CYCLE_COLLECTION_CLASS_BODY_NO_UNLINK(_class, _base) \ #define NS_DECL_CYCLE_COLLECTION_CLASS_BODY_NO_UNLINK(_class, _base) \
public: \ public: \
NS_IMETHOD Traverse(void *p, nsCycleCollectionTraversalCallback &cb) \ NS_IMETHOD TraverseNative(void *p, nsCycleCollectionTraversalCallback &cb) \
override; \ override; \
NS_DECL_CYCLE_COLLECTION_CLASS_NAME_METHOD(_class) \ NS_DECL_CYCLE_COLLECTION_CLASS_NAME_METHOD(_class) \
NS_IMETHOD_(void) DeleteCycleCollectable(void *p) override \ NS_IMETHOD_(void) DeleteCycleCollectable(void *p) override \
@@ -667,7 +667,7 @@ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME;
#define NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_BODY_NO_UNLINK(_class, \ #define NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_BODY_NO_UNLINK(_class, \
_base_class) \ _base_class) \
public: \ public: \
NS_IMETHOD Traverse(void *p, nsCycleCollectionTraversalCallback &cb) \ NS_IMETHOD TraverseNative(void *p, nsCycleCollectionTraversalCallback &cb) \
override; \ override; \
NS_DECL_CYCLE_COLLECTION_CLASS_NAME_METHOD(_class) \ NS_DECL_CYCLE_COLLECTION_CLASS_NAME_METHOD(_class) \
static _class* Downcast(nsISupports* s) \ static _class* Downcast(nsISupports* s) \
@@ -723,7 +723,7 @@ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME;
NS_IMETHOD_(void) Root(void *n) override; \ NS_IMETHOD_(void) Root(void *n) override; \
NS_IMETHOD_(void) Unlink(void *n) override; \ NS_IMETHOD_(void) Unlink(void *n) override; \
NS_IMETHOD_(void) Unroot(void *n) override; \ NS_IMETHOD_(void) Unroot(void *n) override; \
NS_IMETHOD Traverse(void *n, nsCycleCollectionTraversalCallback &cb) \ NS_IMETHOD TraverseNative(void *n, nsCycleCollectionTraversalCallback &cb) \
override; \ override; \
NS_DECL_CYCLE_COLLECTION_CLASS_NAME_METHOD(_class) \ NS_DECL_CYCLE_COLLECTION_CLASS_NAME_METHOD(_class) \
NS_IMETHOD_(void) DeleteCycleCollectable(void *n) override \ NS_IMETHOD_(void) DeleteCycleCollectable(void *n) override \