Changed EPosition to an enum class and renamed its members

third_party/WebKit/Source/core/style/ComputedStyle.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 287 matching lines @@
     m_inheritedData.m_hasSimpleUnderline = false;
     m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
     m_inheritedData.m_insideLink =
         static_cast<unsigned>(EInsideLink::kNotInsideLink);
 
     m_nonInheritedData.m_effectiveDisplay =
         m_nonInheritedData.m_originalDisplay =
             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;
     m_nonInheritedData.m_variableReference = false;
     m_nonInheritedData.m_unique = false;
     m_nonInheritedData.m_emptyState = false;
     m_nonInheritedData.m_hasViewportUnits = false;
     m_nonInheritedData.m_affectedByFocus = false;
     m_nonInheritedData.m_affectedByHover = false;
     m_nonInheritedData.m_affectedByActive = false;
@@ skipping 1157 matching lines @@
   }
 
   // -webkit-perspective-origin-y
   static Length initialPerspectiveOriginY() { return Length(50.0, Percent); }
   const Length& perspectiveOriginY() const { return perspectiveOrigin().y(); }
   void setPerspectiveOriginY(const Length& v) {
     setPerspectiveOrigin(LengthPoint(perspectiveOriginX(), v));
   }
 
   // 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; }
   EResize resize() const {
     return static_cast<EResize>(m_rareNonInheritedData->m_resize);
   }
   void setResize(EResize r) { SET_VAR(m_rareNonInheritedData, m_resize, r); }
 
   // Transform properties.
   // transform (aka -webkit-transform)
@@ skipping 1692 matching lines @@
 
   // Outline utility functions.
   bool hasOutline() const {
     return outlineWidth() > 0 && outlineStyle() > BorderStyleHidden;
   }
   int outlineOutsetExtent() const;
   float getOutlineStrokeWidthForFocusRing() const;
 
   // 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.
   const Length& clipLeft() const { return m_visual->clip.left(); }
   const Length& clipRight() const { return m_visual->clip.right(); }
   const Length& clipTop() const { return m_visual->clip.top(); }
   const Length& clipBottom() const { return m_visual->clip.bottom(); }
 
   // Offset utility functions.
   // Accessors for positioned object edges that take into account writing mode.
@@ skipping 221 matching lines @@
   // [1] According to CSS2.1, Appendix E.2.8
   // (https://www.w3.org/TR/CSS21/zindex.html),
   // positioned elements with 'z-index: auto' are "treated as if it created a
   // new stacking context" and z-ordered together with other elements with
   // 'z-index: 0'.  The difference of them from normal stacking contexts is that
   // they don't determine the stacking of the elements underneath them.  (Note:
   // There are also other elements treated as stacking context during painting,
   // 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
   bool hasAnyPublicPseudoStyles() const;
   bool hasPseudoStyle(PseudoId) const;
   void setHasPseudoStyle(PseudoId);
   bool hasUniquePseudoStyle() const;
   bool hasPseudoElementStyle() const;
 
   // Note: canContainAbsolutePositionObjects should return true if
   // 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();
   }
 
   // Whitespace utility functions.
   static bool autoWrap(EWhiteSpace ws) {
     // Nowrap and pre don't automatically wrap.
     return ws != EWhiteSpace::kNowrap && ws != EWhiteSpace::kPre;
   }
@@ skipping 384 matching lines @@
   m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h