Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-09 04:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1300337 - Replace None_ variants from nsStyleConsts.h with None; r=heycam,TYLin

Browse Source 
MozReview-Commit-ID: CxHzbEzjLxT

--HG--
extra : rebase_source : 232f90b8b107f7fb49f47a29a4e493660b8a7d87
This commit is contained in:
Manish Goregaokar 2016-09-04 00:16:58 +05:30
parent fadd103e03
commit aad318e17a
31 changed files with 100 additions and 102 deletions

2
dom/base/nsFocusManager.cpp

@ -1577,7 +1577,7 @@ nsFocusManager::CheckIfFocusable(nsIContent* aContent, uint32_t aFlags)
if (subdoc && IsWindowVisible(subdoc->GetWindow())) {
const nsStyleUserInterface* ui = frame->StyleUserInterface();
int32_t tabIndex = (ui->mUserFocus == StyleUserFocus::Ignore ||
ui->mUserFocus == StyleUserFocus::None_) ? -1 : 0;
ui->mUserFocus == StyleUserFocus::None) ? -1 : 0;
return aContent->IsFocusable(&tabIndex, aFlags & FLAG_BYMOUSE) ? aContent : nullptr;
}

4
dom/html/nsGenericHTMLElement.cpp

@ -1290,7 +1290,7 @@ nsGenericHTMLElement::MapCommonAttributesInto(const nsMappedAttributes* aAttribu
nsCSSValue* display = aData->ValueForDisplay();
if (display->GetUnit() == eCSSUnit_Null) {
if (aAttributes->IndexOfAttr(nsGkAtoms::hidden) >= 0) {
display->SetIntValue(StyleDisplay::None_, eCSSUnit_Enumerated);
display->SetIntValue(StyleDisplay::None, eCSSUnit_Enumerated);
}
}
}
@ -3097,7 +3097,7 @@ IsOrHasAncestorWithDisplayNone(Element* aElement, nsIPresShell* aPresShell)
sc = nsComputedDOMStyle::GetStyleContextForElementNoFlush(elementsToCheck[i],
nullptr, aPresShell);
}
if (sc->StyleDisplay()->mDisplay == StyleDisplay::None_) {
if (sc->StyleDisplay()->mDisplay == StyleDisplay::None) {
return true;
}
}

1
dom/plugins/ipc/PluginInstanceChild.cpp

@ -63,6 +63,7 @@ using namespace std;
#include "mozilla/widget/WinModifierKeyState.h"
#include "mozilla/widget/WinNativeEventData.h"
#include "nsWindowsDllInterceptor.h"
#include "X11UndefineNone.h"
typedef BOOL (WINAPI *User32TrackPopupMenu)(HMENU hMenu,
UINT uFlags,

2
editor/libeditor/EditorBase.cpp

@ -3437,7 +3437,7 @@ IsElementVisible(Element* aElement)
nsComputedDOMStyle::GetStyleContextForElementNoFlush(aElement,
nullptr, nullptr);
if (styleContext) {
return styleContext->StyleDisplay()->mDisplay != StyleDisplay::None_;
return styleContext->StyleDisplay()->mDisplay != StyleDisplay::None;
}
return false;
}

4
gfx/src/X11UndefineNone.h

@ -4,9 +4,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef MOZILLA_GFX_X11UNDEFINENONE_H_
#define MOZILLA_GFX_X11UNDEFINENONE_H_
// The header <X11/X.h> defines "None" as a macro that expands to "0L".
// This is terrible because many enumerations have an enumerator named "None".
// To work around this, we undefine the macro "None", and define a replacement
@ -24,4 +21,3 @@
# endif
#endif
#endif /* MOZILLA_GFX_X11UNDEFINENONE_H_ */

8
layout/base/RestyleManager.cpp

