зеркало из https://github.com/mozilla/gecko-dev.git
Bug 812687 part 6: Rename & invert polarity of a flexbox frame-state-bit, for consistency with grid. r=mats
This patch is just flipping some logic in a way that should produce the same outcome, so it shouldn't affect behavior. MozReview-Commit-ID: LM4HbJD3D9w
This commit is contained in:
Родитель
17ef2998db
Коммит
c05bf39d8c
|
@ -2263,9 +2263,9 @@ nsFlexContainerFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||||
|
|
||||||
typedef CSSOrderAwareFrameIterator::OrderState OrderState;
|
typedef CSSOrderAwareFrameIterator::OrderState OrderState;
|
||||||
OrderState orderState =
|
OrderState orderState =
|
||||||
HasAnyStateBits(NS_STATE_FLEX_CHILDREN_REORDERED)
|
HasAnyStateBits(NS_STATE_FLEX_NORMAL_FLOW_CHILDREN_IN_CSS_ORDER)
|
||||||
? OrderState::eKnownUnordered
|
? OrderState::eKnownOrdered
|
||||||
: OrderState::eKnownOrdered;
|
: OrderState::eKnownUnordered;
|
||||||
|
|
||||||
CSSOrderAwareFrameIterator iter(this, kPrincipalList,
|
CSSOrderAwareFrameIterator iter(this, kPrincipalList,
|
||||||
CSSOrderAwareFrameIterator::eIncludeAll,
|
CSSOrderAwareFrameIterator::eIncludeAll,
|
||||||
|
@ -3581,9 +3581,9 @@ nsFlexContainerFrame::GenerateFlexLines(
|
||||||
OrderingPropertyForIter(this));
|
OrderingPropertyForIter(this));
|
||||||
|
|
||||||
if (iter.ItemsAreAlreadyInOrder()) {
|
if (iter.ItemsAreAlreadyInOrder()) {
|
||||||
RemoveStateBits(NS_STATE_FLEX_CHILDREN_REORDERED);
|
AddStateBits(NS_STATE_FLEX_NORMAL_FLOW_CHILDREN_IN_CSS_ORDER);
|
||||||
} else {
|
} else {
|
||||||
AddStateBits(NS_STATE_FLEX_CHILDREN_REORDERED);
|
RemoveStateBits(NS_STATE_FLEX_NORMAL_FLOW_CHILDREN_IN_CSS_ORDER);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (; !iter.AtEnd(); iter.Next()) {
|
for (; !iter.AtEnd(); iter.Next()) {
|
||||||
|
|
|
@ -310,9 +310,9 @@ FRAME_STATE_BIT(Box, 61, NS_FRAME_MOUSE_THROUGH_NEVER)
|
||||||
|
|
||||||
FRAME_STATE_GROUP(FlexContainer, nsFlexContainerFrame)
|
FRAME_STATE_GROUP(FlexContainer, nsFlexContainerFrame)
|
||||||
|
|
||||||
// Set for a flex container whose children have been reordered due to 'order'.
|
// True iff the normal flow children are already in CSS 'order' in the
|
||||||
// (Means that we have to be more thorough about checking them for sortedness.)
|
// order they occur in the child frame list.
|
||||||
FRAME_STATE_BIT(FlexContainer, 20, NS_STATE_FLEX_CHILDREN_REORDERED)
|
FRAME_STATE_BIT(FlexContainer, 20, NS_STATE_FLEX_NORMAL_FLOW_CHILDREN_IN_CSS_ORDER)
|
||||||
|
|
||||||
// Set for a flex container that is emulating a legacy
|
// Set for a flex container that is emulating a legacy
|
||||||
// 'display:-webkit-{inline-}box' container.
|
// 'display:-webkit-{inline-}box' container.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче