зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1486602 Part 1 - Remove arguments of nsBlockFrame::CreateBulletFrameForListItem() r=mats
Those arguments were added in bug 591737 to create a triangle for the summary frame, but <summary> has been re-implemented by using "list-item" since then. Now the only caller is nsBlockFrame itself, so there's no need to expose those arguments. Differential Revision: https://phabricator.services.mozilla.com/D6839 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
09f7cde01e
Коммит
1235a26fba
|
@ -7166,13 +7166,7 @@ nsBlockFrame::SetInitialChildList(ChildListID aListID,
|
|||
if (mozilla::StyleDisplay::ListItem ==
|
||||
possibleListItem->StyleDisplay()->mDisplay &&
|
||||
!GetPrevInFlow()) {
|
||||
// Resolve style for the bullet frame
|
||||
const nsStyleList* styleList = StyleList();
|
||||
CounterStyle* style = styleList->mCounterStyle;
|
||||
|
||||
CreateBulletFrameForListItem(
|
||||
style->IsBullet(),
|
||||
styleList->mListStylePosition == NS_STYLE_LIST_STYLE_POSITION_INSIDE);
|
||||
CreateBulletFrameForListItem();
|
||||
}
|
||||
} else {
|
||||
nsContainerFrame::SetInitialChildList(aListID, aChildList);
|
||||
|
@ -7180,14 +7174,15 @@ nsBlockFrame::SetInitialChildList(ChildListID aListID,
|
|||
}
|
||||
|
||||
void
|
||||
nsBlockFrame::CreateBulletFrameForListItem(bool aCreateBulletList,
|
||||
bool aListStylePositionInside)
|
||||
nsBlockFrame::CreateBulletFrameForListItem()
|
||||
{
|
||||
nsIPresShell* shell = PresShell();
|
||||
const nsStyleList* styleList = StyleList();
|
||||
|
||||
CSSPseudoElementType pseudoType = aCreateBulletList ?
|
||||
CSSPseudoElementType::mozListBullet :
|
||||
CSSPseudoElementType::mozListNumber;
|
||||
CSSPseudoElementType pseudoType =
|
||||
styleList->mCounterStyle->IsBullet()
|
||||
? CSSPseudoElementType::mozListBullet
|
||||
: CSSPseudoElementType::mozListNumber;
|
||||
|
||||
RefPtr<ComputedStyle> kidSC = ResolveBulletStyle(pseudoType,
|
||||
shell->StyleSet());
|
||||
|
@ -7198,7 +7193,7 @@ nsBlockFrame::CreateBulletFrameForListItem(bool aCreateBulletList,
|
|||
|
||||
// If the list bullet frame should be positioned inside then add
|
||||
// it to the flow now.
|
||||
if (aListStylePositionInside) {
|
||||
if (styleList->mListStylePosition == NS_STYLE_LIST_STYLE_POSITION_INSIDE) {
|
||||
nsFrameList bulletList(bullet, bullet);
|
||||
AddFrames(bulletList, nullptr);
|
||||
SetProperty(InsideBulletProperty(), bullet);
|
||||
|
|
|
@ -511,12 +511,8 @@ protected:
|
|||
|
||||
/**
|
||||
* Helper function to create bullet frame.
|
||||
* @param aCreateBulletList true to create bullet list; otherwise number list.
|
||||
* @param aListStylePositionInside true to put the list position inside;
|
||||
* otherwise outside.
|
||||
*/
|
||||
void CreateBulletFrameForListItem(bool aCreateBulletList,
|
||||
bool aListStylePositionInside);
|
||||
void CreateBulletFrameForListItem();
|
||||
|
||||
public:
|
||||
/**
|
||||
|
|
Загрузка…
Ссылка в новой задаче