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 930851 (part 3) - Use |data| instead of |closure| for some callback environment arguments. r=mccr8.

Browse Source 
--HG--
extra : rebase_source : a96709da6d9a880a03e2e79149ba0e3558b4a355
This commit is contained in:
Nicholas Nethercote 2013-10-24 21:39:16 -07:00
parent 938aaa8952
commit d4be988ff0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xpcom/base/nsIMemoryReporter.idl
View File

@ -122,7 +122,7 @@ interface nsIMemoryReporterCallback : nsISupports
*/
void callback(in ACString process, in AUTF8String path, in int32_t kind,
in int32_t units, in int64_t amount,
in AUTF8String description, in nsISupports closure);
in AUTF8String description, in nsISupports data);
};
/*
@ -161,7 +161,7 @@ interface nsIMemoryReporter : nsISupports
* Run the reporter.
*/
void collectReports(in nsIMemoryReporterCallback callback,
in nsISupports closure);
in nsISupports data);
/*
* Kinds. See the |kind| comment in nsIMemoryReporterCallback.
@ -494,14 +494,14 @@ public:
}
NS_IMETHOD CollectReports(nsIMemoryReporterCallback* aCallback,
nsISupports* aClosure)
nsISupports* aData)
{
int64_t amount;
nsresult rv = GetAmount(&amount);
NS_ENSURE_SUCCESS(rv, rv);
return aCallback->Callback(EmptyCString(), mNameAndPath, mKind, mUnits,
amount, mDescription, aClosure);
amount, mDescription, aData);
}
protected:

4
xpcom/base/nsMemoryReporterManager.cpp
View File

@ -680,7 +680,7 @@ public:
}
NS_IMETHOD CollectReports(nsIMemoryReporterCallback* aCallback,
nsISupports* aClosure)
nsISupports* aData)
{
dmd::Sizes sizes;
dmd::SizeOf(&sizes);
@ -691,7 +691,7 @@ public:
rv = aCallback->Callback(EmptyCString(), NS_LITERAL_CSTRING(_path), \
nsIMemoryReporter::KIND_HEAP, \
nsIMemoryReporter::UNITS_BYTES, _amount, \
NS_LITERAL_CSTRING(_desc), aClosure); \
NS_LITERAL_CSTRING(_desc), aData); \
NS_ENSURE_SUCCESS(rv, rv); \
} while (0)