Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 217886 frame structure gets lost in builds since 20030826

Browse Source 
patch by mpconnor@rogers.com r=bz sr=bz a=brendan


git-svn-id: svn://10.0.0.236/trunk@146551 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2003-09-04 02:23:20 +00:00
parent b00f5f1a4e
commit 029e5074be
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -1009,7 +1009,9 @@ nsresult nsDocShell::FindTarget(const PRUnichar *aWindowTarget,
if(!treeItem)
*aResult = this;
}
else if(name.EqualsIgnoreCase("_content") || name.EqualsIgnoreCase("_main"))
// _main is an IE target which should be case-insensitive but isn't
// see bug 217886 for details
else if(name.EqualsIgnoreCase("_content") || name.Equals(NS_LITERAL_STRING("_main")))
{
if (mTreeOwner) {
mTreeOwner->FindItemWithName(name.get(), nsnull,
@@ -4978,8 +4980,10 @@ nsDocShell::InternalLoad(nsIURI * aURI,
//
if (mUseExternalProtocolHandler && aLoadType == LOAD_LINK) {
// don't do it for javascript urls!
// _main is an IE target which should be case-insensitive but isn't
// see bug 217886 for details
if (!bIsJavascript &&
(name.EqualsIgnoreCase("_content") || name.EqualsIgnoreCase("_main") ||
(name.EqualsIgnoreCase("_content") || name.Equals(NS_LITERAL_STRING("_main")) ||
name.EqualsIgnoreCase("_blank")))
{
nsCOMPtr<nsIExternalProtocolService> extProtService;
@@ -5020,10 +5024,12 @@ nsDocShell::InternalLoad(nsIURI * aURI,
name.EqualsIgnoreCase("_new")) {
name.Assign(NS_LITERAL_STRING("_top"));
}
// _main is an IE target which should be case-insensitive but isn't
// see bug 217886 for details
else if (!name.EqualsIgnoreCase("_parent") &&
!name.EqualsIgnoreCase("_self") &&
!name.EqualsIgnoreCase("_content") &&
!name.EqualsIgnoreCase("_main")) {
!name.Equals(NS_LITERAL_STRING("_main"))) {
nsCOMPtr<nsIDocShellTreeItem> targetTreeItem;
FindItemWithName(name.get(),
NS_STATIC_CAST(nsIInterfaceRequestor *, this),