Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2667493002: Changed EPosition to an enum class and renamed its members (Closed)
Patch Set: Rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index 03b6e8b0cb6dc1b378a2bebfd8b034e14ddc4c9e..d6b140b19a37033cf0017bda52ccc5577792612d 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -305,7 +305,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
static_cast<unsigned>(initialDisplay());
m_nonInheritedData.m_verticalAlign =
static_cast<unsigned>(initialVerticalAlign());
- m_nonInheritedData.m_position = initialPosition();
+ m_nonInheritedData.m_position = static_cast<unsigned>(initialPosition());
m_nonInheritedData.m_styleType = PseudoIdNone;
m_nonInheritedData.m_pseudoBits = 0;
m_nonInheritedData.m_explicitInheritance = false;
@@ -1483,11 +1483,13 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
}
// position
- static EPosition initialPosition() { return StaticPosition; }
+ static EPosition initialPosition() { return EPosition::kStatic; }
EPosition position() const {
return static_cast<EPosition>(m_nonInheritedData.m_position);
}
- void setPosition(EPosition v) { m_nonInheritedData.m_position = v; }
+ void setPosition(EPosition v) {
+ m_nonInheritedData.m_position = static_cast<unsigned>(v);
+ }
// resize
static EResize initialResize() { return RESIZE_NONE; }
@@ -3200,13 +3202,15 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
// Position utility functions.
bool hasOutOfFlowPosition() const {
- return position() == AbsolutePosition || position() == FixedPosition;
+ return position() == EPosition::kAbsolute ||
+ position() == EPosition::kFixed;
}
bool hasInFlowPosition() const {
- return position() == RelativePosition || position() == StickyPosition;
+ return position() == EPosition::kRelative ||
+ position() == EPosition::kSticky;
}
bool hasViewportConstrainedPosition() const {
- return position() == FixedPosition || position() == StickyPosition;
+ return position() == EPosition::kFixed || position() == EPosition::kSticky;
}
// Clip utility functions.
@@ -3448,7 +3452,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
// but not managed in stacks. See ObjectPainter::paintAllPhasesAtomically().)
void updateIsStackingContext(bool isDocumentElement, bool isInTopLayer);
bool isStacked() const {
- return isStackingContext() || position() != StaticPosition;
+ return isStackingContext() || position() != EPosition::kStatic;
}
// Pseudo-styles
@@ -3462,7 +3466,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
// canContainFixedPositionObjects. We currently never use this value
// directly, always OR'ing it with canContainFixedPositionObjects.
bool canContainAbsolutePositionObjects() const {
- return position() != StaticPosition;
+ return position() != EPosition::kStatic;
}
bool canContainFixedPositionObjects() const {
return hasTransformRelatedProperty() || containsPaint();
« no previous file with comments | « third_party/WebKit/Source/core/paint/PrePaintTreeWalk.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698