summaryrefslogtreecommitdiffstats
path: root/dom/base/nsFrameMessageManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dom/base/nsFrameMessageManager.cpp')
-rw-r--r--dom/base/nsFrameMessageManager.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/dom/base/nsFrameMessageManager.cpp b/dom/base/nsFrameMessageManager.cpp
index da275095b1..4c110cc55e 100644
--- a/dom/base/nsFrameMessageManager.cpp
+++ b/dom/base/nsFrameMessageManager.cpp
@@ -506,7 +506,7 @@ void nsFrameMessageManager::SendSyncMessage(JSContext* aCx,
"Should not have parent manager in content!");
AUTO_PROFILER_LABEL_DYNAMIC_LOSSY_NSSTRING(
- "nsFrameMessageManager::SendMessage", OTHER, aMessageName);
+ "nsFrameMessageManager::SendSyncMessage", OTHER, aMessageName);
profiler_add_marker("SendSyncMessage", geckoprofiler::category::IPC, {},
FrameMessageMarker{}, aMessageName, true);
@@ -1428,8 +1428,7 @@ class SameParentProcessMessageManagerCallback : public MessageManagerCallback {
bool aRunInGlobalScope) override {
auto* global = ContentProcessMessageManager::Get();
MOZ_ASSERT(!aRunInGlobalScope);
- global->LoadScript(aURL);
- return true;
+ return global && global->LoadScript(aURL);
}
nsresult DoSendAsyncMessage(const nsAString& aMessage,