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

Bug 1347411 part 4. Change the various anonymous boxes associated with framesets to be non-inheriting, since their styles aren't really used for anything. r=heycam

Browse Source 
MozReview-Commit-ID: 1R3cLokbPwL
This commit is contained in:
Boris Zbarsky
2017-03-15 14:00:43 -04:00
parent ffbc5b982b
commit 5b1efd9211
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
layout/generic/nsFrameSetFrame.cpp
View File

@@ -335,8 +335,7 @@ nsHTMLFramesetFrame::Init(nsIContent* aContent,
for (int blankX = mChildCount; blankX < numCells; blankX++) {
RefPtr<nsStyleContext> pseudoStyleContext;
pseudoStyleContext = shell->StyleSet()->
ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::framesetBlank,
mStyleContext);
ResolveNonInheritingAnonymousBoxStyle(nsCSSAnonBoxes::framesetBlank);
// XXX the blank frame is using the content of its parent - at some point it
// should just have null content, if we support that
@@ -912,8 +911,7 @@ nsHTMLFramesetFrame::Reflow(nsPresContext* aPresContext,
RefPtr<nsStyleContext> pseudoStyleContext;
pseudoStyleContext = styleSet->
ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::horizontalFramesetBorder,
mStyleContext);
ResolveNonInheritingAnonymousBoxStyle(nsCSSAnonBoxes::horizontalFramesetBorder);
borderFrame = new (shell) nsHTMLFramesetBorderFrame(pseudoStyleContext,
borderWidth,
@@ -942,8 +940,7 @@ nsHTMLFramesetFrame::Reflow(nsPresContext* aPresContext,
RefPtr<nsStyleContext> pseudoStyleContext;
pseudoStyleContext = styleSet->
ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::verticalFramesetBorder,
mStyleContext);
ResolveNonInheritingAnonymousBoxStyle(nsCSSAnonBoxes::verticalFramesetBorder);
borderFrame = new (shell) nsHTMLFramesetBorderFrame(pseudoStyleContext,
borderWidth,

6
layout/style/nsCSSAnonBoxList.h
View File

@@ -48,8 +48,8 @@ CSS_ANON_BOX(mozMathMLAnonymousBlock, ":-moz-mathml-anonymous-block")
CSS_ANON_BOX(mozXULAnonymousBlock, ":-moz-xul-anonymous-block")
// Framesets
CSS_ANON_BOX(horizontalFramesetBorder, ":-moz-hframeset-border")
CSS_ANON_BOX(verticalFramesetBorder, ":-moz-vframeset-border")
CSS_NON_INHERITING_ANON_BOX(horizontalFramesetBorder, ":-moz-hframeset-border")
CSS_NON_INHERITING_ANON_BOX(verticalFramesetBorder, ":-moz-vframeset-border")
CSS_ANON_BOX(mozLineFrame, ":-moz-line-frame")
@@ -57,7 +57,7 @@ CSS_ANON_BOX(buttonContent, ":-moz-button-content")
CSS_ANON_BOX(cellContent, ":-moz-cell-content")
CSS_ANON_BOX(dropDownList, ":-moz-dropdown-list")
CSS_ANON_BOX(fieldsetContent, ":-moz-fieldset-content")
CSS_ANON_BOX(framesetBlank, ":-moz-frameset-blank")
CSS_NON_INHERITING_ANON_BOX(framesetBlank, ":-moz-frameset-blank")
CSS_ANON_BOX(mozDisplayComboboxControlFrame, ":-moz-display-comboboxcontrol-frame")
CSS_ANON_BOX(htmlCanvasContent, ":-moz-html-canvas-content")