Changed EPosition to an enum class and renamed its members

third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
@@ skipping 137 matching lines @@
 }
 
 static void adjustStyleForFirstLetter(ComputedStyle& style) {
   if (style.styleType() != PseudoIdFirstLetter)
     return;
 
   // Force inline display (except for floating first-letters).
   style.setDisplay(style.isFloating() ? EDisplay::Block : EDisplay::Inline);
 
   // CSS2 says first-letter can't be positioned.
-  style.setPosition(StaticPosition);
+  style.setPosition(EPosition::kStatic);
 }
 
 void StyleAdjuster::adjustStyleForAlignment(ComputedStyle& style,
                                             const ComputedStyle& parentStyle) {
   // To avoid needing to copy the RareNonInheritedData, we repurpose the 'auto'
   // flag to not just mean 'auto' prior to running the StyleAdjuster but also
   // mean 'normal' after running it.
 
   // If the inherited value of justify-items includes the 'legacy' keyword,
   // 'auto' computes to the the inherited value.  Otherwise, 'auto' computes to
@@ skipping 47 matching lines @@
         style.textAlign() == ETextAlign::kWebkitCenter ||
         style.textAlign() == ETextAlign::kWebkitRight)
       style.setTextAlign(ETextAlign::kStart);
     return;
   }
 
   if (isHTMLFrameElement(element) || isHTMLFrameSetElement(element)) {
     // Frames and framesets never honor position:relative or position:absolute.
     // This is necessary to fix a crash where a site tries to position these
     // objects. They also never honor display.
-    style.setPosition(StaticPosition);
+    style.setPosition(EPosition::kStatic);
     style.setDisplay(EDisplay::Block);
     return;
   }
 
   if (isHTMLFrameElementBase(element)) {
     // Frames cannot overflow (they are always the size we ask them to be).
     // Some compositing code paths may try to draw scrollbars anyhow.
     style.setOverflowX(EOverflow::kVisible);
     style.setOverflowY(EOverflow::kVisible);
     return;
   }
 
   if (isHTMLRTElement(element)) {
     // Ruby text does not support float or position. This might change with
     // evolution of the specification.
-    style.setPosition(StaticPosition);
+    style.setPosition(EPosition::kStatic);
     style.setFloating(EFloat::kNone);
     return;
   }
 
   if (isHTMLLegendElement(element)) {
     style.setDisplay(EDisplay::Block);
     return;
   }
 
   if (isHTMLMarqueeElement(element)) {
@@ skipping 76 matching lines @@
       style.getWritingMode() != parentStyle.getWritingMode())
     style.setDisplay(EDisplay::InlineBlock);
 
   // After performing the display mutation, check table rows. We do not honor
   // position: relative table rows. This has been established for position:
   // relative in CSS2.1 (and caused a crash in containingBlock() on some sites).
   if ((style.display() == EDisplay::TableHeaderGroup ||
        style.display() == EDisplay::TableRowGroup ||
        style.display() == EDisplay::TableFooterGroup ||
        style.display() == EDisplay::TableRow) &&
-      style.position() == RelativePosition)
-    style.setPosition(StaticPosition);
+      style.position() == EPosition::kRelative)
+    style.setPosition(EPosition::kStatic);
 
   // Cannot support position: sticky for table columns and column groups because
   // current code is only doing background painting through columns / column
   // groups.
   if ((style.display() == EDisplay::TableColumnGroup ||
        style.display() == EDisplay::TableColumn) &&
-      style.position() == StickyPosition)
-    style.setPosition(StaticPosition);
+      style.position() == EPosition::kSticky)
+    style.setPosition(EPosition::kStatic);
 
   // writing-mode does not apply to table row groups, table column groups, table
   // rows, and table columns.
   // FIXME: Table cells should be allowed to be perpendicular or flipped with
   // respect to the table, though.
   if (style.display() == EDisplay::TableColumn ||
       style.display() == EDisplay::TableColumnGroup ||
       style.display() == EDisplay::TableFooterGroup ||
       style.display() == EDisplay::TableHeaderGroup ||
       style.display() == EDisplay::TableRow ||
@@ skipping 28 matching lines @@
 void StyleAdjuster::adjustComputedStyle(ComputedStyle& style,
                                         const ComputedStyle& parentStyle,
                                         Element* element) {
   if (style.display() != EDisplay::None &&
       style.display() != EDisplay::Contents) {
     if (element && element->isHTMLElement())
       adjustStyleForHTMLElement(style, toHTMLElement(*element));
 
     // Per the spec, position 'static' and 'relative' in the top layer compute
     // to 'absolute'.
-    if (isInTopLayer(element, style) && (style.position() == StaticPosition ||
-                                         style.position() == RelativePosition))
-      style.setPosition(AbsolutePosition);
+    if (isInTopLayer(element, style) &&
+        (style.position() == EPosition::kStatic ||
+         style.position() == EPosition::kRelative))
+      style.setPosition(EPosition::kAbsolute);
 
     // Absolute/fixed positioned elements, floating elements and the document
     // element need block-like outside display.
     if (style.hasOutOfFlowPosition() || style.isFloating() ||
         (element && element->document().documentElement() == element))
       style.setDisplay(equivalentBlockDisplay(style.display()));
 
     // We don't adjust the first letter style earlier because we may change the
     // display setting in adjustStyeForTagName() above.
     adjustStyleForFirstLetter(style);
 
     adjustStyleForDisplay(style, parentStyle,
                           element ? &element->document() : 0);
 
     // Paint containment forces a block formatting context, so we must coerce
     // from inline.  https://drafts.csswg.org/css-containment/#containment-paint
     if (style.containsPaint() && style.display() == EDisplay::Inline)
       style.setDisplay(EDisplay::Block);
   } else {
     adjustStyleForFirstLetter(style);
   }
 
   if (element && element->hasCompositorProxy())
     style.setHasCompositorProxy(true);
 
   // Make sure our z-index value is only applied if the object is positioned.
-  if (style.position() == StaticPosition &&
+  if (style.position() == EPosition::kStatic &&
       !parentStyleForcesZIndexToCreateStackingContext(parentStyle)) {
     style.setIsStackingContext(false);
     // TODO(alancutter): Avoid altering z-index here.
     if (!style.hasAutoZIndex())
       style.setZIndex(0);
   } else if (!style.hasAutoZIndex()) {
     style.setIsStackingContext(true);
   }
 
   if (style.overflowX() != EOverflow::kVisible ||
@@ skipping 51 matching lines @@
       style.setDisplay(EDisplay::Block);
 
     // Columns don't apply to svg text elements.
     if (isSVGTextElement(*element))
       style.clearMultiCol();
   }
   adjustStyleForAlignment(style, parentStyle);
 }
 
 }  // namespace blink