nsIPref is no longer passed around through inits on webshell, content viewers and presContext. In places where it is needed, it can be retrieved from the service manager. I removed a number of the getters and setters for prefs as the prefs will be the same from the service manager so we don't need getters. r=waterson a=rickg
This commit is contained in:
@@ -227,7 +227,6 @@ public:
|
||||
NS_IMETHOD SetContainer(nsIWebShellContainer* aContainer);
|
||||
NS_IMETHOD GetContainer(nsIWebShellContainer*& aResult);
|
||||
NS_IMETHOD GetTopLevelWindow(nsIWebShellContainer** aWebShellWindow);
|
||||
NS_IMETHOD GetPrefs(nsIPref*& aPrefs);
|
||||
NS_IMETHOD GetRootWebShell(nsIWebShell*& aResult);
|
||||
NS_IMETHOD SetParent(nsIWebShell* aParent);
|
||||
NS_IMETHOD GetParent(nsIWebShell*& aParent);
|
||||
@@ -1046,12 +1045,6 @@ nsWebShell::HandleEvent(nsGUIEvent *aEvent)
|
||||
return nsEventStatus_eIgnore;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsWebShell::GetPrefs(nsIPref*& aPrefs)
|
||||
{
|
||||
return nsDocShell::GetPrefs(&aPrefs);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsWebShell::GetRootWebShell(nsIWebShell*& aResult)
|
||||
{
|
||||
@@ -3764,16 +3757,6 @@ NS_IMETHODIMP nsWebShell::SetLoadCookie(nsISupports * aLoadCookie)
|
||||
return mContentListener->SetLoadCookie(aLoadCookie);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsWebShell::GetPrefs(nsIPref** aPrefs)
|
||||
{
|
||||
return nsDocShell::GetPrefs(aPrefs);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsWebShell::SetPrefs(nsIPref* aPrefs)
|
||||
{
|
||||
return nsDocShell::SetPrefs(aPrefs);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsWebShell::GetZoom(float* aZoom)
|
||||
{
|
||||
*aZoom = mZoom;
|
||||
|
||||
Reference in New Issue
Block a user