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

Bug 1244049 - Part 1: Define scoped enum for CSSPseudoElement type. r=dbaron

Browse Source
This commit is contained in:
Boris Chiou
2016-02-16 23:07:00 +01:00
parent 75ea718561
commit 16edfa82cd
40 changed files with 263 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
layout/base/nsCSSFrameConstructor.cpp
View File

@@ -1760,8 +1760,8 @@ nsCSSFrameConstructor::CreateGeneratedContentItem(nsFrameConstructorState& aStat
nsCSSPseudoElements::Type aPseudoElement,
FrameConstructionItemList& aItems)
{
MOZ_ASSERT(aPseudoElement == nsCSSPseudoElements::ePseudo_before ||
aPseudoElement == nsCSSPseudoElements::ePseudo_after,
MOZ_ASSERT(aPseudoElement == CSSPseudoElementType::before ||
aPseudoElement == CSSPseudoElementType::after,
"unexpected aPseudoElement");
// XXXbz is this ever true?
@@ -1782,7 +1782,7 @@ nsCSSFrameConstructor::CreateGeneratedContentItem(nsFrameConstructorState& aStat
if (!pseudoStyleContext)
return;
bool isBefore = aPseudoElement == nsCSSPseudoElements::ePseudo_before;
bool isBefore = aPseudoElement == CSSPseudoElementType::before;
// |ProbePseudoStyleFor| checked the 'display' property and the
// |ContentCount()| of the 'content' property for us.
@@ -2961,7 +2961,7 @@ nsCSSFrameConstructor::CreateBackdropFrameFor(nsIPresShell* aPresShell,
RefPtr<nsStyleContext> style = aPresShell->StyleSet()->
ResolvePseudoElementStyle(aContent->AsElement(),
nsCSSPseudoElements::ePseudo_backdrop,
CSSPseudoElementType::backdrop,
/* aParentStyleContext */ nullptr,
/* aPseudoElement */ nullptr);
nsBackdropFrame* backdropFrame = new (aPresShell) nsBackdropFrame(style);
@@ -4922,7 +4922,7 @@ nsCSSFrameConstructor::ResolveStyleContext(nsStyleContext* aParentStyleContext,
RestyleManager()->GetReframingStyleContexts();
if (rsc) {
nsStyleContext* oldStyleContext =
rsc->Get(aContent, nsCSSPseudoElements::ePseudo_NotPseudoElement);
rsc->Get(aContent, CSSPseudoElementType::NotPseudo);
nsPresContext* presContext = mPresShell->GetPresContext();
if (oldStyleContext) {
RestyleManager::TryStartingTransition(presContext, aContent,
@@ -4930,7 +4930,7 @@ nsCSSFrameConstructor::ResolveStyleContext(nsStyleContext* aParentStyleContext,
} else if (aContent->IsElement()) {
presContext->TransitionManager()->
PruneCompletedTransitions(aContent->AsElement(),
nsCSSPseudoElements::ePseudo_NotPseudoElement, result);
CSSPseudoElementType::NotPseudo, result);
}
}
@@ -5763,7 +5763,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState
aParentFrame->AddStateBits(NS_FRAME_MAY_HAVE_GENERATED_CONTENT);
}
CreateGeneratedContentItem(aState, aParentFrame, aContent, styleContext,
nsCSSPseudoElements::ePseudo_before, aItems);
CSSPseudoElementType::before, aItems);
FlattenedChildIterator iter(aContent);
for (nsIContent* child = iter.GetNextChild(); child; child = iter.GetNextChild()) {
@@ -5796,7 +5796,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState
aItems.SetParentHasNoXBLChildren(!iter.XBLInvolved());
CreateGeneratedContentItem(aState, aParentFrame, aContent, styleContext,
nsCSSPseudoElements::ePseudo_after, aItems);
CSSPseudoElementType::after, aItems);
if (canHavePageBreak && display->mBreakAfter) {
AddPageBreakItem(aContent, aStyleContext, aItems);
}
@@ -6170,7 +6170,7 @@ AdjustAppendParentForAfterContent(nsFrameManager* aFrameManager,
// document than aChild and return that in aAfterFrame.
if (aParentFrame->GetGenConPseudos() ||
nsLayoutUtils::HasPseudoStyle(aContainer, aParentFrame->StyleContext(),
nsCSSPseudoElements::ePseudo_after,
CSSPseudoElementType::after,
aParentFrame->PresContext()) ||
aFrameManager->GetDisplayContentsStyleFor(aContainer)) {
nsIFrame* afterFrame = nullptr;
@@ -9556,7 +9556,7 @@ nsCSSFrameConstructor::GetFirstLetterStyle(nsIContent* aContent,
if (aContent) {
return mPresShell->StyleSet()->
ResolvePseudoElementStyle(aContent->AsElement(),
nsCSSPseudoElements::ePseudo_firstLetter,
CSSPseudoElementType::firstLetter,
aStyleContext,
nullptr);
}
@@ -9570,7 +9570,7 @@ nsCSSFrameConstructor::GetFirstLineStyle(nsIContent* aContent,
if (aContent) {
return mPresShell->StyleSet()->
ResolvePseudoElementStyle(aContent->AsElement(),
nsCSSPseudoElements::ePseudo_firstLine,
CSSPseudoElementType::firstLine,
aStyleContext,
nullptr);
}
@@ -9584,7 +9584,7 @@ nsCSSFrameConstructor::ShouldHaveFirstLetterStyle(nsIContent* aContent,
nsStyleContext* aStyleContext)
{
return nsLayoutUtils::HasPseudoStyle(aContent, aStyleContext,
nsCSSPseudoElements::ePseudo_firstLetter,
CSSPseudoElementType::firstLetter,
mPresShell->GetPresContext());
}
@@ -9604,7 +9604,7 @@ nsCSSFrameConstructor::ShouldHaveFirstLineStyle(nsIContent* aContent,
{
bool hasFirstLine =
nsLayoutUtils::HasPseudoStyle(aContent, aStyleContext,
nsCSSPseudoElements::ePseudo_firstLine,
CSSPseudoElementType::firstLine,
mPresShell->GetPresContext());
if (hasFirstLine) {
// But disable for fieldsets
@@ -10532,7 +10532,7 @@ nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState,
nsFrame::CorrectStyleParentFrame(aFrame, nullptr)->StyleContext();
// Probe for generated content before
CreateGeneratedContentItem(aState, aFrame, aContent, styleContext,
nsCSSPseudoElements::ePseudo_before,
CSSPseudoElementType::before,
itemsToConstruct);
}
@@ -10580,7 +10580,7 @@ nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState,
if (aCanHaveGeneratedContent) {
// Probe for generated content after
CreateGeneratedContentItem(aState, aFrame, aContent, styleContext,
nsCSSPseudoElements::ePseudo_after,
CSSPseudoElementType::after,
itemsToConstruct);
}
} else {
@@ -11830,7 +11830,7 @@ nsCSSFrameConstructor::BuildInlineChildItems(nsFrameConstructorState& aState,
if (!aItemIsWithinSVGText) {
// Probe for generated content before
CreateGeneratedContentItem(aState, nullptr, parentContent, parentStyleContext,
nsCSSPseudoElements::ePseudo_before,
CSSPseudoElementType::before,
aParentItem.mChildItems);
}
@@ -11900,7 +11900,7 @@ nsCSSFrameConstructor::BuildInlineChildItems(nsFrameConstructorState& aState,
if (!aItemIsWithinSVGText) {
// Probe for generated content after
CreateGeneratedContentItem(aState, nullptr, parentContent, parentStyleContext,
nsCSSPseudoElements::ePseudo_after,
CSSPseudoElementType::after,
aParentItem.mChildItems);
}