corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1606659 - Don't pass margin and scrollbar preferences to nsFrameLoader::Show. r=mattwoodrow

Browse Source 
Instead, get them on the relevant code paths.

Differential Revision: https://phabricator.services.mozilla.com/D58534
This commit is contained in:
Emilio Cobos Álvarez
2020-01-05 22:48:40 +00:00
parent 942cc26f0d
commit 07b0dcbdab
8 changed files with 74 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
docshell/base/nsDocShell.cpp
View File

@@ -315,8 +315,7 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext,
mCharsetReloadState(eCharsetReloadInit),
mOrientationLock(hal::eScreenOrientation_None),
mParentCharsetSource(0),
mMarginWidth(-1),
mMarginHeight(-1),
mFrameMargins(-1, -1),
mItemType(aBrowsingContext->IsContent() ? typeContent : typeChrome),
mPreviousEntryIndex(-1),
mLoadedEntryIndex(-1),
@@ -1974,34 +1973,6 @@ nsDocShell::GetZoom(float* aZoom) {
NS_IMETHODIMP
nsDocShell::SetZoom(float aZoom) { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHODIMP
nsDocShell::GetMarginWidth(int32_t* aWidth) {
NS_ENSURE_ARG_POINTER(aWidth);
*aWidth = mMarginWidth;
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::SetMarginWidth(int32_t aWidth) {
mMarginWidth = aWidth;
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetMarginHeight(int32_t* aHeight) {
NS_ENSURE_ARG_POINTER(aHeight);
*aHeight = mMarginHeight;
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::SetMarginHeight(int32_t aHeight) {
mMarginHeight = aHeight;
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetBusyFlags(BusyFlags* aBusyFlags) {
NS_ENSURE_ARG_POINTER(aBusyFlags);