diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index afffb745f0e6..550f0312ce4c 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -8307,19 +8307,16 @@ nsDocShell::InternalLoad(nsIURI * aURI, bool isNewWindow = false; if (!targetDocShell) { - nsCOMPtr win = + nsCOMPtr win = do_GetInterface(GetAsSupports(this)); NS_ENSURE_TRUE(win, NS_ERROR_NOT_AVAILABLE); nsDependentString name(aWindowTarget); nsCOMPtr newWin; - nsCAutoString spec; - if (aURI) - aURI->GetSpec(spec); - rv = win->OpenNoNavigate(NS_ConvertUTF8toUTF16(spec), - name, // window name - EmptyString(), // Features - getter_AddRefs(newWin)); + rv = win->Open(EmptyString(), // URL to load + name, // window name + EmptyString(), // Features + getter_AddRefs(newWin)); // In some cases the Open call doesn't actually result in a new // window being opened. We can detect these cases by examining the diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index 6b911f8b125f..dec4ced43269 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -5866,7 +5866,6 @@ nsGlobalWindow::Open(const nsAString& aUrl, const nsAString& aName, false, // aContentModal true, // aCalledNoScript false, // aDoJSFixups - true, // aNavigate nsnull, nsnull, // No args GetPrincipal(), // aCalleePrincipal nsnull, // aJSCallerContext @@ -5882,7 +5881,6 @@ nsGlobalWindow::OpenJS(const nsAString& aUrl, const nsAString& aName, false, // aContentModal false, // aCalledNoScript true, // aDoJSFixups - true, // aNavigate nsnull, nsnull, // No args GetPrincipal(), // aCalleePrincipal nsContentUtils::GetCurrentJSContext(), // aJSCallerContext @@ -5901,33 +5899,12 @@ nsGlobalWindow::OpenDialog(const nsAString& aUrl, const nsAString& aName, false, // aContentModal true, // aCalledNoScript false, // aDoJSFixups - true, // aNavigate nsnull, aExtraArgument, // Arguments GetPrincipal(), // aCalleePrincipal nsnull, // aJSCallerContext _retval); } -// Like Open, but passes aNavigate=false. -/* virtual */ nsresult -nsGlobalWindow::OpenNoNavigate(const nsAString& aUrl, - const nsAString& aName, - const nsAString& aOptions, - nsIDOMWindow **_retval) -{ - return OpenInternal(aUrl, aName, aOptions, - false, // aDialog - false, // aContentModal - true, // aCalledNoScript - false, // aDoJSFixups - false, // aNavigate - nsnull, nsnull, // No args - GetPrincipal(), // aCalleePrincipal - nsnull, // aJSCallerContext - _retval); - -} - NS_IMETHODIMP nsGlobalWindow::OpenDialog(const nsAString& aUrl, const nsAString& aName, const nsAString& aOptions, nsIDOMWindow** _retval) @@ -5968,7 +5945,6 @@ nsGlobalWindow::OpenDialog(const nsAString& aUrl, const nsAString& aName, false, // aContentModal false, // aCalledNoScript false, // aDoJSFixups - true, // aNavigate argvArray, nsnull, // Arguments GetPrincipal(), // aCalleePrincipal cx, // aJSCallerContext @@ -7212,7 +7188,6 @@ nsGlobalWindow::ShowModalDialog(const nsAString& aURI, nsIVariant *aArgs, true, // aContentModal true, // aCalledNoScript true, // aDoJSFixups - true, // aNavigate nsnull, aArgs, // args GetPrincipal(), // aCalleePrincipal nsnull, // aJSCallerContext @@ -9131,8 +9106,7 @@ nsresult nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName, const nsAString& aOptions, bool aDialog, bool aContentModal, bool aCalledNoScript, - bool aDoJSFixups, bool aNavigate, - nsIArray *argv, + bool aDoJSFixups, nsIArray *argv, nsISupports *aExtraArgument, nsIPrincipal *aCalleePrincipal, JSContext *aJSCallerContext, @@ -9140,8 +9114,8 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName, { FORWARD_TO_OUTER(OpenInternal, (aUrl, aName, aOptions, aDialog, aContentModal, aCalledNoScript, aDoJSFixups, - aNavigate, argv, aExtraArgument, - aCalleePrincipal, aJSCallerContext, aReturn), + argv, aExtraArgument, aCalleePrincipal, + aJSCallerContext, aReturn), NS_ERROR_NOT_INITIALIZED); #ifdef DEBUG @@ -9156,9 +9130,6 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName, NS_PRECONDITION(!aJSCallerContext || !aCalledNoScript, "Shouldn't have caller context when called noscript"); - // Calls to window.open from script should navigate. - MOZ_ASSERT(aCalledNoScript || aNavigate); - *aReturn = nsnull; nsCOMPtr chrome; @@ -9186,13 +9157,10 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName, if (!aUrl.IsEmpty()) { AppendUTF16toUTF8(aUrl, url); - // It's safe to skip the security check below if we're not a dialog - // because window.openDialog is not callable from content script. See bug - // 56851. - // - // If we're not navigating, we assume that whoever *does* navigate the - // window will do a security check of their own. - if (url.get() && !aDialog && aNavigate) + /* Check whether the URI is allowed, but not for dialogs -- + see bug 56851. The security of this function depends on + window.openDialog being inaccessible from web scripts */ + if (url.get() && !aDialog) rv = SecurityCheckURL(url.get()); } @@ -9233,9 +9201,6 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName, const char *options_ptr = aOptions.IsEmpty() ? nsnull : options.get(); const char *name_ptr = aName.IsEmpty() ? nsnull : name.get(); - nsCOMPtr pwwatch(do_QueryInterface(wwatch)); - NS_ENSURE_STATE(pwwatch); - { // Reset popup state while opening a window to prevent the // current state from being active the whole time a modal @@ -9243,12 +9208,15 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName, nsAutoPopupStatePusher popupStatePusher(openAbused, true); if (!aCalledNoScript) { - // We asserted at the top of this function that aNavigate is true for - // !aCalledNoScript. - rv = pwwatch->OpenWindow2(this, url.get(), name_ptr, options_ptr, - /* aCalledFromScript = */ true, - aDialog, aNavigate, argv, - getter_AddRefs(domReturn)); + nsCOMPtr pwwatch(do_QueryInterface(wwatch)); + NS_ASSERTION(pwwatch, + "Unable to open windows from JS because window watcher " + "is broken"); + NS_ENSURE_TRUE(pwwatch, NS_ERROR_UNEXPECTED); + + rv = pwwatch->OpenWindowJS(this, url.get(), name_ptr, options_ptr, + aDialog, argv, + getter_AddRefs(domReturn)); } else { // Push a null JSContext here so that the window watcher won't screw us // up. We do NOT want this case looking at the JS context on the stack @@ -9264,11 +9232,9 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName, rv = stack->Push(nsnull); NS_ENSURE_SUCCESS(rv, rv); } - - rv = pwwatch->OpenWindow2(this, url.get(), name_ptr, options_ptr, - /* aCalledFromScript = */ false, - aDialog, aNavigate, aExtraArgument, - getter_AddRefs(domReturn)); + + rv = wwatch->OpenWindow(this, url.get(), name_ptr, options_ptr, + aExtraArgument, getter_AddRefs(domReturn)); if (stack) { JSContext* cx; diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h index 7fd6744a49ad..b9187df6db9e 100644 --- a/dom/base/nsGlobalWindow.h +++ b/dom/base/nsGlobalWindow.h @@ -674,56 +674,37 @@ protected: } // Window Control Functions - - virtual nsresult - OpenNoNavigate(const nsAString& aUrl, - const nsAString& aName, - const nsAString& aOptions, - nsIDOMWindow **_retval); - /** - * @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, - * aUrl is advisory; OpenInternal will not load the URL into the - * new window. - * + * @param aURL the URL to load in the new window * @param aName the name to use for the new window - * * @param aOptions the window options to use for the new window - * * @param aDialog true when called from variants of OpenDialog. If this is - * true, this method will skip popup blocking checks. The aDialog - * argument is passed on to the window watcher. - * + * true, this method will skip popup blocking checks. The + * aDialog argument is passed on to the window watcher. * @param aCalledNoScript true when called via the [noscript] open() - * and openDialog() methods. When this is true, we do NOT want to use - * the JS stack for things like caller determination. - * + * and openDialog() methods. When this is true, we do + * NOT want to use the JS stack for things like caller + * determination. * @param aDoJSFixups true when this is the content-accessible JS version of - * window opening. When true, popups do not cause us to throw, we save - * the caller's principal in the new window for later consumption, and - * we make sure that there is a document in the newly-opened window. - * Note that this last will only be done if the newly-opened window is - * non-chrome. - * - * @param aNavigate true if we should navigate to the provided URL, false - * otherwise. When aNavigate is false, we also skip our can-load - * security check, on the assumption that whoever *actually* loads this - * page will do their own security check. - * + * window opening. When true, popups do not cause us to + * throw, we save the caller's principal in the new window + * for later consumption, and we make sure that there is a + * document in the newly-opened window. Note that this + * last will only be done if the newly-opened window is + * non-chrome. * @param argv The arguments to pass to the new window. The first - * three args, if present, will be aUrl, aName, and aOptions. So this - * param only matters if there are more than 3 arguments. - * + * three args, if present, will be aURL, aName, and aOptions. So + * this param only matters if there are more than 3 arguments. * @param argc The number of arguments in argv. - * * @param aExtraArgument Another way to pass arguments in. This is mutually - * exclusive with the argv/argc approach. - * + * exclusive with the argv/argc approach. * @param aJSCallerContext The calling script's context. This must be nsnull - * when aCalledNoScript is true. - * + * when aCalledNoScript is true. * @param aReturn [out] The window that was opened, if any. + * + * @note that the boolean args are const because the function shouldn't be + * messing with them. That also makes it easier for the compiler to sort out + * its build warning stuff. */ NS_HIDDEN_(nsresult) OpenInternal(const nsAString& aUrl, const nsAString& aName, @@ -732,7 +713,6 @@ protected: bool aContentModal, bool aCalledNoScript, bool aDoJSFixups, - bool aNavigate, nsIArray *argv, nsISupports *aExtraArgument, nsIPrincipal *aCalleePrincipal, diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h index 2bf11a24cbb4..8c3867f0c96c 100644 --- a/dom/base/nsPIDOMWindow.h +++ b/dom/base/nsPIDOMWindow.h @@ -48,8 +48,8 @@ class nsIArray; class nsPIWindowRoot; #define NS_PIDOMWINDOW_IID \ -{0x66660102, 0xd875, 0x47e2, \ - {0xa1, 0xf7, 0x12, 0xbc, 0x83, 0xc9, 0x93, 0xa9}} +{ 0x0c4d0b84, 0xb524, 0x4572, \ + { 0x8e, 0xd1, 0x7f, 0x78, 0x14, 0x7c, 0x4d, 0xf1 } } class nsPIDOMWindow : public nsIDOMWindowInternal { @@ -602,13 +602,6 @@ public: */ virtual bool IsPartOfApp() = 0; - /** - * Like nsIDOMWindow::Open, except that we don't navigate to the given URL. - */ - virtual nsresult - OpenNoNavigate(const nsAString& aUrl, const nsAString& aName, - const nsAString& aOptions, nsIDOMWindow **_retval) = 0; - protected: // The nsPIDOMWindow constructor. The aOuterWindow argument should // be null if and only if the created window itself is an outer diff --git a/dom/browser-element/BrowserElementParent.cpp b/dom/browser-element/BrowserElementParent.cpp index c0c7776a438e..1fe9481f0598 100644 --- a/dom/browser-element/BrowserElementParent.cpp +++ b/dom/browser-element/BrowserElementParent.cpp @@ -193,9 +193,7 @@ BrowserElementParent::OpenWindowInProcess(nsIDOMWindow* aOpenerWindow, NS_ENSURE_TRUE(popupFrameElement, false); nsCAutoString spec; - if (aURI) { - aURI->GetSpec(spec); - } + aURI->GetSpec(spec); bool dispatchSucceeded = DispatchOpenWindowEvent(openerFrameElement, popupFrameElement, NS_ConvertUTF8toUTF16(spec), diff --git a/dom/browser-element/BrowserElementParent.h b/dom/browser-element/BrowserElementParent.h index e2643b2b3f43..cec8ffe785ca 100644 --- a/dom/browser-element/BrowserElementParent.h +++ b/dom/browser-element/BrowserElementParent.h @@ -53,8 +53,6 @@ public: * set aPopupTabParent's frame element to event.detail.frameElement. * Otherwise, we return false. * - * @param aURL the absolute URL the new window should load. The empty string - * is allowed indicates we shouldn't load anything. * @param aOpenerTabParent the TabParent whose TabChild called window.open. * @param aPopupTabParent the TabParent inside which the opened window will * live. @@ -77,9 +75,6 @@ public: * * (These parameter types are silly, but they match what our caller has in * hand. Feel free to add an override, if they are inconvenient to you.) - * - * @param aURI the URI the new window should load. May be null, which - * indicates that we shouldn't load anything. */ static bool OpenWindowInProcess(nsIDOMWindow* aOpenerWindow, diff --git a/dom/browser-element/mochitest/Makefile.in b/dom/browser-element/mochitest/Makefile.in index 941f4fc51d20..470d66138dfd 100644 --- a/dom/browser-element/mochitest/Makefile.in +++ b/dom/browser-element/mochitest/Makefile.in @@ -63,9 +63,6 @@ MOCHITEST_FILES = \ test_browserElement_inproc_AlertInFrame.html \ file_browserElement_AlertInFrame.html \ file_browserElement_AlertInFrame_Inner.html \ - browserElement_TargetBlank.js \ - test_browserElement_inproc_TargetBlank.html \ - file_browserElement_TargetBlank.html \ browserElement_TargetTop.js \ test_browserElement_inproc_TargetTop.html \ file_browserElement_TargetTop.html \ @@ -133,7 +130,6 @@ MOCHITEST_FILES += \ test_browserElement_oop_XFrameOptionsSameOrigin.html \ test_browserElement_oop_Alert.html \ test_browserElement_oop_AlertInFrame.html \ - test_browserElement_oop_TargetBlank.html \ test_browserElement_oop_TargetTop.html \ test_browserElement_oop_PromptCheck.html \ test_browserElement_oop_PromptConfirm.html \ diff --git a/dom/browser-element/mochitest/browserElement_TargetBlank.js b/dom/browser-element/mochitest/browserElement_TargetBlank.js deleted file mode 100644 index ebeaea30c0cd..000000000000 --- a/dom/browser-element/mochitest/browserElement_TargetBlank.js +++ /dev/null @@ -1,26 +0,0 @@ -/* Any copyright is dedicated to the public domain. - http://creativecommons.org/publicdomain/zero/1.0/ */ - -// Bug 764718 - Test that clicking a link with _target=blank works. - -"use strict"; - -SimpleTest.waitForExplicitFinish(); - -function runTest() { - browserElementTestHelpers.setEnabledPref(true); - browserElementTestHelpers.addToWhitelist(); - - var iframe = document.createElement('iframe'); - iframe.mozbrowser = true; - - iframe.addEventListener('mozbrowseropenwindow', function(e) { - is(e.detail.url, 'http://example.com/'); - SimpleTest.finish(); - }); - - iframe.src = "file_browserElement_TargetBlank.html"; - document.body.appendChild(iframe); -} - -runTest(); diff --git a/dom/browser-element/mochitest/file_browserElement_TargetBlank.html b/dom/browser-element/mochitest/file_browserElement_TargetBlank.html deleted file mode 100644 index e254e32b2f78..000000000000 --- a/dom/browser-element/mochitest/file_browserElement_TargetBlank.html +++ /dev/null @@ -1,18 +0,0 @@ - - -Click me - - - - - diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_TargetBlank.html b/dom/browser-element/mochitest/test_browserElement_inproc_TargetBlank.html deleted file mode 100644 index 916ed312b722..000000000000 --- a/dom/browser-element/mochitest/test_browserElement_inproc_TargetBlank.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Test for mozbrowser - - - - - - - - diff --git a/dom/browser-element/mochitest/test_browserElement_oop_TargetBlank.html b/dom/browser-element/mochitest/test_browserElement_oop_TargetBlank.html deleted file mode 100644 index 916ed312b722..000000000000 --- a/dom/browser-element/mochitest/test_browserElement_oop_TargetBlank.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Test for mozbrowser - - - - - - - - diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 3758ab4ef7ba..eaf84ecb63d7 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -385,9 +385,7 @@ TabChild::BrowserFrameProvideWindow(nsIDOMWindow* aOpener, /* aChromeFlags = */ 0, mIsBrowserElement, mAppId)); nsCAutoString spec; - if (aURI) { - aURI->GetSpec(spec); - } + aURI->GetSpec(spec); NS_ConvertUTF8toUTF16 url(spec); nsString name(aName); diff --git a/embedding/base/nsIWindowProvider.idl b/embedding/base/nsIWindowProvider.idl index 49ef9b6b6060..b09d47bd1b1e 100644 --- a/embedding/base/nsIWindowProvider.idl +++ b/embedding/base/nsIWindowProvider.idl @@ -34,51 +34,44 @@ interface nsIWindowProvider : nsISupports * to have the caller create a brand-new window. * * @param aParent Must not be null. This is the window that the caller wants - * to use as the parent for the new window. Generally, - * nsIWindowProvider implementors can expect to be somehow related to - * aParent; the relationship may depend on the nsIWindowProvider - * implementation. - * + * to use as the parent for the new window. Generally, + * nsIWindowProvider implementors can expect to be somehow + * related to aParent; the relationship may depend on the + * nsIWindowProvider implementation. * @param aChromeFlags The chrome flags the caller will use to create a new - * window if this provider returns null. See nsIWebBrowserChrome for - * the possible values of this field. - * + * window if this provider returns null. See + * nsIWebBrowserChrome for the possible values of this + * field. * @param aPositionSpecified Whether the attempt to create a window is trying - * to specify a position for the new window. - * + * to specify a position for the new window. * @param aSizeSpecified Whether the attempt to create a window is trying to - * specify a size for the new window. - * - * @param aURI The URI to be loaded in the new window (may be NULL). The - * nsIWindowProvider implementation must not load this URI into the - * window it returns. This URI is provided solely to help the - * nsIWindowProvider implementation make decisions; the caller will - * handle loading the URI in the window returned if provideWindow - * returns a window. - * - * When making decisions based on aURI, note that even when it's not - * null, aURI may not represent all relevant information about the - * load. For example, the load may have extra load flags, POST data, - * etc. - * + * specify a size for the new window. + * @param aURI The URI to be loaded in the new window. The nsIWindowProvider + * implementation MUST NOT load this URI in the window it + * returns. This URI is provided solely to help the + * nsIWindowProvider implementation make decisions; the caller + * will handle loading the URI in the window returned if + * provideWindow returns a window. Note that the URI may be null + * if the load cannot be represented by a single URI (e.g. if + * the load has extra load flags, POST data, etc). * @param aName The name of the window being opened. Setting the name on the - * return value of provideWindow will be handled by the caller; aName - * is provided solely to help the nsIWindowProvider implementation - * make decisions. - * + * return value of provideWindow will be handled by the caller; + * aName is provided solely to help the nsIWindowProvider + * implementation make decisions. * @param aFeatures The feature string for the window being opened. This may - * be empty. The nsIWindowProvider implementation is allowed to apply - * the feature string to the window it returns in any way it sees fit. - * See the nsIWindowWatcher interface for details on feature strings. - * + * be empty. The nsIWindowProvider implementation is + * allowed to apply the feature string to the window it + * returns in any way it sees fit. See the nsIWindowWatcher + * interface for details on feature strings. * @param aWindowIsNew [out] Whether the window being returned was just - * created by the window provider implementation. This can be used by - * callers to keep track of which windows were opened by the user as - * opposed to being opened programmatically. This should be set to - * false if the window being returned existed before the - * provideWindow() call. The value of this out parameter is - * meaningless if provideWindow() returns null. - + * created by the window provider implementation. + * This can be used by callers to keep track of which + * windows were opened by the user as opposed to + * being opened programmatically. This should be set + * to false if the window being returned existed + * before the provideWindow() call. The value of this + * out parameter is meaningless if provideWindow() + * returns null. * @return A window the caller should use or null if the caller should just * create a new window. The returned window may be newly opened by * the nsIWindowProvider implementation or may be a window that diff --git a/embedding/components/windowwatcher/public/nsPIWindowWatcher.idl b/embedding/components/windowwatcher/public/nsPIWindowWatcher.idl index 7581595c17c9..10d2696c461d 100644 --- a/embedding/components/windowwatcher/public/nsPIWindowWatcher.idl +++ b/embedding/components/windowwatcher/public/nsPIWindowWatcher.idl @@ -16,7 +16,7 @@ interface nsIWebBrowserChrome; interface nsIDocShellTreeItem; interface nsIArray; -[uuid(00788A84-152F-4BD8-A814-FD8EB545DB29)] +[uuid(8624594a-28d7-4bc3-8d12-b1c2b9eefd90)] interface nsPIWindowWatcher : nsISupports { @@ -35,9 +35,8 @@ interface nsPIWindowWatcher : nsISupports */ void removeWindow(in nsIDOMWindow aWindow); - /** Like the public interface's open(), but can handle openDialog-style - arguments and calls which shouldn't result in us navigating the window. - + /** Like the public interface's open(), but can deal with openDialog + style arguments. @param aParent parent window, if any. Null if no parent. If it is impossible to get to an nsIWebBrowserChrome from aParent, this method will effectively act as if aParent were null. @@ -47,10 +46,7 @@ interface nsPIWindowWatcher : nsISupports with this name already exists, the openWindow call may just load aUrl in it (if aUrl is not null) and return it. @param aFeatures window features from JS window.open. can be null. - @param aCalledFromScript true if we were called from script. @param aDialog use dialog defaults (see nsIDOMWindow::openDialog) - @param aNavigate true if we should navigate the new window to the - specified URL. @param aArgs Window argument @return the new window @@ -62,10 +58,9 @@ interface nsPIWindowWatcher : nsISupports (which is determined based on the JS stack and the value of aParent). This is not guaranteed, however. */ - nsIDOMWindow openWindow2(in nsIDOMWindow aParent, in string aUrl, - in string aName, in string aFeatures, - in boolean aCalledFromScript, in boolean aDialog, - in boolean aNavigate, in nsISupports aArgs); + nsIDOMWindow openWindowJS(in nsIDOMWindow aParent, in string aUrl, + in string aName, in string aFeatures, in boolean aDialog, + in nsIArray aArgs); /** * Find a named docshell tree item amongst all windows registered diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp index 2d48b1eeec17..83071776ad01 100644 --- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp +++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp @@ -319,64 +319,6 @@ nsWindowWatcher::Init() return NS_OK; } -/** - * Convert aArguments into either an nsIArray or NULL. - * - * - If aArguments is NULL, return NULL. - * - If aArguments is an nsArray, return NULL if it's empty, or otherwise - * return the array. - * - If aArguments is an nsISupportsArray, return NULL if it's empty, or - * otherwise add its elements to an nsArray and return the new array. - * - Otherwise, return an nsIArray with one element: aArguments. - */ -static already_AddRefed -ConvertArgsToArray(nsISupports* aArguments) -{ - if (!aArguments) { - return NULL; - } - - nsCOMPtr array = do_QueryInterface(aArguments); - if (array) { - PRUint32 argc = 0; - array->GetLength(&argc); - if (argc == 0) - return NULL; - - return array.forget(); - } - - nsCOMPtr supArray = do_QueryInterface(aArguments); - if (supArray) { - PRUint32 argc = 0; - supArray->Count(&argc); - if (argc == 0) { - return NULL; - } - - nsCOMPtr mutableArray = - do_CreateInstance(NS_ARRAY_CONTRACTID); - NS_ENSURE_TRUE(mutableArray, NULL); - - for (PRUint32 i = 0; i < argc; i++) { - nsCOMPtr elt = dont_AddRef(supArray->ElementAt(i)); - nsresult rv = mutableArray->AppendElement(elt, /* aWeak = */ false); - NS_ENSURE_SUCCESS(rv, NULL); - } - - return mutableArray.forget(); - } - - nsCOMPtr singletonArray = - do_CreateInstance(NS_ARRAY_CONTRACTID); - NS_ENSURE_TRUE(singletonArray, NULL); - - nsresult rv = singletonArray->AppendElement(aArguments, /* aWeak = */ false); - NS_ENSURE_SUCCESS(rv, NULL); - - return singletonArray.forget(); -} - NS_IMETHODIMP nsWindowWatcher::OpenWindow(nsIDOMWindow *aParent, const char *aUrl, @@ -385,17 +327,58 @@ nsWindowWatcher::OpenWindow(nsIDOMWindow *aParent, nsISupports *aArguments, nsIDOMWindow **_retval) { - nsCOMPtr argv = ConvertArgsToArray(aArguments); - + nsCOMPtr argsArray; PRUint32 argc = 0; - if (argv) { - argv->GetLength(&argc); - } - bool dialog = (argc != 0); + if (aArguments) { + // aArguments is allowed to be either an nsISupportsArray or an nsIArray + // (in which case it is treated as argv) or any other COM object (in which + // case it becomes argv[0]). + nsresult rv; - return OpenWindowInternal(aParent, aUrl, aName, aFeatures, - /* calledFromJS = */ false, dialog, - /* navigate = */ true, argv, _retval); + nsCOMPtr supArray(do_QueryInterface(aArguments)); + if (!supArray) { + nsCOMPtr array(do_QueryInterface(aArguments)); + if (!array) { + nsCOMPtr muteArray; + argsArray = muteArray = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv); + if (NS_FAILED(rv)) + return rv; + rv = muteArray->AppendElement(aArguments, false); + if (NS_FAILED(rv)) + return rv; + argc = 1; + } else { + rv = array->GetLength(&argc); + if (NS_FAILED(rv)) + return rv; + if (argc > 0) + argsArray = array; + } + } else { + // nsISupports array - copy into nsIArray... + rv = supArray->Count(&argc); + if (NS_FAILED(rv)) + return rv; + // But only create an arguments array if there's at least one element in + // the supports array. + if (argc > 0) { + nsCOMPtr muteArray; + argsArray = muteArray = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv); + if (NS_FAILED(rv)) + return rv; + for (PRUint32 i = 0; i < argc; i++) { + nsCOMPtr elt(dont_AddRef(supArray->ElementAt(i))); + rv = muteArray->AppendElement(elt, false); + if (NS_FAILED(rv)) + return rv; + } + } + } + } + + bool dialog = (argc != 0); + return OpenWindowJSInternal(aParent, aUrl, aName, aFeatures, dialog, + argsArray, false, _retval); } struct SizeSpec { @@ -440,32 +423,38 @@ struct SizeSpec { }; NS_IMETHODIMP -nsWindowWatcher::OpenWindow2(nsIDOMWindow *aParent, +nsWindowWatcher::OpenWindowJS(nsIDOMWindow *aParent, const char *aUrl, const char *aName, const char *aFeatures, - bool aCalledFromScript, bool aDialog, - bool aNavigate, - nsISupports *aArguments, + nsIArray *argv, nsIDOMWindow **_retval) { - nsCOMPtr argv = ConvertArgsToArray(aArguments); - return OpenWindowInternal(aParent, aUrl, aName, aFeatures, - aCalledFromScript, aDialog, - aNavigate, argv, _retval); + if (argv) { + PRUint32 argc; + nsresult rv = argv->GetLength(&argc); + NS_ENSURE_SUCCESS(rv, rv); + + // For compatibility with old code, no arguments implies that we shouldn't + // create an arguments object on the new window at all. + if (argc == 0) + argv = nsnull; + } + + return OpenWindowJSInternal(aParent, aUrl, aName, aFeatures, aDialog, + argv, true, _retval); } nsresult -nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent, - const char *aUrl, - const char *aName, - const char *aFeatures, - bool aCalledFromJS, - bool aDialog, - bool aNavigate, - nsIArray *argv, - nsIDOMWindow **_retval) +nsWindowWatcher::OpenWindowJSInternal(nsIDOMWindow *aParent, + const char *aUrl, + const char *aName, + const char *aFeatures, + bool aDialog, + nsIArray *argv, + bool aCalledFromJS, + nsIDOMWindow **_retval) { nsresult rv = NS_OK; bool nameSpecified, @@ -875,7 +864,7 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent, } } - if (uriToLoad && aNavigate) { // get the script principal and pass it to docshell + if (uriToLoad) { // get the script principal and pass it to docshell JSContextAutoPopper contextGuard; cx = GetJSContextFromCallStack(); diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.h b/embedding/components/windowwatcher/src/nsWindowWatcher.h index 8e5d7da279ef..e2b6712b0da0 100644 --- a/embedding/components/windowwatcher/src/nsWindowWatcher.h +++ b/embedding/components/windowwatcher/src/nsWindowWatcher.h @@ -72,15 +72,14 @@ protected: // Just like OpenWindowJS, but knows whether it got called via OpenWindowJS // (which means called from script) or called via OpenWindow. - nsresult OpenWindowInternal(nsIDOMWindow *aParent, - const char *aUrl, - const char *aName, - const char *aFeatures, - bool aCalledFromJS, - bool aDialog, - bool aNavigate, - nsIArray *argv, - nsIDOMWindow **_retval); + nsresult OpenWindowJSInternal(nsIDOMWindow *aParent, + const char *aUrl, + const char *aName, + const char *aFeatures, + bool aDialog, + nsIArray *argv, + bool aCalledFromJS, + nsIDOMWindow **_retval); static JSContext *GetJSContextFromWindow(nsIDOMWindow *aWindow); static JSContext *GetJSContextFromCallStack(); diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js index d4ba688fec86..28e283e2937e 100644 --- a/toolkit/components/prompts/src/nsPrompter.js +++ b/toolkit/components/prompts/src/nsPrompter.js @@ -373,7 +373,7 @@ function openModalWindow(domWin, uri, args) { // domWin may still be null here if there are _no_ windows open. // Note that we don't need to fire DOMWillOpenModalDialog and - // DOMModalDialogClosed events here, wwatcher's OpenWindowInternal + // DOMModalDialogClosed events here, wwatcher's OpenWindowJSInternal // will do that. Similarly for enterModalState / leaveModalState. Services.ww.openWindow(domWin, uri, "_blank", "centerscreen,chrome,modal,titlebar", args); @@ -413,7 +413,7 @@ function openTabPrompt(domWin, tabPrompt, args) { newPrompt = tabPrompt.appendPrompt(args, onPromptClose); // TODO since we don't actually open a window, need to check if - // there's other stuff in nsWindowWatcher::OpenWindowInternal + // there's other stuff in nsWindowWatcher::OpenWindowJSInternal // that we might need to do here as well. let thread = Services.tm.currentThread;