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

Merge places head to mozilla-central head.

Browse Source
This commit is contained in:
Shawn Wilsher 2009-07-29 13:59:37 -07:00
commit d8f6c4eeae
9 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
caps/src/nsScriptSecurityManager.cpp
View File

@ -2863,7 +2863,7 @@ nsScriptSecurityManager::CanCreateWrapper(JSContext *cx,
#ifdef DEBUG_CAPS_CanCreateWrapper
char* iidStr = aIID.ToString();
printf("### CanCreateWrapper(%s) ", iidStr);
nsCRT::free(iidStr);
NS_Free(iidStr);
#endif
// XXX Special case for nsIXPCException ?
ClassInfoData objClassInfo = ClassInfoData(aClassInfo, nsnull);
@ -2992,7 +2992,7 @@ nsScriptSecurityManager::CanCreateInstance(JSContext *cx,
#ifdef DEBUG_CAPS_CanCreateInstance
char* cidStr = aCID.ToString();
printf("### CanCreateInstance(%s) ", cidStr);
nsCRT::free(cidStr);
NS_Free(cidStr);
#endif
nsresult rv = CheckXPCPermissions(nsnull, nsnull, nsnull, nsnull);
@ -3029,7 +3029,7 @@ nsScriptSecurityManager::CanGetService(JSContext *cx,
#ifdef DEBUG_CAPS_CanGetService
char* cidStr = aCID.ToString();
printf("### CanGetService(%s) ", cidStr);
nsCRT::free(cidStr);
NS_Free(cidStr);
#endif
nsresult rv = CheckXPCPermissions(nsnull, nsnull, nsnull, nsnull);

6
docshell/base/nsDocShell.cpp
View File

@ -3952,6 +3952,12 @@ nsDocShell::Stop(PRUint32 aStopFlags)
// Revoke any pending event related to content viewer restoration
mRestorePresentationEvent.Revoke();
if (mLoadType == LOAD_ERROR_PAGE && mLSHE) {
// Since error page loads never unset mLSHE, do so now
SetHistoryEntry(&mOSHE, mLSHE);
SetHistoryEntry(&mLSHE, nsnull);
}
if (nsIWebNavigation::STOP_CONTENT & aStopFlags) {
// Stop the document loading
if (mContentViewer)

4
extensions/java/xpcom/src/nsJavaWrapper.cpp
View File

@ -1801,7 +1801,7 @@ GetNewOrUsedJavaWrapper(JNIEnv* env, nsISupports* aXPCOMObject,
(PRUint32) env->CallStaticIntMethod(systemClass, hashCodeMID,
java_obj),
(PRUint32) rootObject, iid_str));
PR_Free(iid_str);
NS_Free(iid_str);
#endif
// Associate XPCOM object with Java proxy
@ -1844,7 +1844,7 @@ GetXPCOMInstFromProxy(JNIEnv* env, jobject aJavaObject, void** aResult)
(PRUint32) env->CallStaticIntMethod(systemClass, hashCodeMID,
aJavaObject),
(PRUint32) inst->GetInstance(), iid_str));
PR_Free(iid_str);
NS_Free(iid_str);
nsMemory::Free(iid);
#endif
return NS_OK;

10
extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp
View File

@ -490,7 +490,7 @@ DestroyJavaProxyMappingEnum(PLDHashTable* aTable, PLDHashEntryHdr* aHeader,
(PRUint32) env->CallStaticIntMethod(systemClass, hashCodeMID,
javaObject),
(PRUint32) entry, iid_str));
PR_Free(iid_str);
NS_Free(iid_str);
#endif
delete inst; // releases native XPCOM object
}
@ -548,7 +548,7 @@ NativeToJavaProxyMap::Add(JNIEnv* env, nsISupports* aXPCOMObject,
LOG(("+ NativeToJavaProxyMap (Java=%08x | XPCOM=%08x | IID=%s)\n",
(PRUint32) env->CallStaticIntMethod(systemClass, hashCodeMID, aProxy),
(PRUint32) aXPCOMObject, iid_str));
PR_Free(iid_str);
NS_Free(iid_str);
#endif
return NS_OK;
}
@ -584,7 +584,7 @@ NativeToJavaProxyMap::Find(JNIEnv* env, nsISupports* aNativeObject,
(PRUint32) env->CallStaticIntMethod(systemClass, hashCodeMID,
*aResult),
(PRUint32) aNativeObject, iid_str));
PR_Free(iid_str);
NS_Free(iid_str);
#endif
}
}
@ -620,7 +620,7 @@ NativeToJavaProxyMap::Remove(JNIEnv* env, nsISupports* aNativeObject,
(PRUint32) env->CallStaticIntMethod(systemClass, hashCodeMID,
item->javaObject),
(PRUint32) aNativeObject, iid_str));
PR_Free(iid_str);
NS_Free(iid_str);
#endif
env->CallVoidMethod(item->javaObject, clearReferentMID);
@ -709,7 +709,7 @@ JavaToXPTCStubMap::Add(jint aJavaObjectHashCode, nsJavaXPTCStub* aProxy)
char* iid_str = iid->ToString();
LOG(("+ JavaToXPTCStubMap (Java=%08x | XPCOM=%08x | IID=%s)\n",
(PRUint32) aJavaObjectHashCode, (PRUint32) aProxy, iid_str));
PR_Free(iid_str);
NS_Free(iid_str);
nsMemory::Free(iid);
NS_RELEASE(iface_info);
#endif

