Changed EPosition to an enum class and renamed its members

third_party/WebKit/Source/core/paint/PaintLayer.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
  * reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
@@ skipping 312 matching lines @@
     // ancestors further.
     if (layer->isSelfPaintingLayer()) {
       DCHECK(!parent() || parent()->m_hasSelfPaintingLayerDescendantDirty ||
              parent()->m_hasSelfPaintingLayerDescendant);
       break;
     }
   }
 }
 
 bool PaintLayer::sticksToViewport() const {
-  if (layoutObject()->style()->position() != FixedPosition &&
-      layoutObject()->style()->position() != StickyPosition)
+  if (layoutObject()->style()->position() != EPosition::kFixed &&
+      layoutObject()->style()->position() != EPosition::kSticky)
     return false;
 
   // TODO(pdr): This approach of calculating the nearest scroll node is O(n).
   // An option for improving this is to cache the nearest scroll node in
   // the local border box properties.
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     const auto* viewProperties = layoutObject()->view()->paintProperties();
     const ScrollPaintPropertyNode* ancestorTargetScrollNode;
-    if (layoutObject()->style()->position() == FixedPosition) {
+    if (layoutObject()->style()->position() == EPosition::kFixed) {
       ancestorTargetScrollNode = viewProperties->localBorderBoxProperties()
                                      ->transform()
                                      ->findEnclosingScrollNode();
     } else {
       ancestorTargetScrollNode = viewProperties->contentsProperties()
                                      ->transform()
                                      ->findEnclosingScrollNode();
     }
 
     const auto* properties = layoutObject()->paintProperties();
     const auto* transform = properties->localBorderBoxProperties()->transform();
     return transform->findEnclosingScrollNode() == ancestorTargetScrollNode;
   }
 
-  return (layoutObject()->style()->position() == FixedPosition &&
+  return (layoutObject()->style()->position() == EPosition::kFixed &&
           layoutObject()->containerForFixedPosition() ==
               layoutObject()->view()) ||
-         (layoutObject()->style()->position() == StickyPosition &&
+         (layoutObject()->style()->position() == EPosition::kSticky &&
           (!ancestorScrollingLayer() || ancestorScrollingLayer() == root()));
 }
 
 bool PaintLayer::scrollsWithRespectTo(const PaintLayer* other) const {
   if (sticksToViewport() != other->sticksToViewport())
     return true;
   return ancestorScrollingLayer() != other->ancestorScrollingLayer();
 }
 
 void PaintLayer::updateLayerPositionsAfterOverflowScroll() {
@@ skipping 2306 matching lines @@
 }
 
 bool PaintLayer::paintsWithTransform(GlobalPaintFlags globalPaintFlags) const {
   if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {
     return transform() &&
            ((globalPaintFlags & GlobalPaintFlattenCompositingLayers) ||
             compositingState() != PaintsIntoOwnBacking);
   }
 
   return (transform() ||
-          layoutObject()->style()->position() == FixedPosition) &&
+          layoutObject()->style()->position() == EPosition::kFixed) &&
          ((globalPaintFlags & GlobalPaintFlattenCompositingLayers) ||
           compositingState() != PaintsIntoOwnBacking);
 }
 
 bool PaintLayer::compositesWithTransform() const {
   return transformAncestor() || transform();
 }
 
 bool PaintLayer::compositesWithOpacity() const {
   return opacityAncestor() || layoutObject()->style()->hasOpacity();
@@ skipping 12 matching lines @@
 
   if (paintsWithFilters() &&
       layoutObject()->style()->filter().hasFilterThatAffectsOpacity())
     return false;
 
   // FIXME: Handle simple transforms.
   if (transform() && compositingState() != PaintsIntoOwnBacking)
     return false;
 
   if (!RuntimeEnabledFeatures::compositeOpaqueFixedPositionEnabled() &&
-      layoutObject()->style()->position() == FixedPosition &&
+      layoutObject()->style()->position() == EPosition::kFixed &&
       compositingState() != PaintsIntoOwnBacking)
     return false;
 
   // This function should not be called when layer-lists are dirty.
   // TODO(schenney) This check never hits in layout tests or most platforms, but
   // does hit in PopupBlockerBrowserTest.AllowPopupThroughContentSetting on
   // Win 7 Test Builder.
   if (m_stackingNode->zOrderListsDirty())
     return false;
 
@@ skipping 486 matching lines @@
 }
 
 void showLayerTree(const blink::LayoutObject* layoutObject) {
   if (!layoutObject) {
     LOG(INFO) << "Cannot showLayerTree. Root is (nil)";
     return;
   }
   showLayerTree(layoutObject->enclosingLayer());
 }
 #endif