diff options
Diffstat (limited to 'ipc/glue/BackgroundParentImpl.cpp')
-rw-r--r-- | ipc/glue/BackgroundParentImpl.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ipc/glue/BackgroundParentImpl.cpp b/ipc/glue/BackgroundParentImpl.cpp index e9d0adbb94..6fcd344ddb 100644 --- a/ipc/glue/BackgroundParentImpl.cpp +++ b/ipc/glue/BackgroundParentImpl.cpp @@ -148,8 +148,8 @@ void BackgroundParentImpl::ProcessingError(Result aCode, const char* aReason) { GetIPCChannel()->InduceConnectionError(); } } else { - CrashReporter::AnnotateCrashReport( - CrashReporter::Annotation::ipc_channel_error, reason); + CrashReporter::RecordAnnotationCString( + CrashReporter::Annotation::ipc_channel_error, aReason); MOZ_CRASH("in-process BackgroundParent abort due to IPC error"); } @@ -191,26 +191,28 @@ bool BackgroundParentImpl::DeallocPBackgroundTestParent( } auto BackgroundParentImpl::AllocPBackgroundIDBFactoryParent( - const LoggingInfo& aLoggingInfo) + const LoggingInfo& aLoggingInfo, const nsACString& aSystemLocale) -> already_AddRefed<PBackgroundIDBFactoryParent> { using mozilla::dom::indexedDB::AllocPBackgroundIDBFactoryParent; AssertIsInMainProcess(); AssertIsOnBackgroundThread(); - return AllocPBackgroundIDBFactoryParent(aLoggingInfo); + return AllocPBackgroundIDBFactoryParent(aLoggingInfo, aSystemLocale); } mozilla::ipc::IPCResult BackgroundParentImpl::RecvPBackgroundIDBFactoryConstructor( - PBackgroundIDBFactoryParent* aActor, const LoggingInfo& aLoggingInfo) { + PBackgroundIDBFactoryParent* aActor, const LoggingInfo& aLoggingInfo, + const nsACString& aSystemLocale) { using mozilla::dom::indexedDB::RecvPBackgroundIDBFactoryConstructor; AssertIsInMainProcess(); AssertIsOnBackgroundThread(); MOZ_ASSERT(aActor); - if (!RecvPBackgroundIDBFactoryConstructor(aActor, aLoggingInfo)) { + if (!RecvPBackgroundIDBFactoryConstructor(aActor, aLoggingInfo, + aSystemLocale)) { return IPC_FAIL_NO_REASON(this); } return IPC_OK(); |