12
extensions/java/xpcom/src/nsJavaXPTCStub.cpp
View File

@ -72,7 +72,7 @@ nsJavaXPTCStub::nsJavaXPTCStub(jobject aJavaObject, nsIInterfaceInfo *aIInfo,
char* iid_str = iid->ToString();
LOG(("+ nsJavaXPTCStub (Java=%08x | XPCOM=%08x | IID=%s)\n",
(PRUint32) mJavaRefHashCode, (PRUint32) this, iid_str));
PR_Free(iid_str);
NS_Free(iid_str);
#endif
}
@ -112,7 +112,7 @@ nsJavaXPTCStub::AddRef()
int refcnt = PRInt32(mMaster ? mMaster->mRefCnt : mRefCnt) + 1;
LOG(("= nsJavaXPTCStub::AddRef (XPCOM=%08x | refcnt = %d | IID=%s)\n",
(int) this, refcnt, iid_str));
PR_Free(iid_str);
NS_Free(iid_str);
nsMemory::Free(iid);
#endif
@ -152,7 +152,7 @@ nsJavaXPTCStub::Release()
int refcnt = PRInt32(mMaster ? mMaster->mRefCnt : mRefCnt) - 1;
LOG(("= nsJavaXPTCStub::Release (XPCOM=%08x | refcnt = %d | IID=%s)\n",
(int) this, refcnt, iid_str));
PR_Free(iid_str);
NS_Free(iid_str);
nsMemory::Free(iid);
#endif
@ -171,7 +171,7 @@ nsJavaXPTCStub::Destroy()
char* iid_str = iid->ToString();
LOG(("- nsJavaXPTCStub (Java=%08x | XPCOM=%08x | IID=%s)\n",
(PRUint32) mJavaRefHashCode, (PRUint32) this, iid_str));
PR_Free(iid_str);
NS_Free(iid_str);
nsMemory::Free(iid);
#endif
@ -293,7 +293,7 @@ nsJavaXPTCStub::QueryInterface(const nsID &aIID, void **aInstancePtr)
env->ExceptionClear();
return NS_ERROR_OUT_OF_MEMORY;
}
PR_Free(iid_str);
NS_Free(iid_str);
// call queryInterface method
jobject obj = env->CallObjectMethod(javaObject, qiMID, iid_jstr);
@ -1653,7 +1653,7 @@ nsJavaXPTCStub::GetJavaObject()
char* iid_str = iid->ToString();
LOG(("< nsJavaXPTCStub (Java=%08x | XPCOM=%08x | IID=%s)\n",
(PRUint32) mJavaRefHashCode, (PRUint32) this, iid_str));
PR_Free(iid_str);
NS_Free(iid_str);
nsMemory::Free(iid);
#endif

3
intl/uconv/public/nsEncoderDecoderUtils.h
View File

@ -123,10 +123,7 @@ nsUConverterUnregSelf(nsIComponentManager *aCompMgr, \
} \
key = entry->charset; \
\
char * value = entry->cid.ToString(); \
\
rv = catman->DeleteCategoryEntry(category, key, PR_TRUE); \
CRTFREEIF(value); \
} \
return rv; \
}

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

@ -648,7 +648,7 @@ nsXPCWrappedJS::DebugDump(PRInt16 depth)
char * iid = GetClass()->GetIID().ToString();
XPC_LOG_ALWAYS(("IID number is %s", iid ? iid : "invalid"));
if(iid)
PR_Free(iid);
NS_Free(iid);
XPC_LOG_ALWAYS(("nsXPCWrappedJSClass @ %x", mClass));
if(!isRoot)

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

@ -1947,7 +1947,7 @@ nsXPCWrappedJSClass::DebugDump(PRInt16 depth)
char * iid = mIID.ToString();
XPC_LOG_ALWAYS(("IID number is %s", iid ? iid : "invalid"));
if(iid)
PR_Free(iid);
NS_Free(iid);
XPC_LOG_ALWAYS(("InterfaceInfo @ %x", mInfo));
uint16 methodCount = 0;
if(depth)

1
toolkit/toolkit-makefiles.sh
View File

@ -119,7 +119,6 @@ MAKEFILES_gfx="
gfx/public/Makefile
gfx/src/Makefile
gfx/src/psshared/Makefile
gfx/src/shared/Makefile
gfx/src/thebes/Makefile
gfx/tests/Makefile
gfx/thebes/Makefile