mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 04:15:43 +00:00
Bug 1383501: Move a crash annotation so that it does not mask a previous annotation with the same key; r=handyman
MozReview-Commit-ID: 9u7VTKDglrS
This commit is contained in:
parent
34f00ff865
commit
a55d72f6da
@ -127,6 +127,11 @@ ProxyStream::ProxyStream(REFIID aIID, const BYTE* aInitBuf,
|
|||||||
CrashReporter::AnnotateCrashReport(
|
CrashReporter::AnnotateCrashReport(
|
||||||
NS_LITERAL_CSTRING("CoUnmarshalInterfaceResult"), hrAsStr);
|
NS_LITERAL_CSTRING("CoUnmarshalInterfaceResult"), hrAsStr);
|
||||||
AnnotateInterfaceRegistration(aIID);
|
AnnotateInterfaceRegistration(aIID);
|
||||||
|
if (!mUnmarshaledProxy) {
|
||||||
|
CrashReporter::AnnotateCrashReport(kCrashReportKey,
|
||||||
|
NS_LITERAL_CSTRING("!mUnmarshaledProxy"));
|
||||||
|
}
|
||||||
|
|
||||||
#if defined(ACCESSIBILITY)
|
#if defined(ACCESSIBILITY)
|
||||||
AnnotateClassRegistration(CLSID_AccessibleHandler);
|
AnnotateClassRegistration(CLSID_AccessibleHandler);
|
||||||
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("UnmarshalActCtx"),
|
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("UnmarshalActCtx"),
|
||||||
@ -254,13 +259,6 @@ ProxyStream::GetInterface(void** aOutInterface)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MOZ_CRASHREPORTER)
|
|
||||||
if (!mUnmarshaledProxy) {
|
|
||||||
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("ProxyStreamUnmarshalStatus"),
|
|
||||||
NS_LITERAL_CSTRING("!mUnmarshaledProxy"));
|
|
||||||
}
|
|
||||||
#endif // defined(MOZ_CRASHREPORTER)
|
|
||||||
|
|
||||||
*aOutInterface = mUnmarshaledProxy.release();
|
*aOutInterface = mUnmarshaledProxy.release();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user