From 0f0eba9c47b09f36bb69dd2dda3d51a51fbc8799 Mon Sep 17 00:00:00 2001 From: Eric Rahm Date: Tue, 14 Jul 2015 17:21:49 -0700 Subject: [PATCH] Bug 1183824 - Remove NS_ENSURE_TRUE(mCallback, NS_ERROR_NOT_INITIALIZED) warning from nsFrameMessageManager::DispatchAsyncMessageInternal. r=smaug --- dom/base/nsFrameMessageManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dom/base/nsFrameMessageManager.cpp b/dom/base/nsFrameMessageManager.cpp index c5641a68eefe..4f5df0ef0e99 100644 --- a/dom/base/nsFrameMessageManager.cpp +++ b/dom/base/nsFrameMessageManager.cpp @@ -800,7 +800,10 @@ nsFrameMessageManager::DispatchAsyncMessageInternal(JSContext* aCx, return NS_OK; } - NS_ENSURE_TRUE(mCallback, NS_ERROR_NOT_INITIALIZED); + if (!mCallback) { + return NS_ERROR_NOT_INITIALIZED; + } + if (!mCallback->DoSendAsyncMessage(aCx, aMessage, aData, aCpows, aPrincipal)) { return NS_ERROR_FAILURE; }