Rename enums/functions that collide in chromium style in core/layout/.

third_party/WebKit/Source/core/layout/line/RootInlineBox.h

 /*
  * Copyright (C) 2003, 2006, 2007, 2008 Apple Inc. 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 92 matching lines @@
 
     int baselinePosition(FontBaseline baselineType) const final;
     LayoutUnit lineHeight() const final;
 
     void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) const override;
     bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override;
 
     using InlineBox::hasSelectedChildren;
     using InlineBox::setHasSelectedChildren;
 
-    SelectionState selectionState() const final;
+    SelectionState getSelectionState() const final;
     InlineBox* firstSelectedBox() const;
     InlineBox* lastSelectedBox() const;
 
     LineLayoutBlockFlow block() const;
 
     InlineBox* closestLeafChildForPoint(const LayoutPoint&, bool onlyEditableLeaves);
     InlineBox* closestLeafChildForLogicalLeftPosition(LayoutUnit, bool onlyEditableLeaves = false);
 
     void appendFloat(LayoutBox* floatingBox)
     {
@@ skipping 65 matching lines @@
     LayoutUnit m_lineBottom;
     LayoutUnit m_lineTopWithLeading;
     LayoutUnit m_lineBottomWithLeading;
     LayoutUnit m_selectionBottom;
     LayoutUnit m_paginationStrut;
 };
 
 } // namespace blink
 
 #endif // RootInlineBox_h