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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. 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 1858 matching lines @@
             m_inlineBoxWrapper = nullptr;
         } else {
             m_inlineBoxWrapper->dirtyLineBoxes();
         }
     }
 }
 
 void LayoutBox::positionLineBox(InlineBox* box)
 {
     if (isOutOfFlowPositioned()) {
-        // Cache the x position only if we were an INLINE type originally.

[alancutter (OOO until 2018), 2016/09/26 04:23:46]

This should not change.

+        // Cache the x position only if we were an EDisplay::Inline type originally.
         bool originallyInline = style()->isOriginalDisplayInlineType();
         if (originallyInline) {
             // The value is cached in the xPos of the box.  We only need this value if
             // our object was inline originally, since otherwise it would have ended up underneath
             // the inlines.
             RootInlineBox& root = box->root();
             root.block().setStaticInlinePositionForChild(LineLayoutBox(this), box->logicalLeft());
         } else {
             // Our object was a block originally, so we make our normal flow position be
             // just below the line box (as though all the inlines that came before us got
@@ skipping 920 matching lines @@
     if (isHorizontalWritingMode() != containingBlock->isHorizontalWritingMode())
         return false;
 
     // Anonymous blocks should not impede percentage resolution on a child. Examples of such
     // anonymous blocks are blocks wrapped around inlines that have block siblings (from the CSS
     // spec) and multicol flow threads (an implementation detail). Another implementation detail,
     // ruby runs, create anonymous inline-blocks, so skip those too. All other types of anonymous
     // objects, such as table-cells, will be treated just as if they were non-anonymous.
     if (containingBlock->isAnonymous()) {
         EDisplay display = containingBlock->styleRef().display();
-        return display == BLOCK || display == INLINE_BLOCK;
+        return display == EDisplay::Block || display == EDisplay::InlineBlock;
     }
 
     // For quirks mode, we skip most auto-height containing blocks when computing percentages.
     return document().inQuirksMode() && !containingBlock->isTableCell() && !containingBlock->isOutOfFlowPositioned() && !containingBlock->isLayoutGrid() && containingBlock->style()->logicalHeight().isAuto();
 }
 
 LayoutUnit LayoutBox::computePercentageLogicalHeight(const Length& height) const
 {
     LayoutBlock* cb = containingBlock();
     const LayoutBox* containingBlockChild = this;
@@ skipping 2043 matching lines @@
     LayoutRect rect = frameRect();
 
     LayoutBlock* block = containingBlock();
     if (block)
         block->adjustChildDebugRect(rect);
 
     return rect;
 }
 
 } // namespace blink