Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-02 03:49:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up un-needed string copying. r=jag sr=hyatt b=106108

Browse Source
This commit is contained in:
dbaron%fas.harvard.edu 2001-10-31 02:46:21 +00:00
parent fb838280d6
commit 29077ba289
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xpfe/appshell/src/nsXULWindow.cpp
View File

@ -1168,7 +1168,7 @@ NS_IMETHODIMP nsXULWindow::ContentShellAdded(nsIDocShellTreeItem* aContentShell,
PRBool aPrimary, const PRUnichar* aID)
{
nsContentShellInfo* shellInfo = nsnull;
nsAutoString newID(aID);
nsDependentString newID(aID);
PRBool resetTreeOwner = PR_FALSE;
@ -1179,7 +1179,6 @@ NS_IMETHODIMP nsXULWindow::ContentShellAdded(nsIDocShellTreeItem* aContentShell,
PRInt32 i;
for (i = 0; i < count; i++) {
nsContentShellInfo* info = (nsContentShellInfo*)mContentShells.ElementAt(i);
nsAutoString srcID(info->id);
if (info->child == aContentShell) {
info->child = nsnull;
resetTreeOwner = PR_TRUE;
@ -1189,9 +1188,8 @@ NS_IMETHODIMP nsXULWindow::ContentShellAdded(nsIDocShellTreeItem* aContentShell,
// Now find the appropriate entry and put ourselves in as the content shell.
for (i = 0; i < count; i++) {
nsContentShellInfo* info = (nsContentShellInfo*)mContentShells.ElementAt(i);
nsAutoString srcID(info->id);
if (info->primary == aPrimary && srcID.Equals(newID)) {
if (info->primary == aPrimary && info->id.Equals(newID)) {
// We already exist. Do a replace.
info->child = aContentShell;
shellInfo = info;
@ -1200,7 +1198,7 @@ NS_IMETHODIMP nsXULWindow::ContentShellAdded(nsIDocShellTreeItem* aContentShell,
}
if (!shellInfo) {
shellInfo = new nsContentShellInfo(nsAutoString(aID), aPrimary, aContentShell);
shellInfo = new nsContentShellInfo(newID, aPrimary, aContentShell);
mContentShells.AppendElement((void*)shellInfo);
}
@ -1596,8 +1594,12 @@ void nsXULWindow::SetContentScrollbarVisibility(PRBool aVisible) {
//*** nsContentShellInfo: Object Management
//*****************************************************************************
nsContentShellInfo::nsContentShellInfo(const nsString& aID, PRBool aPrimary,
nsIDocShellTreeItem* aContentShell) : id(aID), primary(aPrimary), child(aContentShell)
nsContentShellInfo::nsContentShellInfo(const nsAString& aID,
PRBool aPrimary,
nsIDocShellTreeItem* aContentShell)
: id(aID),
primary(aPrimary),
child(aContentShell)
{
}

4
xpfe/appshell/src/nsXULWindow.h
View File

@ -130,7 +130,9 @@ protected:
class nsContentShellInfo
{
public:
nsContentShellInfo(const nsString& aID, PRBool aPrimary, nsIDocShellTreeItem* aContentShell);
nsContentShellInfo(const nsAString& aID,
PRBool aPrimary,
nsIDocShellTreeItem* aContentShell);
~nsContentShellInfo();
public: