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 1163916 (part 1) - Avoid a static nsDebugImpl constructor. r=froydnj.

Browse Source
This commit is contained in:
Nicholas Nethercote 2015-05-13 16:47:55 -07:00
parent 5142eb7562
commit 742d99332f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xpcom/base/nsDebugImpl.cpp
View File

@ -579,16 +579,20 @@ Break(const char* aMsg)
#endif
}
static const nsDebugImpl kImpl;
nsresult
nsDebugImpl::Create(nsISupports* aOuter, const nsIID& aIID, void** aInstancePtr)
{
static const nsDebugImpl* sImpl;
if (NS_WARN_IF(aOuter)) {
return NS_ERROR_NO_AGGREGATION;
}
return const_cast<nsDebugImpl*>(&kImpl)->QueryInterface(aIID, aInstancePtr);
if (!sImpl) {
sImpl = new nsDebugImpl();
}
return const_cast<nsDebugImpl*>(sImpl)->QueryInterface(aIID, aInstancePtr);
}
////////////////////////////////////////////////////////////////////////////////

4
xpcom/base/nsDebugImpl.h
View File

@ -12,9 +12,7 @@
class nsDebugImpl : public nsIDebug2
{
public:
nsDebugImpl()
{
}
nsDebugImpl() = default;
NS_DECL_ISUPPORTS
NS_DECL_NSIDEBUG2