@ -1787,7 +1787,7 @@ ElementRestyler::DoConditionallyRestyleUndisplayedDescendants(
nsCSSFrameConstructor* fc = mPresContext->FrameConstructor();
UndisplayedNode* nodes = fc->GetAllUndisplayedContentIn(aParent);
ConditionallyRestyleUndisplayedNodes(nodes, aParent,
StyleDisplay::None_, aRestyleRoot);
StyleDisplay::None, aRestyleRoot);
nodes = fc->GetAllDisplayContentsIn(aParent);
ConditionallyRestyleUndisplayedNodes(nodes, aParent,
StyleDisplay::Contents, aRestyleRoot);
@ -1802,7 +1802,7 @@ ElementRestyler::ConditionallyRestyleUndisplayedNodes(
const StyleDisplay aDisplay,
Element* aRestyleRoot)
{
MOZ_ASSERT(aDisplay == StyleDisplay::None_ ||
MOZ_ASSERT(aDisplay == StyleDisplay::None ||
aDisplay == StyleDisplay::Contents);
if (!aUndisplayed) {
return;
@ -1825,7 +1825,7 @@ ElementRestyler::ConditionallyRestyleUndisplayedNodes(
Element* element = undisplayed->mContent->AsElement();
if (!ConditionallyRestyle(element, aRestyleRoot)) {
if (aDisplay == StyleDisplay::None_) {
if (aDisplay == StyleDisplay::None) {
ConditionallyRestyleContentDescendants(element, aRestyleRoot);
} else { // StyleDisplay::Contents
DoConditionallyRestyleUndisplayedDescendants(element, aRestyleRoot);
@ -3425,7 +3425,7 @@ ElementRestyler::DoRestyleUndisplayedDescendants(nsRestyleHint aChildRestyleHint
nsCSSFrameConstructor* fc = mPresContext->FrameConstructor();
UndisplayedNode* nodes = fc->GetAllUndisplayedContentIn(aParent);
RestyleUndisplayedNodes(aChildRestyleHint, nodes, aParent,
aParentContext, StyleDisplay::None_);
aParentContext, StyleDisplay::None);
nodes = fc->GetAllDisplayContentsIn(aParent);
RestyleUndisplayedNodes(aChildRestyleHint, nodes, aParent,
aParentContext, StyleDisplay::Contents);

2
layout/base/ServoRestyleManager.cpp

@ -104,7 +104,7 @@ ServoRestyleManager::RecreateStyleContexts(nsIContent* aContent,
} else {
const nsStyleDisplay* currentDisplay =
Servo_GetStyleDisplay(computedValues);
if (currentDisplay->mDisplay != StyleDisplay::None_) {
if (currentDisplay->mDisplay != StyleDisplay::None) {
changeHint |= nsChangeHint_ReconstructFrame;
}
}

12
layout/base/nsCSSFrameConstructor.cpp

@ -2485,7 +2485,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle
propagatedScrollFrom == aDocElement,
"Scrollbars should have been propagated to the viewport");
if (MOZ_UNLIKELY(display->mDisplay == StyleDisplay::None_)) {
if (MOZ_UNLIKELY(display->mDisplay == StyleDisplay::None)) {
SetUndisplayedContent(aDocElement, styleContext);
return nullptr;
}
@ -4706,7 +4706,7 @@ nsCSSFrameConstructor::FindDisplayData(const nsStyleDisplay* aDisplay,
// NOTE: Make sure to keep this up to date with the StyleDisplay definition!
static const FrameConstructionDataByDisplay sDisplayData[] = {
FCDATA_FOR_DISPLAY(StyleDisplay::None_, UNREACHABLE_FCDATA()),
FCDATA_FOR_DISPLAY(StyleDisplay::None, UNREACHABLE_FCDATA()),
FCDATA_FOR_DISPLAY(StyleDisplay::Block, UNREACHABLE_FCDATA()),
// To keep the hash table small don't add inline frames (they're
// typically things like FONT and B), because we can quickly
@ -5702,7 +5702,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState
// Pre-check for display "none" - if we find that, don't create
// any frame at all
if (StyleDisplay::None_ == display->mDisplay) {
if (StyleDisplay::None == display->mDisplay) {
SetAsUndisplayedContent(aState, aItems, aContent, styleContext, isGeneratedContent);
return;
}
@ -9200,7 +9200,7 @@ nsStyleContext*
nsCSSFrameConstructor::MaybeRecreateFramesForElement(Element* aElement)
{
RefPtr<nsStyleContext> oldContext = GetUndisplayedContent(aElement);
StyleDisplay oldDisplay = StyleDisplay::None_;
StyleDisplay oldDisplay = StyleDisplay::None;
if (!oldContext) {
oldContext = GetDisplayContentsStyleFor(aElement);
if (!oldContext) {
@ -9213,7 +9213,7 @@ nsCSSFrameConstructor::MaybeRecreateFramesForElement(Element* aElement)
RefPtr<nsStyleContext> newContext = mPresShell->StyleSet()->
ResolveStyleFor(aElement, oldContext->GetParent());
if (oldDisplay == StyleDisplay::None_) {
if (oldDisplay == StyleDisplay::None) {
ChangeUndisplayedContent(aElement, newContext);
} else {
ChangeDisplayContents(aElement, newContext);
@ -11653,7 +11653,7 @@ nsCSSFrameConstructor::CreateListBoxContent(nsContainerFrame* aParentFrame,
// any frame at all
const nsStyleDisplay* display = styleContext->StyleDisplay();
if (StyleDisplay::None_ == display->mDisplay) {
if (StyleDisplay::None == display->mDisplay) {
*aNewFrame = nullptr;
return NS_OK;
}

2
layout/base/nsLayoutUtils.cpp

@ -3069,7 +3069,7 @@ nsLayoutUtils::CombineBreakType(StyleClear aOrigBreakType,
breakType = StyleClear::Both;
}
break;
case StyleClear::None_:
case StyleClear::None:
if (StyleClear::Left == aNewBreakType ||
StyleClear::Right == aNewBreakType ||
StyleClear::Both == aNewBreakType) {

6
layout/generic/BlockReflowInput.cpp

@ -44,7 +44,7 @@ BlockReflowInput::BlockReflowInput(const ReflowInput& aReflowInput,
mBorderPadding(mReflowInput.ComputedLogicalBorderPadding()),
mPrevBEndMargin(),
mLineNumber(0),
mFloatBreakType(StyleClear::None_),
mFloatBreakType(StyleClear::None),
mConsumedBSize(aConsumedBSize)
{
if (!sFloatFragmentsInsideColumnPrefCached) {
@ -732,7 +732,7 @@ BlockReflowInput::FlowAndPlaceFloat(nsIFrame* aFloat)
// See if the float should clear any preceding floats...
// XXX We need to mark this float somehow so that it gets reflowed
// when floats are inserted before it.
if (StyleClear::None_ != floatDisplay->mBreakType) {
if (StyleClear::None != floatDisplay->mBreakType) {
// XXXldb Does this handle vertical margins correctly?
mBCoord = ClearFloats(mBCoord, floatDisplay->PhysicalBreakType(wm));
}
@ -1103,7 +1103,7 @@ BlockReflowInput::ClearFloats(nscoord aBCoord, StyleClear aBreakType,
nscoord newBCoord = aBCoord;
if (aBreakType != StyleClear::None_) {
if (aBreakType != StyleClear::None) {
newBCoord = mFloatManager->ClearFloats(newBCoord, aBreakType, aFlags);
}

4
layout/generic/ReflowInput.cpp

@ -844,7 +844,7 @@ ReflowInput::InitFrameType(nsIAtom* aFrameType)
frameType = NS_CSS_FRAME_TYPE_INTERNAL_TABLE;
break;
case StyleDisplay::None_:
case StyleDisplay::None:
default:
frameType = NS_CSS_FRAME_TYPE_UNKNOWN;
break;
@ -1213,7 +1213,7 @@ ReflowInput::CalculateHypotheticalPosition
nsHypotheticalPosition& aHypotheticalPos,
nsIAtom* aFrameType) const
{
NS_ASSERTION(mStyleDisplay->mOriginalDisplay != StyleDisplay::None_,
NS_ASSERTION(mStyleDisplay->mOriginalDisplay != StyleDisplay::None,
"mOriginalDisplay has not been properly initialized");
// Find the nearest containing block frame to the placeholder frame,

2
layout/generic/nsBRFrame.cpp

@ -145,7 +145,7 @@ BRFrame::Reflow(nsPresContext* aPresContext,
// Return our reflow status
StyleClear breakType = aReflowInput.mStyleDisplay->PhysicalBreakType(wm);
if (StyleClear::None_ == breakType) {
if (StyleClear::None == breakType) {
breakType = StyleClear::Line;
}

2
layout/generic/nsBackdropFrame.cpp

@ -47,7 +47,7 @@ nsBackdropFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
// none or contents so that we can respond to style change on it. To
// support those values, we skip painting ourselves in those cases.
auto display = StyleDisplay()->mDisplay;
if (display == mozilla::StyleDisplay::None_ ||
if (display == mozilla::StyleDisplay::None ||
display == mozilla::StyleDisplay::Contents) {
return;
}

40
layout/generic/nsBlockFrame.cpp

@ -2037,7 +2037,7 @@ nsBlockFrame::PropagateFloatDamage(BlockReflowInput& aState,
static bool LineHasClear(nsLineBox* aLine) {
return aLine->IsBlock()
? (aLine->GetBreakTypeBefore() != StyleClear::None_ ||
? (aLine->GetBreakTypeBefore() != StyleClear::None ||
(aLine->mFirstChild->GetStateBits() & NS_BLOCK_HAS_CLEAR_CHILDREN) ||
!nsBlockFrame::BlockCanIntersectFloats(aLine->mFirstChild))
: aLine->HasFloatBreakAfter();
@ -2088,7 +2088,7 @@ nsBlockFrame::ReflowDirtyLines(BlockReflowInput& aState)
{
bool keepGoing = true;
bool repositionViews = false; // should we really need this?
bool foundAnyClears = aState.mFloatBreakType != StyleClear::None_;
bool foundAnyClears = aState.mFloatBreakType != StyleClear::None;
bool willReflowAgain = false;
#ifdef DEBUG
@ -2160,12 +2160,12 @@ nsBlockFrame::ReflowDirtyLines(BlockReflowInput& aState)
// We have to reflow the line if it's a block whose clearance
// might have changed, so detect that.
if (!line->IsDirty() &&
(line->GetBreakTypeBefore() != StyleClear::None_ ||
(line->GetBreakTypeBefore() != StyleClear::None ||
replacedBlock)) {
nscoord curBCoord = aState.mBCoord;
// See where we would be after applying any clearance due to
// BRs.
if (inlineFloatBreakType != StyleClear::None_) {
if (inlineFloatBreakType != StyleClear::None) {
curBCoord = aState.ClearFloats(curBCoord, inlineFloatBreakType);
}
@ -2191,14 +2191,14 @@ nsBlockFrame::ReflowDirtyLines(BlockReflowInput& aState)
}
// We might have to reflow a line that is after a clearing BR.
if (inlineFloatBreakType != StyleClear::None_) {
if (inlineFloatBreakType != StyleClear::None) {
aState.mBCoord = aState.ClearFloats(aState.mBCoord, inlineFloatBreakType);
if (aState.mBCoord != line->BStart() + deltaBCoord) {
// SlideLine is not going to put the line where the clearance
// put it. Reflow the line to be sure.
line->MarkDirty();
}
inlineFloatBreakType = StyleClear::None_;
inlineFloatBreakType = StyleClear::None;
}
bool previousMarginWasDirty = line->IsPreviousMarginDirty();
@ -2451,7 +2451,7 @@ nsBlockFrame::ReflowDirtyLines(BlockReflowInput& aState)
}
// Handle BR-clearance from the last line of the block
if (inlineFloatBreakType != StyleClear::None_) {
if (inlineFloatBreakType != StyleClear::None) {
aState.mBCoord = aState.ClearFloats(aState.mBCoord, inlineFloatBreakType);
}
@ -3136,10 +3136,10 @@ nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState,
StyleClear breakType = frame->StyleDisplay()->
PhysicalBreakType(aState.mReflowInput.GetWritingMode());
if (StyleClear::None_ != aState.mFloatBreakType) {
if (StyleClear::None != aState.mFloatBreakType) {
breakType = nsLayoutUtils::CombineBreakType(breakType,
aState.mFloatBreakType);
aState.mFloatBreakType = StyleClear::None_;
aState.mFloatBreakType = StyleClear::None;
}
// Clear past floats before the block if the clear style is not none
@ -3162,7 +3162,7 @@ nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState,
}
bool treatWithClearance = aLine->HasClearance();
bool mightClearFloats = breakType != StyleClear::None_;
bool mightClearFloats = breakType != StyleClear::None;
nsIFrame *replacedBlock = nullptr;
if (!nsBlockFrame::BlockCanIntersectFloats(frame)) {
mightClearFloats = true;
@ -3441,7 +3441,7 @@ nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState,
}
// ClearFloats might be able to advance us further once we're there.
aState.mBCoord =
aState.ClearFloats(newBCoord, StyleClear::None_, replacedBlock);
aState.ClearFloats(newBCoord, StyleClear::None, replacedBlock);
// Start over with a new available space rect at the new height.
floatAvailableSpace =
aState.GetFloatAvailableSpaceWithState(aState.mBCoord,
@ -4062,7 +4062,7 @@ nsBlockFrame::DoReflowInlineFrames(BlockReflowInput& aState,
* The line reflow status is simple: true means keep placing frames
* on the line; false means don't (the line is done). If the line
* has some sort of breaking affect then aLine's break-type will be set
* to something other than StyleClear::None_.
* to something other than StyleClear::None.
*/
void
nsBlockFrame::ReflowInlineFrame(BlockReflowInput& aState,
@ -4119,17 +4119,17 @@ nsBlockFrame::ReflowInlineFrame(BlockReflowInput& aState,
// break-after-not-complete. There are two situations: we are a
// block or we are an inline. This makes a total of 10 cases
// (fortunately, there is some overlap).
aLine->SetBreakTypeAfter(StyleClear::None_);
aLine->SetBreakTypeAfter(StyleClear::None);
if (NS_INLINE_IS_BREAK(frameReflowStatus) ||
StyleClear::None_ != aState.mFloatBreakType) {
StyleClear::None != aState.mFloatBreakType) {
// Always abort the line reflow (because a line break is the
// minimal amount of break we do).
*aLineReflowStatus = LINE_REFLOW_STOP;
// XXX what should aLine's break-type be set to in all these cases?
StyleClear breakType = NS_INLINE_GET_BREAK_TYPE(frameReflowStatus);
MOZ_ASSERT(StyleClear::None_ != breakType ||
StyleClear::None_ != aState.mFloatBreakType, "bad break type");
MOZ_ASSERT(StyleClear::None != breakType ||
StyleClear::None != aState.mFloatBreakType, "bad break type");
if (NS_INLINE_IS_BREAK_BEFORE(frameReflowStatus)) {
// Break-before cases.
@ -4157,15 +4157,15 @@ nsBlockFrame::ReflowInlineFrame(BlockReflowInput& aState,
// If a float split and its prev-in-flow was followed by a <BR>, then combine
// the <BR>'s break type with the inline's break type (the inline will be the very
// next frame after the split float).
if (StyleClear::None_ != aState.mFloatBreakType) {
if (StyleClear::None != aState.mFloatBreakType) {
breakType = nsLayoutUtils::CombineBreakType(breakType,
aState.mFloatBreakType);
aState.mFloatBreakType = StyleClear::None_;
aState.mFloatBreakType = StyleClear::None;
}
// Break-after cases
if (breakType == StyleClear::Line) {
if (!aLineLayout.GetLineEndsInBR()) {
breakType = StyleClear::None_;
breakType = StyleClear::None;
}
}
aLine->SetBreakTypeAfter(breakType);
@ -6245,7 +6245,7 @@ nsBlockFrame::FindTrailingClear()
return endLine->GetBreakTypeAfter();
}
}
return StyleClear::None_;
return StyleClear::None;
}
void

2
layout/generic/nsBlockReflowContext.cpp

@ -168,7 +168,7 @@ nsBlockReflowContext::ComputeCollapsedBStartMargin(const ReflowInput& aRI,
availSpace);
// Record that we're being optimistic by assuming the kid
// has no clearance
if (kid->StyleDisplay()->mBreakType != StyleClear::None_ ||
if (kid->StyleDisplay()->mBreakType != StyleClear::None ||
!nsBlockFrame::BlockCanIntersectFloats(kid)) {
*aMayNeedRetry = true;
}

8
layout/generic/nsFrame.cpp

@ -3226,7 +3226,7 @@ nsFrame::IsSelectable(bool* aSelectable, StyleUserSelect* aSelectStyle) const
if (mState & NS_FRAME_GENERATED_CONTENT) {
*aSelectable = false;
} else {
*aSelectable = allowSelection && (selectStyle != StyleUserSelect::None_);
*aSelectable = allowSelection && (selectStyle != StyleUserSelect::None);
}
return NS_OK;
@ -3942,7 +3942,7 @@ static bool SelfIsSelectable(nsIFrame* aFrame, uint32_t aFlags)
return false;
}
return !aFrame->IsGeneratedContentFrame() &&
aFrame->StyleUIReset()->mUserSelect != StyleUserSelect::None_;
aFrame->StyleUIReset()->mUserSelect != StyleUserSelect::None;
}
static bool SelectionDescendToKids(nsIFrame* aFrame) {
@ -3958,7 +3958,7 @@ static bool SelectionDescendToKids(nsIFrame* aFrame) {
// they can at the moment)
return !aFrame->IsGeneratedContentFrame() &&
style != StyleUserSelect::All &&
style != StyleUserSelect::None_ &&
style != StyleUserSelect::None &&
((parent->GetStateBits() & NS_FRAME_INDEPENDENT_SELECTION) ||
!(aFrame->GetStateBits() & NS_FRAME_INDEPENDENT_SELECTION));
}
@ -8608,7 +8608,7 @@ nsIFrame::IsFocusable(int32_t *aTabIndex, bool aWithMouse)
StyleContext()->GetPseudo() != nsCSSAnonBoxes::anonymousGridItem) {
const nsStyleUserInterface* ui = StyleUserInterface();
if (ui->mUserFocus != StyleUserFocus::Ignore &&
ui->mUserFocus != StyleUserFocus::None_) {
ui->mUserFocus != StyleUserFocus::None) {
// Pass in default tabindex of -1 for nonfocusable and 0 for focusable
tabIndex = 0;
}

2
layout/generic/nsLineBox.cpp

@ -195,7 +195,7 @@ const char*
nsLineBox::BreakTypeToString(StyleClear aBreakType) const
{
switch (aBreakType) {
case StyleClear::None_: return "nobr";
case StyleClear::None: return "nobr";
case StyleClear::Left: return "leftbr";
case StyleClear::Right: return "rightbr";
case StyleClear::InlineStart: return "inlinestartbr";

10
layout/generic/nsLineBox.h

@ -395,11 +395,11 @@ public:
// using different names should help.
using StyleClear = mozilla::StyleClear;
bool HasBreakBefore() const {
return IsBlock() && StyleClear::None_ != BreakType();
return IsBlock() && StyleClear::None != BreakType();
}
void SetBreakTypeBefore(StyleClear aBreakType) {
MOZ_ASSERT(IsBlock(), "Only blocks have break-before");
MOZ_ASSERT(aBreakType == StyleClear::None_ ||
MOZ_ASSERT(aBreakType == StyleClear::None ||
aBreakType == StyleClear::Left ||
aBreakType == StyleClear::Right ||
aBreakType == StyleClear::Both,
@ -407,11 +407,11 @@ public:
mFlags.mBreakType = static_cast<int>(aBreakType);
}
StyleClear GetBreakTypeBefore() const {
return IsBlock() ? BreakType() : StyleClear::None_;
return IsBlock() ? BreakType() : StyleClear::None;
}
bool HasBreakAfter() const {
return !IsBlock() && StyleClear::None_ != BreakType();
return !IsBlock() && StyleClear::None != BreakType();
}
void SetBreakTypeAfter(StyleClear aBreakType) {
MOZ_ASSERT(!IsBlock(), "Only inlines have break-after");
@ -424,7 +424,7 @@ public:
StyleClear::Both == BreakType());
}
StyleClear GetBreakTypeAfter() const {
return !IsBlock() ? BreakType() : StyleClear::None_;
return !IsBlock() ? BreakType() : StyleClear::None;
}
// mCarriedOutBEndMargin value

2
layout/style/ServoStyleSet.cpp

@ -400,7 +400,7 @@ ServoStyleSet::ProbePseudoElementStyle(Element* aParentElement,
const nsStyleDisplay *display = Servo_GetStyleDisplay(computedValues);
const nsStyleContent *content = Servo_GetStyleContent(computedValues);
// XXXldb What is contentCount for |content: ""|?
if (display->mDisplay == StyleDisplay::None_ ||
if (display->mDisplay == StyleDisplay::None ||
content->ContentCount() == 0) {
return nullptr;
}

2
layout/style/StyleAnimationValue.cpp

@ -4029,7 +4029,7 @@ StyleAnimationValue::ExtractComputedValue(nsCSSPropertyID aProperty,
aComputedValue.SetCSSValueArrayValue(result, eUnit_Shape);
} else {
MOZ_ASSERT(type == StyleShapeSourceType::None_, "unknown type");
MOZ_ASSERT(type == StyleShapeSourceType::None, "unknown type");
aComputedValue.SetNoneValue();
}
break;

12
layout/style/nsCSSProps.cpp

@ -1058,7 +1058,7 @@ const KTableEntry nsCSSProps::kCaptionSideKTable[] = {
};
KTableEntry nsCSSProps::kClearKTable[] = {
{ eCSSKeyword_none, StyleClear::None_ },
{ eCSSKeyword_none, StyleClear::None },
{ eCSSKeyword_left, StyleClear::Left },
{ eCSSKeyword_right, StyleClear::Right },
{ eCSSKeyword_inline_start, StyleClear::InlineStart },
@ -1244,7 +1244,7 @@ const KTableEntry nsCSSProps::kDirectionKTable[] = {
};
KTableEntry nsCSSProps::kDisplayKTable[] = {
{ eCSSKeyword_none, StyleDisplay::None_ },
{ eCSSKeyword_none, StyleDisplay::None },
{ eCSSKeyword_inline, StyleDisplay::Inline },
{ eCSSKeyword_block, StyleDisplay::Block },
{ eCSSKeyword_inline_block, StyleDisplay::InlineBlock },
@ -1479,7 +1479,7 @@ const KTableEntry nsCSSProps::kHyphensKTable[] = {
};
KTableEntry nsCSSProps::kFloatKTable[] = {
{ eCSSKeyword_none, StyleFloat::None_ },
{ eCSSKeyword_none, StyleFloat::None },
{ eCSSKeyword_left, StyleFloat::Left },
{ eCSSKeyword_right, StyleFloat::Right },
{ eCSSKeyword_inline_start, StyleFloat::InlineStart },
@ -2117,7 +2117,7 @@ const KTableEntry nsCSSProps::kUnicodeBidiKTable[] = {
};
const KTableEntry nsCSSProps::kUserFocusKTable[] = {
{ eCSSKeyword_none, uint8_t(StyleUserFocus::None_) },
{ eCSSKeyword_none, uint8_t(StyleUserFocus::None) },
{ eCSSKeyword_normal, uint8_t(StyleUserFocus::Normal) },
{ eCSSKeyword_ignore, uint8_t(StyleUserFocus::Ignore) },
{ eCSSKeyword_select_all, uint8_t(StyleUserFocus::SelectAll) },
@ -2144,7 +2144,7 @@ const KTableEntry nsCSSProps::kUserModifyKTable[] = {
};
const KTableEntry nsCSSProps::kUserSelectKTable[] = {
{ eCSSKeyword_none, StyleUserSelect::None_ },
{ eCSSKeyword_none, StyleUserSelect::None },
{ eCSSKeyword_auto, StyleUserSelect::Auto },
{ eCSSKeyword_text, StyleUserSelect::Text },
{ eCSSKeyword_element, StyleUserSelect::Element },
@ -2153,7 +2153,7 @@ const KTableEntry nsCSSProps::kUserSelectKTable[] = {
{ eCSSKeyword_toggle, StyleUserSelect::Toggle },
{ eCSSKeyword_tri_state, StyleUserSelect::TriState },
{ eCSSKeyword__moz_all, StyleUserSelect::MozAll },
{ eCSSKeyword__moz_none, StyleUserSelect::None_ },
{ eCSSKeyword__moz_none, StyleUserSelect::None },
{ eCSSKeyword__moz_text, StyleUserSelect::MozText },
{ eCSSKeyword_UNKNOWN, -1 }
};

2
layout/style/nsComputedDOMStyle.cpp

@ -6053,7 +6053,7 @@ nsComputedDOMStyle::GetShapeSource(
SetValueToFragmentOrURL(aShapeSource.GetURL(), val);
return val.forget();
}
case StyleShapeSourceType::None_: {
case StyleShapeSourceType::None: {
RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
val->SetIdent(eCSSKeyword_none);
return val.forget();

26
layout/style/nsRuleNode.cpp

@ -205,7 +205,7 @@ nsRuleNode::EnsureBlockDisplay(StyleDisplay& display,
break;
} // else, fall through to share the 'break' for non-changing display vals
MOZ_FALLTHROUGH;
case StyleDisplay::None_:
case StyleDisplay::None:
case StyleDisplay::Contents:
// never change display:none or display:contents *ever*
case StyleDisplay::Table:
@ -1342,16 +1342,16 @@ struct SetEnumValueHelper
DEFINE_ENUM_CLASS_SETTER(StyleBoxOrient, Horizontal, Vertical)
DEFINE_ENUM_CLASS_SETTER(StyleBoxPack, Start, Justify)
DEFINE_ENUM_CLASS_SETTER(StyleBoxSizing, Content, Border)
DEFINE_ENUM_CLASS_SETTER(StyleClear, None_, Both)
DEFINE_ENUM_CLASS_SETTER(StyleClear, None, Both)
DEFINE_ENUM_CLASS_SETTER(StyleFillRule, Nonzero, Evenodd)
DEFINE_ENUM_CLASS_SETTER(StyleFloat, None_, InlineEnd)
DEFINE_ENUM_CLASS_SETTER(StyleFloat, None, InlineEnd)
DEFINE_ENUM_CLASS_SETTER(StyleFloatEdge, ContentBox, MarginBox)
DEFINE_ENUM_CLASS_SETTER(StyleUserFocus, None_, SelectMenu)
DEFINE_ENUM_CLASS_SETTER(StyleUserSelect, None_, MozText)
DEFINE_ENUM_CLASS_SETTER(StyleUserFocus, None, SelectMenu)
DEFINE_ENUM_CLASS_SETTER(StyleUserSelect, None, MozText)
#ifdef MOZ_XUL
DEFINE_ENUM_CLASS_SETTER(StyleDisplay, None_, Popup)
DEFINE_ENUM_CLASS_SETTER(StyleDisplay, None, Popup)
#else
DEFINE_ENUM_CLASS_SETTER(StyleDisplay, None_, InlineBox)
DEFINE_ENUM_CLASS_SETTER(StyleDisplay, None, InlineBox)
#endif
#undef DEF_SET_ENUMERATED_VALUE
@ -5149,7 +5149,7 @@ nsRuleNode::ComputeUserInterfaceData(void* aStartStruct,
ui->mUserFocus, conditions,
SETVAL_ENUMERATED | SETVAL_UNSET_INHERIT,
parentUI->mUserFocus,
StyleUserFocus::None_);
StyleUserFocus::None);
// pointer-events: enum, inherit, initial
SetValue(*aRuleData->ValueForPointerEvents(), ui->mPointerEvents,
@ -6045,7 +6045,7 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
SetValue(*aRuleData->ValueForClear(), display->mBreakType, conditions,
SETVAL_ENUMERATED | SETVAL_UNSET_INITIAL,
parentDisplay->mBreakType,
StyleClear::None_);
StyleClear::None);
// temp fix for bug 24000
// Map 'auto' and 'avoid' to false, and 'always', 'left', and
@ -6104,7 +6104,7 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
display->mFloat, conditions,
SETVAL_ENUMERATED | SETVAL_UNSET_INITIAL,
parentDisplay->mFloat,
StyleFloat::None_);
StyleFloat::None);
// Save mFloat in mOriginalFloat in case we need it later
display->mOriginalFloat = display->mFloat;
@ -6175,7 +6175,7 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
parentDisplay->mResize,
NS_STYLE_RESIZE_NONE);
if (display->mDisplay != StyleDisplay::None_) {
if (display->mDisplay != StyleDisplay::None) {
// CSS2 9.7 specifies display type corrections dealing with 'float'
// and 'position'. Since generated content can't be floated or
// positioned, we can deal with it here.
@ -6231,7 +6231,7 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
// 1) if position is 'absolute' or 'fixed' then display must be
// block-level and float must be 'none'
EnsureBlockDisplay(display->mDisplay);
display->mFloat = StyleFloat::None_;
display->mFloat = StyleFloat::None;
// Note that it's OK to cache this struct in the ruletree
// because it's fine as-is for any style context that points to
@ -6239,7 +6239,7 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
// more specific rule sets "position: static") will use
// mOriginalDisplay and mOriginalFloat, which we have carefully
// not changed.
} else if (display->mFloat != StyleFloat::None_) {
} else if (display->mFloat != StyleFloat::None) {
// 2) if float is not none, and display is not none, then we must
// set a block-level 'display' type per CSS2.1 section 9.7.
EnsureBlockDisplay(display->mDisplay);

15
layout/style/nsStyleConsts.h

@ -10,6 +10,7 @@
#include "gfxRect.h"
#include "nsFont.h"
#include "X11UndefineNone.h"
// XXX fold this into nsStyleContext and group by nsStyleXXX struct
@ -110,7 +111,7 @@ enum class StyleBoxShadowType : uint8_t {
// clear
enum class StyleClear : uint8_t {
None_ = 0,
None = 0,
Left,
Right,
InlineStart,
@ -143,7 +144,7 @@ enum class StyleFillRule : uint8_t {
// float
// https://developer.mozilla.org/en-US/docs/Web/CSS/float
enum class StyleFloat : uint8_t {
None_,
None,
Left,
Right,
InlineStart,
@ -166,18 +167,16 @@ enum class StyleShapeOutsideShapeBox : uint8_t {
};
// Shape source type
// X11 has a #define for None causing conflicts, so we use None_ here
enum class StyleShapeSourceType : uint8_t {
None_,
None,
URL,
Shape,
Box,
};
// user-focus
// X11 has a #define for None causing conflicts, so we use None_ here
enum class StyleUserFocus : uint8_t {
None_,
None,
Ignore,
Normal,
SelectAll,
@ -189,7 +188,7 @@ enum class StyleUserFocus : uint8_t {
// user-select
enum class StyleUserSelect : uint8_t {
None_,
None,
Text,
Element,
Elements,
@ -492,7 +491,7 @@ enum class FillMode : uint32_t;
// the FrameConstructorDataByDisplay stuff (both the XUL and non-XUL version),
// and ensure it's still correct!
enum class StyleDisplay : uint8_t {
None_ = 0,
None = 0,
Block,
Inline,
InlineBlock,

2
layout/style/nsStyleContext.cpp

@ -696,7 +696,7 @@ nsStyleContext::SetStyleBits()
// Set the NS_STYLE_IN_DISPLAY_NONE_SUBTREE bit
const nsStyleDisplay* disp = StyleDisplay();
if ((mParent && mParent->IsInDisplayNoneSubtree()) ||
disp->mDisplay == mozilla::StyleDisplay::None_) {
disp->mDisplay == mozilla::StyleDisplay::None) {
mBits |= NS_STYLE_IN_DISPLAY_NONE_SUBTREE;
}
}

2
layout/style/nsStyleSet.cpp

@ -1952,7 +1952,7 @@ nsStyleSet::ProbePseudoElementStyle(Element* aParentElement,
const nsStyleDisplay *display = result->StyleDisplay();
const nsStyleContent *content = result->StyleContent();
// XXXldb What is contentCount for |content: ""|?
if (display->mDisplay == StyleDisplay::None_ ||
if (display->mDisplay == StyleDisplay::None ||
content->ContentCount() == 0) {
result = nullptr;
}

10
layout/style/nsStyleStruct.cpp

@ -2986,9 +2986,9 @@ nsStyleDisplay::nsStyleDisplay(StyleStructContext aContext)
, mContain(NS_STYLE_CONTAIN_NONE)
, mAppearance(NS_THEME_NONE)
, mPosition(NS_STYLE_POSITION_STATIC)
, mFloat(StyleFloat::None_)
, mOriginalFloat(StyleFloat::None_)
, mBreakType(StyleClear::None_)
, mFloat(StyleFloat::None)
, mOriginalFloat(StyleFloat::None)
, mBreakType(StyleClear::None)
, mBreakInside(NS_STYLE_PAGE_BREAK_AUTO)
, mBreakBefore(false)
, mBreakAfter(false)
@ -3112,7 +3112,7 @@ nsStyleDisplay::CalcDifference(const nsStyleDisplay& aNewData) const
|| mPosition != aNewData.mPosition
|| mDisplay != aNewData.mDisplay
|| mContain != aNewData.mContain
|| (mFloat == StyleFloat::None_) != (aNewData.mFloat == StyleFloat::None_)
|| (mFloat == StyleFloat::None) != (aNewData.mFloat == StyleFloat::None)
|| mOverflowX != aNewData.mOverflowX
|| mOverflowY != aNewData.mOverflowY
|| mScrollBehavior != aNewData.mScrollBehavior
@ -3897,7 +3897,7 @@ nsCursorImage::operator=(const nsCursorImage& aOther)
nsStyleUserInterface::nsStyleUserInterface(StyleStructContext aContext)
: mUserInput(NS_STYLE_USER_INPUT_AUTO)
, mUserModify(NS_STYLE_USER_MODIFY_READ_ONLY)
, mUserFocus(StyleUserFocus::None_)
, mUserFocus(StyleUserFocus::None)
, mPointerEvents(NS_STYLE_POINTER_EVENTS_AUTO)
, mCursor(NS_STYLE_CURSOR_AUTO)
, mCursorArrayLength(0)

9
layout/style/nsStyleStruct.h

@ -37,6 +37,7 @@
#include "CounterStyleManager.h"
#include <cstddef> // offsetof()
#include <utility>
#include "X11UndefineNone.h"
class nsIFrame;
class nsIURI;
@ -2662,7 +2663,7 @@ struct StyleShapeSource
} else {
ReleaseRef();
mReferenceBox = ReferenceBox::NoBox;
mType = StyleShapeSourceType::None_;
mType = StyleShapeSourceType::None;
}
return *this;
}
@ -2776,7 +2777,7 @@ private:
StyleBasicShape* mBasicShape;
FragmentOrURL* mURL;
};
StyleShapeSourceType mType = StyleShapeSourceType::None_;
StyleShapeSourceType mType = StyleShapeSourceType::None;
ReferenceBox mReferenceBox = ReferenceBox::NoBox;
};
@ -2963,7 +2964,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay
}
bool IsFloatingStyle() const {
return mozilla::StyleFloat::None_ != mFloat;
return mozilla::StyleFloat::None != mFloat;
}
bool IsAbsolutelyPositionedStyle() const {
@ -3794,7 +3795,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleSVGReset
}
bool HasClipPath() const {
return mClipPath.GetType() != mozilla::StyleShapeSourceType::None_;
return mClipPath.GetType() != mozilla::StyleShapeSourceType::None;
}
bool HasNonScalingStroke() const {

2
layout/style/nsStyleStructInlines.h

@ -118,7 +118,7 @@ mozilla::StyleDisplay
nsStyleDisplay::GetDisplay(const nsIFrame* aContextFrame) const
{
NS_ASSERTION(aContextFrame->StyleDisplay() == this, "unexpected aContextFrame");
if (aContextFrame->IsSVGText() && mDisplay != mozilla::StyleDisplay::None_) {
if (aContextFrame->IsSVGText() && mDisplay != mozilla::StyleDisplay::None) {
return aContextFrame->GetType() == nsGkAtoms::blockFrame ?
mozilla::StyleDisplay::Block : mozilla::StyleDisplay::Inline;
}

4
layout/svg/nsCSSClipPathInstance.cpp

@ -24,7 +24,7 @@ nsCSSClipPathInstance::ApplyBasicShapeClip(gfxContext& aContext,
{
auto& clipPathStyle = aFrame->StyleSVGReset()->mClipPath;
StyleShapeSourceType type = clipPathStyle.GetType();
MOZ_ASSERT(type != StyleShapeSourceType::None_, "unexpected none value");
MOZ_ASSERT(type != StyleShapeSourceType::None, "unexpected none value");
// In the future nsCSSClipPathInstance may handle <clipPath> references as
// well. For the time being return early.
if (type == StyleShapeSourceType::URL) {
@ -45,7 +45,7 @@ nsCSSClipPathInstance::HitTestBasicShapeClip(nsIFrame* aFrame,
{
auto& clipPathStyle = aFrame->StyleSVGReset()->mClipPath;
StyleShapeSourceType type = clipPathStyle.GetType();
MOZ_ASSERT(type != StyleShapeSourceType::None_, "unexpected none value");
MOZ_ASSERT(type != StyleShapeSourceType::None, "unexpected none value");
// In the future nsCSSClipPathInstance may handle <clipPath> references as
// well. For the time being return early.
if (type == StyleShapeSourceType::URL) {

1
widget/nsBaseWidget.cpp

@ -37,6 +37,7 @@
#include "nsIWidgetListener.h"
#include "nsIGfxInfo.h"
#include "npapi.h"
#include "X11UndefineNone.h"
#include "base/thread.h"
#include "prdtoa.h"
#include "prenv.h"