Changed EPosition to an enum class and renamed its members

third_party/WebKit/Source/core/layout/LayoutBlock.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
  *               All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 198 matching lines @@
 }
 
 void LayoutBlock::styleDidChange(StyleDifference diff,
                                  const ComputedStyle* oldStyle) {
   LayoutBox::styleDidChange(diff, oldStyle);
 
   const ComputedStyle& newStyle = styleRef();
 
   if (oldStyle && parent()) {
     if (oldStyle->position() != newStyle.position() &&
-        newStyle.position() != StaticPosition) {
+        newStyle.position() != EPosition::kStatic) {
       // In LayoutObject::styleWillChange() we already removed ourself from our
       // old containing block's positioned descendant list, and we will be
       // inserted to the new containing block's list during layout. However the
       // positioned descendant layout logic assumes layout objects to obey
       // parent-child order in the list. Remove our descendants here so they
       // will be re-inserted after us.
       if (LayoutBlock* cb = containingBlock()) {
         cb->removePositionedObjects(this, NewContainingBlock);
         if (isOutOfFlowPositioned()) {
           // Insert this object into containing block's positioned descendants
@@ skipping 281 matching lines @@
 }
 
 void LayoutBlock::addOverflowFromPositionedObjects() {
   TrackedLayoutBoxListHashSet* positionedDescendants = positionedObjects();
   if (!positionedDescendants)
     return;
 
   for (auto* positionedObject : *positionedDescendants) {
     // Fixed positioned elements don't contribute to layout overflow, since they
     // don't scroll with the content.
-    if (positionedObject->style()->position() != FixedPosition)
+    if (positionedObject->style()->position() != EPosition::kFixed)
       addOverflowFromChild(positionedObject,
                            toLayoutSize(positionedObject->location()));
   }
 }
 
 void LayoutBlock::addVisualOverflowFromTheme() {
   if (!style()->hasAppearance())
     return;
 
   IntRect inflatedRect = pixelSnappedBorderBoxRect();
@@ skipping 138 matching lines @@
 
   if (LayoutAnalyzer* analyzer = frameView()->layoutAnalyzer())
     analyzer->increment(LayoutAnalyzer::LayoutObjectsThatNeedSimplifiedLayout);
 
   return true;
 }
 
 void LayoutBlock::markFixedPositionObjectForLayoutIfNeeded(
     LayoutObject* child,
     SubtreeLayoutScope& layoutScope) {
-  if (child->style()->position() != FixedPosition)
+  if (child->style()->position() != EPosition::kFixed)
     return;
 
   bool hasStaticBlockPosition =
       child->style()->hasStaticBlockPosition(isHorizontalWritingMode());
   bool hasStaticInlinePosition =
       child->style()->hasStaticInlinePosition(isHorizontalWritingMode());
   if (!hasStaticBlockPosition && !hasStaticInlinePosition)
     return;
 
   LayoutObject* o = child->parent();
-  while (o && !o->isLayoutView() && o->style()->position() != AbsolutePosition)
+  while (o && !o->isLayoutView() &&
+         o->style()->position() != EPosition::kAbsolute)
     o = o->parent();
   // The LayoutView is absolute-positioned, but does not move.
   if (o->isLayoutView())
     return;
 
   // We must compute child's width and height, but not update them now.
   // The child will update its width and height when it gets laid out, and needs
   // to see them change there.
   LayoutBox* box = toLayoutBox(child);
   if (hasStaticInlinePosition) {
@@ skipping 1350 matching lines @@
 
   TrackedLayoutBoxListHashSet* positionedDescendants = positionedObjects();
   if (!positionedDescendants)
     return childrenOverflowChanged;
 
   for (auto* box : *positionedDescendants) {
     if (!box->needsOverflowRecalcAfterStyleChange())
       continue;
     LayoutBlock* block = toLayoutBlock(box);
     if (!block->recalcOverflowAfterStyleChange() ||
-        box->style()->position() == FixedPosition)
+        box->style()->position() == EPosition::kFixed)
       continue;
 
     childrenOverflowChanged = true;
   }
   return childrenOverflowChanged;
 }
 
 bool LayoutBlock::recalcOverflowAfterStyleChange() {
   ASSERT(needsOverflowRecalcAfterStyleChange());
 
@@ skipping 141 matching lines @@
   }
 
   return availableHeight;
 }
 
 bool LayoutBlock::hasDefiniteLogicalHeight() const {
   return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1);
 }
 
 }  // namespace blink