Changed EDisplay to an enum class and renamed its members to be keywords

third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceClipper.cpp

 /*
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  * Copyright (C) 2011 Dirk Schulze <krit@webkit.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 68 matching lines @@
             continue;
         // Only shapes or paths are supported for direct clipping. We need to fallback to masking for texts.
         if (childLayoutObject->isSVGText()) {
             m_clipContentPath.clear();
             return false;
         }
         if (!childElement->isSVGGraphicsElement())
             continue;
 
         const ComputedStyle* style = childLayoutObject->style();
-        if (!style || style->display() == NONE || (style->visibility() != EVisibility::Visible && !isSVGUseElement(*childElement)))
+        if (!style || style->display() == EDisplay::None || (style->visibility() != EVisibility::Visible && !isSVGUseElement(*childElement)))
             continue;
 
         // Current shape in clip-path gets clipped too. Fallback to masking.
         if (style->clipPath()) {
             m_clipContentPath.clear();
             return false;
         }
 
         // First clip shape.
         if (m_clipContentPath.isEmpty()) {
@@ skipping 70 matching lines @@
     FloatRect bounds = strokeBoundingBox();
 
     SkPictureBuilder pictureBuilder(bounds, nullptr, nullptr);
 
     for (SVGElement* childElement = Traversal<SVGElement>::firstChild(*element()); childElement; childElement = Traversal<SVGElement>::nextSibling(*childElement)) {
         LayoutObject* layoutObject = childElement->layoutObject();
         if (!layoutObject)
             continue;
 
         const ComputedStyle* style = layoutObject->style();
-        if (!style || style->display() == NONE || (style->visibility() != EVisibility::Visible && !isSVGUseElement(*childElement)))
+        if (!style || style->display() == EDisplay::None || (style->visibility() != EVisibility::Visible && !isSVGUseElement(*childElement)))
             continue;
 
         bool isUseElement = isSVGUseElement(*childElement);
         if (isUseElement) {
             const SVGGraphicsElement* clippingElement = toSVGUseElement(*childElement).visibleTargetGraphicsElementForClipping();
             if (!clippingElement)
                 continue;
 
             layoutObject = clippingElement->layoutObject();
             if (!layoutObject)
@@ skipping 23 matching lines @@
 void LayoutSVGResourceClipper::calculateLocalClipBounds()
 {
     // This is a rough heuristic to appraise the clip size and doesn't consider clip on clip.
     for (SVGElement* childElement = Traversal<SVGElement>::firstChild(*element()); childElement; childElement = Traversal<SVGElement>::nextSibling(*childElement)) {
         LayoutObject* layoutObject = childElement->layoutObject();
         if (!layoutObject)
             continue;
         if (!layoutObject->isSVGShape() && !layoutObject->isSVGText() && !isSVGUseElement(*childElement))
             continue;
         const ComputedStyle* style = layoutObject->style();
-        if (!style || style->display() == NONE || (style->visibility() != EVisibility::Visible && !isSVGUseElement(*childElement)))
+        if (!style || style->display() == EDisplay::None || (style->visibility() != EVisibility::Visible && !isSVGUseElement(*childElement)))
             continue;
         if (isSVGUseElement(*childElement) && !toSVGUseElement(*childElement).visibleTargetGraphicsElementForClipping())
             continue;
 
         m_localClipBounds.unite(layoutObject->localToSVGParentTransform().mapRect(layoutObject->paintInvalidationRectInLocalSVGCoordinates()));
     }
 }
 
 bool LayoutSVGResourceClipper::hitTestClipContent(const FloatRect& objectBoundingBox, const FloatPoint& nodeAtPoint)
 {
@@ skipping 40 matching lines @@
 
     AffineTransform transform = toSVGClipPathElement(element())->calculateAnimatedLocalTransform();
     if (clipPathUnits() == SVGUnitTypes::kSvgUnitTypeObjectboundingbox) {
         transform.translate(referenceBox.x(), referenceBox.y());
         transform.scaleNonUniform(referenceBox.width(), referenceBox.height());
     }
     return transform.mapRect(m_localClipBounds);
 }
 
 } // namespace blink