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

mPrefs were shadowing the ones in docShell. This fixes the bug where prefs weren't being found in presContext because the contentViewer is now being created in docShell which had a different set of prefs. r=beard a=rickg.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@61948 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
tbogard%aol.net
2000-03-01 03:22:14 +00:00
parent 5a18d87dc9
commit 827e7d599b
2 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,7 +388,6 @@ protected:
nsIWebShellContainer* mContainer;
nsIDeviceContext* mDeviceContext;
nsIPref* mPrefs;
nsIWidget* mWindow;
nsIDocumentLoader* mDocLoader;
@@ -627,7 +626,6 @@ nsWebShell::~nsWebShell()
NS_IF_RELEASE(mThreadEventQueue);
mContentViewer=nsnull;
NS_IF_RELEASE(mDeviceContext);
NS_IF_RELEASE(mPrefs);
NS_IF_RELEASE(mContainer);
if (mScriptGlobal) {
@@ -1051,9 +1049,7 @@ nsWebShell::HandleEvent(nsGUIEvent *aEvent)
NS_IMETHODIMP
nsWebShell::GetPrefs(nsIPref*& aPrefs)
{
aPrefs = mPrefs;
NS_IF_ADDREF(aPrefs);
return NS_OK;
return nsDocShell::GetPrefs(&aPrefs);
}
NS_IMETHODIMP
@@ -3782,19 +3778,12 @@ NS_IMETHODIMP nsWebShell::SetLoadCookie(nsISupports * aLoadCookie)
NS_IMETHODIMP nsWebShell::GetPrefs(nsIPref** aPrefs)
{
NS_ENSURE_ARG_POINTER(aPrefs);
*aPrefs = mPrefs;
NS_IF_ADDREF(*aPrefs);
return NS_OK;
return nsDocShell::GetPrefs(aPrefs);
}
NS_IMETHODIMP nsWebShell::SetPrefs(nsIPref* aPrefs)
{
NS_IF_RELEASE(mPrefs);
mPrefs = aPrefs;
NS_IF_ADDREF(mPrefs);
return NS_OK;
return nsDocShell::SetPrefs(aPrefs);
}
NS_IMETHODIMP nsWebShell::GetZoom(float* aZoom)