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 213324 - Remove getter_AddRefs(T*); r=ehsan

Browse Source
This commit is contained in:
Ms2ger 2013-07-10 11:56:21 +02:00
parent 6fcb1fbc4c
commit 1475a22d49
7 changed files with 28 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/base/public/nsIScriptElement.h
View File

@ -151,7 +151,7 @@ public:
void SetCreatorParser(nsIParser* aParser)
{
mCreatorParser = getter_AddRefs(NS_GetWeakReference(aParser));
mCreatorParser = do_GetWeakReference(aParser);
}
/**

2
content/xbl/src/nsXBLPrototypeBinding.cpp
View File

@ -476,7 +476,7 @@ nsXBLPrototypeBinding::ImplementsInterface(REFNSIID aIID) const
// Check our IID table.
if (mInterfaceTable) {
nsIIDKey key(aIID);
nsCOMPtr<nsISupports> supports = getter_AddRefs(static_cast<nsISupports*>(mInterfaceTable->Get(&key)));
nsCOMPtr<nsISupports> supports = dont_AddRef(mInterfaceTable->Get(&key));
return supports != nullptr;
}

20
image/src/imgLoader.cpp
View File

@ -960,7 +960,7 @@ NS_IMETHODIMP imgLoader::FindEntryProperties(nsIURI *uri, nsIProperties **_retva
if (mCacheTracker && entry->HasNoProxies())
mCacheTracker->MarkUsed(entry);
nsRefPtr<imgRequest> request = getter_AddRefs(entry->GetRequest());
nsRefPtr<imgRequest> request = entry->GetRequest();
if (request) {
*_retval = request->Properties();
NS_ADDREF(*_retval);
@ -1007,7 +1007,7 @@ bool imgLoader::PutIntoCache(nsIURI *key, imgCacheEntry *entry)
if (cache.Get(spec, getter_AddRefs(tmpCacheEntry)) && tmpCacheEntry) {
PR_LOG(GetImgLog(), PR_LOG_DEBUG,
("[this=%p] imgLoader::PutIntoCache -- Element already in the cache", nullptr));
nsRefPtr<imgRequest> tmpRequest = getter_AddRefs(tmpCacheEntry->GetRequest());
nsRefPtr<imgRequest> tmpRequest = tmpCacheEntry->GetRequest();
// If it already exists, and we're putting the same key into the cache, we
// should remove the old version.
@ -1040,7 +1040,7 @@ bool imgLoader::PutIntoCache(nsIURI *key, imgCacheEntry *entry)
}
}
nsRefPtr<imgRequest> request(getter_AddRefs(entry->GetRequest()));
nsRefPtr<imgRequest> request = entry->GetRequest();
request->SetIsInCache(true);
return true;
@ -1409,7 +1409,7 @@ bool imgLoader::RemoveFromCache(nsIURI *aKey)
entry->SetEvicted(true);
nsRefPtr<imgRequest> request(getter_AddRefs(entry->GetRequest()));
nsRefPtr<imgRequest> request = entry->GetRequest();
request->SetIsInCache(false);
return true;
@ -1422,7 +1422,7 @@ bool imgLoader::RemoveFromCache(imgCacheEntry *entry)
{
LOG_STATIC_FUNC(GetImgLog(), "imgLoader::RemoveFromCache entry");
nsRefPtr<imgRequest> request(getter_AddRefs(entry->GetRequest()));
nsRefPtr<imgRequest> request = entry->GetRequest();
if (request) {
nsCOMPtr<nsIURI> key;
if (NS_SUCCEEDED(request->GetURI(getter_AddRefs(key))) && key) {
@ -1625,7 +1625,7 @@ nsresult imgLoader::LoadImage(nsIURI *aURI,
if (ValidateEntry(entry, aURI, aInitialDocumentURI, aReferrerURI,
aLoadGroup, aObserver, aCX, requestFlags, true,
_retval, aPolicy, aLoadingPrincipal, corsmode)) {
request = getter_AddRefs(entry->GetRequest());
request = entry->GetRequest();
// If this entry has no proxies, its request has no reference to the entry.
if (entry->HasNoProxies()) {
@ -1851,7 +1851,7 @@ nsresult imgLoader::LoadImageWithChannel(nsIChannel *channel, imgINotificationOb
if (ValidateEntry(entry, uri, nullptr, nullptr, nullptr, aObserver, aCX,
requestFlags, false, nullptr, nullptr, nullptr,
imgIRequest::CORS_NONE)) {
request = getter_AddRefs(entry->GetRequest());
request = entry->GetRequest();
} else {
nsCOMPtr<nsICachingChannel> cacheChan(do_QueryInterface(channel));
bool bUseCacheCopy;
@ -1861,10 +1861,10 @@ nsresult imgLoader::LoadImageWithChannel(nsIChannel *channel, imgINotificationOb
else
bUseCacheCopy = false;
if (!bUseCacheCopy)
if (!bUseCacheCopy) {
entry = nullptr;
else {
request = getter_AddRefs(entry->GetRequest());
} else {
request = entry->GetRequest();
}
}

16
js/jsd/jsd_xpc.cpp
View File

@ -502,7 +502,7 @@ jsds_ErrorHookProc (JSDContext *jsdc, JSContext *cx, const char *message,
jsval jv;
JS_GetPendingException(cx, &jv);
JSDValue *jsdv = JSD_NewValue (jsdc, jv);
val = getter_AddRefs(jsdValue::FromPtr(jsdc, jsdv));
val = dont_AddRef(jsdValue::FromPtr(jsdc, jsdv));
}
nsAutoCString fileName;
@ -567,8 +567,7 @@ jsds_CallHookProc (JSDContext* jsdc, JSDThreadState* jsdthreadstate,
JSDStackFrameInfo *native_frame = JSD_GetStackFrame (jsdc, jsdthreadstate);
nsCOMPtr<jsdIStackFrame> frame =
getter_AddRefs(jsdStackFrame::FromPtr(jsdc, jsdthreadstate,
native_frame));
dont_AddRef(jsdStackFrame::FromPtr(jsdc, jsdthreadstate, native_frame));
gJsds->DoPause(nullptr, true);
hook->OnCall(frame, type);
gJsds->DoUnPause(nullptr, true);
@ -613,7 +612,7 @@ jsds_ExecutionHookProc (JSDContext* jsdc, JSDThreadState* jsdthreadstate,
gJsds->GetThrowHook(getter_AddRefs(hook));
if (hook) {
JSDValue *jsdv = JSD_GetException (jsdc, jsdthreadstate);
js_rv = getter_AddRefs(jsdValue::FromPtr (jsdc, jsdv));
js_rv = dont_AddRef(jsdValue::FromPtr (jsdc, jsdv));
}
break;
}
@ -629,8 +628,7 @@ jsds_ExecutionHookProc (JSDContext* jsdc, JSDThreadState* jsdthreadstate,
JSDStackFrameInfo *native_frame = JSD_GetStackFrame (jsdc, jsdthreadstate);
nsCOMPtr<jsdIStackFrame> frame =
getter_AddRefs(jsdStackFrame::FromPtr(jsdc, jsdthreadstate,
native_frame));
dont_AddRef(jsdStackFrame::FromPtr(jsdc, jsdthreadstate, native_frame));
gJsds->DoPause(nullptr, true);
jsdIValue *inout_rv = js_rv;
NS_IF_ADDREF(inout_rv);
@ -672,7 +670,7 @@ jsds_ScriptHookProc (JSDContext* jsdc, JSDScript* jsdscript, JSBool creating,
}
nsCOMPtr<jsdIScript> script =
getter_AddRefs(jsdScript::FromPtr(jsdc, jsdscript));
dont_AddRef(jsdScript::FromPtr(jsdc, jsdscript));
#ifdef CAUTIOUS_SCRIPTHOOK
JS_UNKEEP_ATOMS(rt);
#endif
@ -2681,7 +2679,7 @@ jsdService::EnumerateContexts (jsdIContextEnumerator *enumerator)
while ((cx = JS_ContextIterator (mRuntime, &iter)))
{
nsCOMPtr<jsdIContext> jsdicx =
getter_AddRefs(jsdContext::FromPtr(mCx, cx));
dont_AddRef(jsdContext::FromPtr(mCx, cx));
if (jsdicx)
{
if (NS_FAILED(enumerator->EnumerateContext(jsdicx)))
@ -2704,7 +2702,7 @@ jsdService::EnumerateScripts (jsdIScriptEnumerator *enumerator)
JSD_LockScriptSubsystem(mCx);
while((script = JSD_IterateScripts(mCx, &iter))) {
nsCOMPtr<jsdIScript> jsdis =
getter_AddRefs(jsdScript::FromPtr(mCx, script));
dont_AddRef(jsdScript::FromPtr(mCx, script));
rv = enumerator->EnumerateScript (jsdis);
if (NS_FAILED(rv))
break;

16
widget/xpwidgets/nsTransferable.cpp
View File

@ -99,13 +99,13 @@ DataStruct::GetData ( nsISupports** aData, uint32_t *aDataLen )
//-------------------------------------------------------------------------
nsIFile*
DataStruct::GetFileSpec(const char * aFileName)
already_AddRefed<nsIFile>
DataStruct::GetFileSpec(const char* aFileName)
{
nsIFile* cacheFile;
NS_GetSpecialDirectory(NS_OS_TEMP_DIR, &cacheFile);
nsCOMPtr<nsIFile> cacheFile;
NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(cacheFile));
if (cacheFile == nullptr)
if (!cacheFile)
return nullptr;
// if the param aFileName contains a name we should use that
@ -118,7 +118,7 @@ DataStruct::GetFileSpec(const char * aFileName)
cacheFile->AppendNative(nsDependentCString(aFileName));
}
return cacheFile;
return cacheFile.forget();
}
@ -127,7 +127,7 @@ nsresult
DataStruct::WriteCache(nsISupports* aData, uint32_t aDataLen)
{
// Get a new path and file to the temp directory
nsCOMPtr<nsIFile> cacheFile ( getter_AddRefs(GetFileSpec(mCacheFileName)) );
nsCOMPtr<nsIFile> cacheFile = GetFileSpec(mCacheFileName);
if (cacheFile) {
// remember the file name
if (!mCacheFileName) {
@ -168,7 +168,7 @@ DataStruct::ReadCache(nsISupports** aData, uint32_t* aDataLen)
return NS_ERROR_FAILURE;
// get the path and file name
nsCOMPtr<nsIFile> cacheFile ( getter_AddRefs(GetFileSpec(mCacheFileName)) );
nsCOMPtr<nsIFile> cacheFile = GetFileSpec(mCacheFileName);
bool exists;
if ( cacheFile && NS_SUCCEEDED(cacheFile->Exists(&exists)) && exists ) {
// get the size of the file

2
widget/xpwidgets/nsTransferable.h
View File

@ -29,7 +29,7 @@ struct DataStruct
const nsCString& GetFlavor() const { return mFlavor; }
void SetData( nsISupports* inData, uint32_t inDataLen );
void GetData( nsISupports** outData, uint32_t *outDataLen );
nsIFile * GetFileSpec(const char * aFileName);
already_AddRefed<nsIFile> GetFileSpec(const char* aFileName);
bool IsDataAvailable() const { return (mData && mDataLen > 0) || (!mData && mCacheFileName); }
protected:

20
xpcom/glue/nsCOMPtr.h
View File

@ -217,26 +217,6 @@ struct already_AddRefed
T* mRawPtr;
};
template <class T>
inline
const already_AddRefed<T>
getter_AddRefs( T* aRawPtr )
/*
...makes typing easier, because it deduces the template type, e.g.,
you write |dont_AddRef(fooP)| instead of |already_AddRefed<IFoo>(fooP)|.
*/
{
return already_AddRefed<T>(aRawPtr);
}
template <class T>
inline
const already_AddRefed<T>
getter_AddRefs( const already_AddRefed<T> aAlreadyAddRefedPtr )
{
return aAlreadyAddRefedPtr;
}
template <class T>
inline
const already_AddRefed<T>