Changed EPosition to an enum class and renamed its members

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
  *               (http://www.torchmobile.com/)
@@ skipping 904 matching lines @@
     return nullptr;  // This can still happen in case of an orphaned tree
 
   return toLayoutBlock(object);
 }
 
 LayoutBlock* LayoutObject::containingBlock(AncestorSkipInfo* skipInfo) const {
   LayoutObject* object = parent();
   if (!object && isLayoutScrollbarPart())
     object = toLayoutScrollbarPart(this)->scrollbarStyleSource();
   if (!isTextOrSVGChild()) {
-    if (m_style->position() == FixedPosition)
+    if (m_style->position() == EPosition::kFixed)
       return containerForFixedPosition(skipInfo);
-    if (m_style->position() == AbsolutePosition)
+    if (m_style->position() == EPosition::kAbsolute)
       return containingBlockForAbsolutePosition(skipInfo);
   }
   if (isColumnSpanAll()) {
     object = spannerPlaceholder()->containingBlock();
   } else {
     while (object && ((object->isInline() && !object->isAtomicInlineLevel()) ||
                       !object->isLayoutBlock())) {
       if (skipInfo)
         skipInfo->update(*object);
       object = object->parent();
@@ skipping 1170 matching lines @@
     // There can't be a transform between |ancestor| and |o|, because transforms
     // create containers, so it should be safe to just subtract the delta
     // between the ancestor and |o|.
     LayoutSize containerOffset =
         ancestor->offsetFromAncestorContainer(container);
     transformState.move(-containerOffset.width(), -containerOffset.height(),
                         preserve3D ? TransformState::AccumulateTransform
                                    : TransformState::FlattenTransform);
     // If the ancestor is fixed, then the rect is already in its coordinates so
     // doesn't need viewport-adjusting.
-    if (ancestor->style()->position() != FixedPosition &&
-        container->isLayoutView() && styleRef().position() == FixedPosition) {
+    if (ancestor->style()->position() != EPosition::kFixed &&
+        container->isLayoutView() &&
+        styleRef().position() == EPosition::kFixed) {
       LayoutSize adjustment = toLayoutView(container)->offsetForFixedPosition();
       transformState.move(adjustment.width(), adjustment.height());
     }
     return;
   }
 
   container->mapLocalToAncestor(ancestor, transformState, mode);
 }
 
 const LayoutObject* LayoutObject::pushMappingToContainer(
@@ skipping 57 matching lines @@
     transformState.move(
         centerPoint -
         toLayoutBox(container)->flipForWritingMode(LayoutPoint(centerPoint)));
   }
 
   if (skipInfo.ancestorSkipped()) {
     containerOffset = ancestor->offsetFromAncestorContainer(container);
     transformState.move(-containerOffset.width(), -containerOffset.height());
     // If the ancestor is fixed, then the rect is already in its coordinates so
     // doesn't need viewport-adjusting.
-    if (ancestor->style()->position() != FixedPosition &&
-        container->isLayoutView() && styleRef().position() == FixedPosition) {
+    if (ancestor->style()->position() != EPosition::kFixed &&
+        container->isLayoutView() &&
+        styleRef().position() == EPosition::kFixed) {
       LayoutSize adjustment = toLayoutView(container)->offsetForFixedPosition();
       transformState.move(adjustment.width(), adjustment.height());
     }
   }
 }
 
 bool LayoutObject::shouldUseTransformFromContainer(
     const LayoutObject* containerObject) const {
   // hasTransform() indicates whether the object has transform, transform-style
   // or perspective. We just care about transform, so check the layer's
@@ skipping 269 matching lines @@
 LayoutObject* LayoutObject::container(AncestorSkipInfo* skipInfo) const {
   // TODO(mstensho): Get rid of this. Nobody should call this method with those
   // flags already set.
   if (skipInfo)
     skipInfo->resetOutput();
 
   if (isTextOrSVGChild())
     return parent();
 
   EPosition pos = m_style->position();
-  if (pos == FixedPosition)
+  if (pos == EPosition::kFixed)
     return containerForFixedPosition(skipInfo);
 
-  if (pos == AbsolutePosition) {
+  if (pos == EPosition::kAbsolute) {
     return containerForAbsolutePosition(skipInfo);
   }
 
   if (isColumnSpanAll()) {
     LayoutObject* multicolContainer = spannerPlaceholder()->container();
     if (skipInfo) {
       // We jumped directly from the spanner to the multicol container. Need to
       // check if we skipped |ancestor| or filter/reflection on the way.
       for (LayoutObject* walker = parent();
            walker && walker != multicolContainer; walker = walker->parent())
@@ skipping 995 matching lines @@
     const blink::LayoutObject* root = object1;
     while (root->parent())
       root = root->parent();
     root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
   } else {
     WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
   }
 }
 
 #endif