wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 769254 - Part 3: Rename nsWindowWatcher::OpenWindowJSInternal --> OpenWindowInternal. r=bz

Browse Source 
--HG--
extra : rebase_source : d3a335a33711dc235a401287379c8d35e245a4ba
This commit is contained in:
Justin Lebar 2012-07-23 10:44:13 -04:00
parent 156f22d018
commit fbafcfad6f
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
embedding/components/windowwatcher/src/nsWindowWatcher.cpp
View File

@ -393,9 +393,9 @@ nsWindowWatcher::OpenWindow(nsIDOMWindow *aParent,
}
bool dialog = (argc != 0);
return OpenWindowJSInternal(aParent, aUrl, aName, aFeatures,
/* calledFromJS = */ false, dialog,
/* navigate = */ true, argv, _retval);
return OpenWindowInternal(aParent, aUrl, aName, aFeatures,
/* calledFromJS = */ false, dialog,
/* navigate = */ true, argv, _retval);
}
struct SizeSpec {
@ -451,21 +451,21 @@ nsWindowWatcher::OpenWindow2(nsIDOMWindow *aParent,
nsIDOMWindow **_retval)
{
nsCOMPtr<nsIArray> argv = ConvertArgsToArray(aArguments);
return OpenWindowJSInternal(aParent, aUrl, aName, aFeatures,
aCalledFromScript, aDialog,
aNavigate, argv, _retval);
return OpenWindowInternal(aParent, aUrl, aName, aFeatures,
aCalledFromScript, aDialog,
aNavigate, argv, _retval);
}
nsresult
nsWindowWatcher::OpenWindowJSInternal(nsIDOMWindow *aParent,
const char *aUrl,
const char *aName,
const char *aFeatures,
bool aCalledFromJS,
bool aDialog,
bool aNavigate,
nsIArray *argv,
nsIDOMWindow **_retval)
nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
const char *aUrl,
const char *aName,
const char *aFeatures,
bool aCalledFromJS,
bool aDialog,
bool aNavigate,
nsIArray *argv,
nsIDOMWindow **_retval)
{
nsresult rv = NS_OK;
bool nameSpecified,

18
embedding/components/windowwatcher/src/nsWindowWatcher.h
View File

@ -72,15 +72,15 @@ protected:
// Just like OpenWindowJS, but knows whether it got called via OpenWindowJS
// (which means called from script) or called via OpenWindow.
nsresult OpenWindowJSInternal(nsIDOMWindow *aParent,
const char *aUrl,
const char *aName,
const char *aFeatures,
bool aCalledFromJS,
bool aDialog,
bool aNavigate,
nsIArray *argv,
nsIDOMWindow **_retval);
nsresult OpenWindowInternal(nsIDOMWindow *aParent,
const char *aUrl,
const char *aName,
const char *aFeatures,
bool aCalledFromJS,
bool aDialog,
bool aNavigate,
nsIArray *argv,
nsIDOMWindow **_retval);
static JSContext *GetJSContextFromWindow(nsIDOMWindow *aWindow);
static JSContext *GetJSContextFromCallStack();

4
toolkit/components/prompts/src/nsPrompter.js
View File

@ -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 OpenWindowJSInternal
// DOMModalDialogClosed events here, wwatcher's OpenWindowInternal
// 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::OpenWindowJSInternal
// there's other stuff in nsWindowWatcher::OpenWindowInternal
// that we might need to do here as well.
let thread = Services.tm.currentThread;