Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-12 02:31:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 968804 - Part u: Add outer window assertions to OpenInternal; r=khuey

Browse Source
This commit is contained in:
Ms2ger 2014-06-29 17:36:03 +02:00
parent 6623cab112
commit 2e3f5e7be4
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dom/base/nsGlobalWindow.cpp
View File

@ -7547,6 +7547,8 @@ already_AddRefed<nsIDOMWindow>
nsGlobalWindow::Open(const nsAString& aUrl, const nsAString& aName,
const nsAString& aOptions, ErrorResult& aError)
{
FORWARD_TO_OUTER_OR_THROW(Open, (aUrl, aName, aOptions, aError), aError,
nullptr);
nsCOMPtr<nsIDOMWindow> window;
aError = OpenJS(aUrl, aName, aOptions, getter_AddRefs(window));
return window.forget();
@ -7556,6 +7558,8 @@ NS_IMETHODIMP
nsGlobalWindow::Open(const nsAString& aUrl, const nsAString& aName,
const nsAString& aOptions, nsIDOMWindow **_retval)
{
FORWARD_TO_OUTER(Open, (aUrl, aName, aOptions, _retval),
NS_ERROR_NOT_INITIALIZED);
return OpenInternal(aUrl, aName, aOptions,
false, // aDialog
false, // aContentModal
@ -7572,6 +7576,8 @@ NS_IMETHODIMP
nsGlobalWindow::OpenJS(const nsAString& aUrl, const nsAString& aName,
const nsAString& aOptions, nsIDOMWindow **_retval)
{
FORWARD_TO_OUTER(OpenJS, (aUrl, aName, aOptions, _retval),
NS_ERROR_NOT_INITIALIZED);
return OpenInternal(aUrl, aName, aOptions,
false, // aDialog
false, // aContentModal
@ -7591,6 +7597,8 @@ nsGlobalWindow::OpenDialog(const nsAString& aUrl, const nsAString& aName,
const nsAString& aOptions,
nsISupports* aExtraArgument, nsIDOMWindow** _retval)
{
FORWARD_TO_OUTER(OpenDialog, (aUrl, aName, aOptions, aExtraArgument, _retval),
NS_ERROR_NOT_INITIALIZED);
return OpenInternal(aUrl, aName, aOptions,
true, // aDialog
false, // aContentModal
@ -7630,6 +7638,10 @@ nsGlobalWindow::OpenDialog(JSContext* aCx, const nsAString& aUrl,
const Sequence<JS::Value>& aExtraArgument,
ErrorResult& aError)
{
FORWARD_TO_OUTER_OR_THROW(OpenDialog,
(aCx, aUrl, aName, aOptions, aExtraArgument, aError),
aError, nullptr);
nsCOMPtr<nsIJSArgArray> argvArray;
aError = NS_CreateJSArgv(aCx, aExtraArgument.Length(),
const_cast<JS::Value*>(aExtraArgument.Elements()),
@ -7656,6 +7668,9 @@ NS_IMETHODIMP
nsGlobalWindow::OpenDialog(const nsAString& aUrl, const nsAString& aName,
const nsAString& aOptions, nsIDOMWindow** _retval)
{
FORWARD_TO_OUTER(OpenDialog, (aUrl, aName, aOptions, _retval),
NS_ERROR_NOT_INITIALIZED);
if (!nsContentUtils::IsCallerChrome()) {
return NS_ERROR_DOM_SECURITY_ERR;
}
@ -11559,11 +11574,7 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName,
JSContext *aJSCallerContext,
nsIDOMWindow **aReturn)
{
FORWARD_TO_OUTER(OpenInternal, (aUrl, aName, aOptions, aDialog,
aContentModal, aCalledNoScript, aDoJSFixups,
aNavigate, argv, aExtraArgument,
aCalleePrincipal, aJSCallerContext, aReturn),
NS_ERROR_NOT_INITIALIZED);
MOZ_ASSERT(IsOuterWindow());
#ifdef DEBUG
uint32_t argc = 0;

4
dom/base/nsGlobalWindow.h
View File

@ -1142,6 +1142,7 @@ protected:
const nsAString& aOptions,
nsIDOMWindow **_retval);
private:
/**
* @param aUrl the URL we intend to load into the window. If aNavigate is
* true, we'll actually load this URL into the window. Otherwise,
@ -1185,6 +1186,8 @@ protected:
* when aCalledNoScript is true.
*
* @param aReturn [out] The window that was opened, if any.
*
* Outer windows only.
*/
nsresult OpenInternal(const nsAString& aUrl,
const nsAString& aName,
@ -1200,6 +1203,7 @@ protected:
JSContext *aJSCallerContext,
nsIDOMWindow **aReturn);
public:
// Timeout Functions
// Language agnostic timeout function (all args passed).
// |interval| is in milliseconds.