Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1343298 - Remove nsHTMLScrollFrame::ReloadChildFrames() because it's redundant. r=jfkthame

Browse Source 
The scroll frame is almost always the content's primary frame and if so
it already has the correct style values and the nsFrame ctor has set
mWritingMode correctly based on those.  For the edge cases where it's
not the primary frame, e.g. <fieldset style=overflow:scroll>, the UA
sheet specifies 'inherit' for the relevant properties so it has
the correct style values in this case too.

MozReview-Commit-ID: 1FMFNfF0IqU
This commit is contained in:
Mats Palmgren 2017-03-01 18:03:14 +01:00
parent 742155bd91
commit eb04852c0f
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/generic/nsGfxScrollFrame.cpp
View File

@ -157,7 +157,7 @@ nsHTMLScrollFrame::SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList)
{
nsContainerFrame::SetInitialChildList(aListID, aChildList);
ReloadChildFrames();
mHelper.ReloadChildFrames();
}
@ -167,7 +167,7 @@ nsHTMLScrollFrame::AppendFrames(ChildListID aListID,
{
NS_ASSERTION(aListID == kPrincipalList, "Only main list supported");
mFrames.AppendFrames(nullptr, aFrameList);
ReloadChildFrames();
mHelper.ReloadChildFrames();
}
void
@ -179,7 +179,7 @@ nsHTMLScrollFrame::InsertFrames(ChildListID aListID,
NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == this,
"inserting after sibling frame with different parent");
mFrames.InsertFrames(nullptr, aPrevFrame, aFrameList);
ReloadChildFrames();
mHelper.ReloadChildFrames();
}
void
@ -188,7 +188,7 @@ nsHTMLScrollFrame::RemoveFrame(ChildListID aListID,
{
NS_ASSERTION(aListID == kPrincipalList, "Only main list supported");
mFrames.DestroyFrame(aOldFrame);
ReloadChildFrames();
mHelper.ReloadChildFrames();
}
nsSplittableType

8
layout/generic/nsGfxScrollFrame.h
View File

@ -1068,14 +1068,6 @@ protected:
*/
virtual bool ShouldPropagateComputedBSizeToScrolledContent() const { return true; }
void ReloadChildFrames()
{
mHelper.ReloadChildFrames();
if (mHelper.mScrolledFrame) {
mWritingMode = mHelper.mScrolledFrame->GetWritingMode();
}
}
private:
friend class mozilla::ScrollFrameHelper;
ScrollFrameHelper mHelper;