From e14b01c876e50cc0e333a3bc32347ad1c0421637 Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Fri, 2 Jul 1999 08:05:52 +0000 Subject: [PATCH] Fix for a bug that doesn't seem to be assigned to me any more. git-svn-id: svn://10.0.0.236/trunk@38023 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 8 +++----- mozilla/webshell/src/nsWebShell.cpp | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 314fc15552f..29d894051dd 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -2458,13 +2458,11 @@ nsWebShell::GetTarget(const PRUnichar* aName) NS_ADDREF(target); } else if (name.EqualsIgnoreCase("_parent")) { - if (nsnull == mParent) { + GetParent(target); + if (target == nsnull) { target = this; + NS_ADDREF(target); } - else { - target = mParent; - } - NS_ADDREF(target); } else if (name.EqualsIgnoreCase("_top")) { GetRootWebShell(target); // this addrefs, which is OK diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 314fc15552f..29d894051dd 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -2458,13 +2458,11 @@ nsWebShell::GetTarget(const PRUnichar* aName) NS_ADDREF(target); } else if (name.EqualsIgnoreCase("_parent")) { - if (nsnull == mParent) { + GetParent(target); + if (target == nsnull) { target = this; + NS_ADDREF(target); } - else { - target = mParent; - } - NS_ADDREF(target); } else if (name.EqualsIgnoreCase("_top")) { GetRootWebShell(target); // this addrefs, which is OK