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

chrome event stuff

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@48457 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hyatt%netscape.com 1999-09-21 01:02:29 +00:00
parent dd7cec52c5
commit bd258f4733
3 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/docshell/base/nsWebShell.cpp
View File

@ -202,8 +202,8 @@ public:
NS_IMETHOD SetWebShellType(nsWebShellType aWebShellType);
NS_IMETHOD GetWebShellType(nsWebShellType& aWebShellType);
NS_IMETHOD GetContainingChromeShell(nsIWebShell** aResult);
NS_IMETHOD SetContainingChromeShell(nsIWebShell* aChromeShell);
NS_IMETHOD GetContainingChromeElement(nsIContent** aResult);
NS_IMETHOD SetContainingChromeElement(nsIContent* aChromeElement);
NS_IMETHOD GetMarginWidth (PRInt32& aWidth);
NS_IMETHOD SetMarginWidth (PRInt32 aWidth);
@ -447,7 +447,8 @@ protected:
nsVoidArray mRefreshments;
nsWebShellType mWebShellType;
nsIWebShell* mChromeShell; // Weak reference.
nsIContent* mChromeElement; // Weak reference.
nsISupports* mHistoryState; // Weak reference. Session history owns this.
void ReleaseChildren();
@ -612,7 +613,7 @@ nsWebShell::nsWebShell()
InitFrameData(PR_TRUE);
mIsFrame = PR_FALSE;
mWebShellType = nsWebShellContent;
mChromeShell = nsnull;
mChromeElement = nsnull;
mSHist = nsnull;
mIsInSHist = PR_FALSE;
mFailedToLoadHistoryService = PR_FALSE;
@ -1722,18 +1723,18 @@ nsWebShell::SetWebShellType(nsWebShellType aWebShellType)
}
NS_IMETHODIMP
nsWebShell::GetContainingChromeShell(nsIWebShell** aResult)
nsWebShell::GetContainingChromeElement(nsIContent** aResult)
{
NS_IF_ADDREF(mChromeShell);
*aResult = mChromeShell;
NS_IF_ADDREF(mChromeElement);
*aResult = mChromeElement;
return NS_OK;
}
NS_IMETHODIMP
nsWebShell::SetContainingChromeShell(nsIWebShell* aChromeShell)
nsWebShell::SetContainingChromeElement(nsIContent* aChromeElement)
{
// Weak reference. Don't addref.
mChromeShell = aChromeShell;
mChromeElement = aChromeElement;
return NS_OK;
}
@ -1960,7 +1961,6 @@ nsWebShell::DoLoadURL(nsIURI * aUri,
nsLoadFlags aType,
const PRUint32 aLocalIP,
const PRUnichar* aReferrer)
{
if (!aUri)
return NS_ERROR_NULL_POINTER;
@ -3710,11 +3710,10 @@ nsresult nsWebShell::CheckForTrailingSlash(nsIURI* aURL)
// Replace the top most history entry with the new url
mSHist->SetURLForIndex(curIndex, newURL->GetUnicode());
}
if (newURL) delete newURL;
if (historyURL) delete historyURL;
return NS_OK;
}

4
mozilla/webshell/public/nsIWebShell.h
View File

@ -321,12 +321,12 @@ public:
/**
* Get the nearest enclosing chrome shell.
*/
NS_IMETHOD GetContainingChromeShell(nsIWebShell** aResult) = 0;
NS_IMETHOD GetContainingChromeElement(nsIContent** aResult) = 0;
/**
* Set the nearest enclosing chrome shell.
*/
NS_IMETHOD SetContainingChromeShell(nsIWebShell* aChromeShell) = 0;
NS_IMETHOD SetContainingChromeElement(nsIContent* aChromeElement) = 0;
//
// Document load api's

23
mozilla/webshell/src/nsWebShell.cpp
View File

@ -202,8 +202,8 @@ public:
NS_IMETHOD SetWebShellType(nsWebShellType aWebShellType);
NS_IMETHOD GetWebShellType(nsWebShellType& aWebShellType);
NS_IMETHOD GetContainingChromeShell(nsIWebShell** aResult);
NS_IMETHOD SetContainingChromeShell(nsIWebShell* aChromeShell);
NS_IMETHOD GetContainingChromeElement(nsIContent** aResult);
NS_IMETHOD SetContainingChromeElement(nsIContent* aChromeElement);
NS_IMETHOD GetMarginWidth (PRInt32& aWidth);
NS_IMETHOD SetMarginWidth (PRInt32 aWidth);
@ -447,7 +447,8 @@ protected:
nsVoidArray mRefreshments;
nsWebShellType mWebShellType;
nsIWebShell* mChromeShell; // Weak reference.
nsIContent* mChromeElement; // Weak reference.
nsISupports* mHistoryState; // Weak reference. Session history owns this.
void ReleaseChildren();
@ -612,7 +613,7 @@ nsWebShell::nsWebShell()
InitFrameData(PR_TRUE);
mIsFrame = PR_FALSE;
mWebShellType = nsWebShellContent;
mChromeShell = nsnull;
mChromeElement = nsnull;
mSHist = nsnull;
mIsInSHist = PR_FALSE;
mFailedToLoadHistoryService = PR_FALSE;
@ -1722,18 +1723,18 @@ nsWebShell::SetWebShellType(nsWebShellType aWebShellType)
}
NS_IMETHODIMP
nsWebShell::GetContainingChromeShell(nsIWebShell** aResult)
nsWebShell::GetContainingChromeElement(nsIContent** aResult)
{
NS_IF_ADDREF(mChromeShell);
*aResult = mChromeShell;
NS_IF_ADDREF(mChromeElement);
*aResult = mChromeElement;
return NS_OK;
}
NS_IMETHODIMP
nsWebShell::SetContainingChromeShell(nsIWebShell* aChromeShell)
nsWebShell::SetContainingChromeElement(nsIContent* aChromeElement)
{
// Weak reference. Don't addref.
mChromeShell = aChromeShell;
mChromeElement = aChromeElement;
return NS_OK;
}
@ -1960,7 +1961,6 @@ nsWebShell::DoLoadURL(nsIURI * aUri,
nsLoadFlags aType,
const PRUint32 aLocalIP,
const PRUnichar* aReferrer)
{
if (!aUri)
return NS_ERROR_NULL_POINTER;
@ -3710,11 +3710,10 @@ nsresult nsWebShell::CheckForTrailingSlash(nsIURI* aURL)
// Replace the top most history entry with the new url
mSHist->SetURLForIndex(curIndex, newURL->GetUnicode());
}
if (newURL) delete newURL;
if (historyURL) delete historyURL;
return NS_OK;
}