46b4ec79ce
This is mostly self-explanatory. However, the patch also contains some minor changes to frame scripts which expect to be able to call message manager methods with a null target object, which stops working when they stop being global objects. MozReview-Commit-ID: HDT2RvK3F3L
26 lines
742 B
C++
26 lines
742 B
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "ContentFrameMessageManager.h"
|
|
#include "mozilla/dom/ScriptSettings.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::dom;
|
|
|
|
JSObject*
|
|
ContentFrameMessageManager::GetOrCreateWrapper()
|
|
{
|
|
AutoJSAPI jsapi;
|
|
jsapi.Init();
|
|
|
|
JS::RootedValue val(jsapi.cx());
|
|
if (!GetOrCreateDOMReflectorNoWrap(jsapi.cx(), this, &val)) {
|
|
return nullptr;
|
|
}
|
|
MOZ_ASSERT(val.isObject());
|
|
return &val.toObject();
|
|
}
|