Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 346851 (LOAD_FLAGS_NEW_WINDOW naming doesn't make much sense) Changed variable name and updated comment. r=cbiesinger, sr=bzbarsky

Browse Source
This commit is contained in:
marria%gmail.com 2006-08-06 18:17:29 +00:00
parent c694e35e99
commit 18980be0d7
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docshell/base/nsDocShell.cpp
View File

@ -841,8 +841,8 @@ nsDocShell::LoadURI(nsIURI * aURI,
if (aLoadFlags & LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP)
flags |= INTERNAL_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
if (aLoadFlags & LOAD_FLAGS_NEW_WINDOW)
flags |= INTERNAL_LOAD_FLAGS_NEW_WINDOW;
if (aLoadFlags & LOAD_FLAGS_FIRST_LOAD)
flags |= INTERNAL_LOAD_FLAGS_FIRST_LOAD;
rv = InternalLoad(aURI,
referrer,
@ -6360,7 +6360,7 @@ nsDocShell::InternalLoad(nsIURI * aURI,
// some other, already open window.
if (win != newWin) {
isNewWindow = PR_TRUE;
aFlags |= INTERNAL_LOAD_FLAGS_NEW_WINDOW;
aFlags |= INTERNAL_LOAD_FLAGS_FIRST_LOAD;
}
nsCOMPtr<nsIWebNavigation> webNav = do_GetInterface(newWin);
@ -6703,7 +6703,7 @@ nsDocShell::InternalLoad(nsIURI * aURI,
!(aFlags & INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER),
owner, aTypeHint, aPostData, aHeadersData, aFirstParty,
aDocShell, getter_AddRefs(req),
(aFlags & INTERNAL_LOAD_FLAGS_NEW_WINDOW) != 0);
(aFlags & INTERNAL_LOAD_FLAGS_FIRST_LOAD) != 0);
if (req && aRequest)
NS_ADDREF(*aRequest = req);

5
docshell/base/nsIDocShell.idl
View File

@ -122,8 +122,9 @@ interface nsIDocShell : nsISupports
const long INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 0x2;
const long INTERNAL_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP = 0x4;
// This flag marks the first load in a new window.
const long INTERNAL_LOAD_FLAGS_NEW_WINDOW = 0x8;
// This flag marks the first load in this object
// @see nsIWebNavigation::LOAD_FLAGS_FIRST_LOAD
const long INTERNAL_LOAD_FLAGS_FIRST_LOAD = 0x8;
/**
* Loads the given URI. This method is identical to loadURI(...) except

7
docshell/base/nsIWebNavigation.idl
View File

@ -184,9 +184,12 @@ interface nsIWebNavigation : nsISupports
const unsigned long LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP = 0x2000;
/**
* This flag specifies that this load is the first load in a new window.
* This flag specifies that this is the first load in this object.
* Set with care, since setting incorrectly can cause us to assume that
* nothing was actually loaded in this object if the load ends up being
* handled by an external application.
*/
const unsigned long LOAD_FLAGS_NEW_WINDOW = 0x4000;
const unsigned long LOAD_FLAGS_FIRST_LOAD = 0x4000;
/**
* Loads a given URI. This will give priority to loading the requested URI

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

@ -842,7 +842,7 @@ nsWindowWatcher::OpenWindowJSInternal(nsIDOMWindow *aParent,
}
newDocShell->LoadURI(uriToLoad, loadInfo,
windowIsNew ? nsIWebNavigation::LOAD_FLAGS_NEW_WINDOW :
windowIsNew ? nsIWebNavigation::LOAD_FLAGS_FIRST_LOAD :
nsIWebNavigation::LOAD_FLAGS_NONE, PR_TRUE);
}