Bug 1313565 - Convert NS_STYLE_WINDOW_DRAGGING_* to enum class ; r?manishearth
MozReview-Commit-ID: 7I7Z4q7mLtC
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1302,17 +1302,17 @@ nsDisplayListBuilder::RecomputeCurrentAn
void
nsDisplayListBuilder::AdjustWindowDraggingRegion(nsIFrame* aFrame)
{
if (!mWindowDraggingAllowed || !IsForPainting()) {
return;
}
const nsStyleUIReset* styleUI = aFrame->StyleUIReset();
- if (styleUI->mWindowDragging == NS_STYLE_WINDOW_DRAGGING_DEFAULT) {
+ if (styleUI->mWindowDragging == StyleWindowDragging::Default) {
// This frame has the default value and doesn't influence the window
// dragging region.
return;
}
LayoutDeviceToLayoutDeviceMatrix4x4 referenceFrameToRootReferenceFrame;
// The const_cast is for nsLayoutUtils::GetTransformToAncestor.
@@ -1357,17 +1357,17 @@ nsDisplayListBuilder::AdjustWindowDraggi
if (!borderBox.IsEmpty()) {
LayoutDeviceRect devPixelBorderBox =
LayoutDevicePixel::FromAppUnits(borderBox, aFrame->PresContext()->AppUnitsPerDevPixel());
LayoutDeviceRect transformedDevPixelBorderBox =
TransformBy(referenceFrameToRootReferenceFrame, devPixelBorderBox);
transformedDevPixelBorderBox.Round();
LayoutDeviceIntRect transformedDevPixelBorderBoxInt;
if (transformedDevPixelBorderBox.ToIntRect(&transformedDevPixelBorderBoxInt)) {
- if (styleUI->mWindowDragging == NS_STYLE_WINDOW_DRAGGING_DRAG) {
+ if (styleUI->mWindowDragging == StyleWindowDragging::Drag) {
mWindowDraggingRegion.OrWith(transformedDevPixelBorderBoxInt);
} else {
mWindowNoDraggingRegion.OrWith(transformedDevPixelBorderBoxInt);
}
}
}
}
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -2184,19 +2184,19 @@ const KTableEntry nsCSSProps::kWidthKTab
{ eCSSKeyword__moz_max_content, NS_STYLE_WIDTH_MAX_CONTENT },
{ eCSSKeyword__moz_min_content, NS_STYLE_WIDTH_MIN_CONTENT },
{ eCSSKeyword__moz_fit_content, NS_STYLE_WIDTH_FIT_CONTENT },
{ eCSSKeyword__moz_available, NS_STYLE_WIDTH_AVAILABLE },
{ eCSSKeyword_UNKNOWN, -1 }
};
const KTableEntry nsCSSProps::kWindowDraggingKTable[] = {
- { eCSSKeyword_default, NS_STYLE_WINDOW_DRAGGING_DEFAULT },
- { eCSSKeyword_drag, NS_STYLE_WINDOW_DRAGGING_DRAG },
- { eCSSKeyword_no_drag, NS_STYLE_WINDOW_DRAGGING_NO_DRAG },
+ { eCSSKeyword_default, StyleWindowDragging::Default },
+ { eCSSKeyword_drag, StyleWindowDragging::Drag },
+ { eCSSKeyword_no_drag, StyleWindowDragging::NoDrag },
{ eCSSKeyword_UNKNOWN, -1 }
};
const KTableEntry nsCSSProps::kWindowShadowKTable[] = {
{ eCSSKeyword_none, NS_STYLE_WINDOW_SHADOW_NONE },
{ eCSSKeyword_default, NS_STYLE_WINDOW_SHADOW_DEFAULT },
{ eCSSKeyword_menu, NS_STYLE_WINDOW_SHADOW_MENU },
{ eCSSKeyword_tooltip, NS_STYLE_WINDOW_SHADOW_TOOLTIP },
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -1414,16 +1414,17 @@ struct SetEnumValueHelper
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(StyleFloatEdge, ContentBox, MarginBox)
DEFINE_ENUM_CLASS_SETTER(StyleUserFocus, None, SelectMenu)
DEFINE_ENUM_CLASS_SETTER(StyleUserSelect, None, MozText)
DEFINE_ENUM_CLASS_SETTER(StyleUserInput, None, Auto)
DEFINE_ENUM_CLASS_SETTER(StyleUserModify, ReadOnly, WriteOnly)
+ DEFINE_ENUM_CLASS_SETTER(StyleWindowDragging, Default, NoDrag)
#ifdef MOZ_XUL
DEFINE_ENUM_CLASS_SETTER(StyleDisplay, None, Popup)
#else
DEFINE_ENUM_CLASS_SETTER(StyleDisplay, None, InlineBox)
#endif
#undef DEF_SET_ENUMERATED_VALUE
};
@@ -5171,17 +5172,17 @@ nsRuleNode::ComputeUIResetData(void* aSt
SETVAL_INTEGER | SETVAL_UNSET_INITIAL,
parentUI->mForceBrokenImageIcon, 0);
// -moz-window-dragging: enum, inherit, initial
SetValue(*aRuleData->ValueForWindowDragging(),
ui->mWindowDragging, conditions,
SETVAL_ENUMERATED | SETVAL_UNSET_INITIAL,
parentUI->mWindowDragging,
- NS_STYLE_WINDOW_DRAGGING_DEFAULT);
+ StyleWindowDragging::Default);
// -moz-window-shadow: enum, inherit, initial
SetValue(*aRuleData->ValueForWindowShadow(),
ui->mWindowShadow, conditions,
SETVAL_ENUMERATED | SETVAL_UNSET_INITIAL,
parentUI->mWindowShadow,
NS_STYLE_WINDOW_SHADOW_DEFAULT);
--- a/layout/style/nsStyleConsts.h
+++ b/layout/style/nsStyleConsts.h
@@ -222,19 +222,21 @@ enum class StyleUserInput : uint8_t {
// user-modify
enum class StyleUserModify : uint8_t {
ReadOnly,
ReadWrite,
WriteOnly,
};
// -moz-window-dragging
-#define NS_STYLE_WINDOW_DRAGGING_DEFAULT 0
-#define NS_STYLE_WINDOW_DRAGGING_DRAG 1
-#define NS_STYLE_WINDOW_DRAGGING_NO_DRAG 2
+enum class StyleWindowDragging : uint8_t {
+ Default,
+ Drag,
+ NoDrag,
+};
// orient
#define NS_STYLE_ORIENT_INLINE 0
#define NS_STYLE_ORIENT_BLOCK 1
#define NS_STYLE_ORIENT_HORIZONTAL 2
#define NS_STYLE_ORIENT_VERTICAL 3
#define NS_RADIUS_FARTHEST_SIDE 0
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -4079,17 +4079,17 @@ nsStyleUserInterface::CalcDifference(con
//-----------------------
// nsStyleUIReset
//
nsStyleUIReset::nsStyleUIReset(StyleStructContext aContext)
: mUserSelect(StyleUserSelect::Auto)
, mForceBrokenImageIcon(0)
, mIMEMode(NS_STYLE_IME_MODE_AUTO)
- , mWindowDragging(NS_STYLE_WINDOW_DRAGGING_DEFAULT)
+ , mWindowDragging(StyleWindowDragging::Default)
, mWindowShadow(NS_STYLE_WINDOW_SHADOW_DEFAULT)
{
MOZ_COUNT_CTOR(nsStyleUIReset);
}
nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource)
: mUserSelect(aSource.mUserSelect)
, mForceBrokenImageIcon(aSource.mForceBrokenImageIcon)
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -3317,21 +3317,21 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsSt
static nsChangeHint DifferenceAlwaysHandledForDescendants() {
// CalcDifference never returns the reflow hints that are sometimes
// handled for descendants as hints not handled for descendants.
return nsChangeHint_NeedReflow |
nsChangeHint_ReflowChangesSizeOrPosition |
nsChangeHint_ClearAncestorIntrinsics;
}
- mozilla::StyleUserSelect mUserSelect; // [reset] (selection-style)
- uint8_t mForceBrokenImageIcon; // [reset] (0 if not forcing, otherwise forcing)
- uint8_t mIMEMode; // [reset]
- uint8_t mWindowDragging; // [reset]
- uint8_t mWindowShadow; // [reset]
+ mozilla::StyleUserSelect mUserSelect; // [reset](selection-style)
+ uint8_t mForceBrokenImageIcon; // [reset] (0 if not forcing, otherwise forcing)
+ uint8_t mIMEMode; // [reset]
+ mozilla::StyleWindowDragging mWindowDragging; // [reset]
+ uint8_t mWindowShadow; // [reset]
};
struct nsCursorImage
{
bool mHaveHotspot;
float mHotspotX, mHotspotY;
nsCursorImage();