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

third_party/WebKit/Source/core/layout/api/LineLayoutItem.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef LineLayoutItem_h
 #define LineLayoutItem_h
 
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutObjectInlines.h"
 
@@ skipping 317 matching lines @@
     bool visibleToHitTestRequest(const HitTestRequest& request) const
     {
         return m_layoutObject->visibleToHitTestRequest(request);
     }
 
     bool hitTest(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestFilter filter = HitTestAll)
     {
         return m_layoutObject->hitTest(result, locationInContainer, accumulatedOffset, filter);
     }
 
-    SelectionState selectionState() const
+    SelectionState getSelectionState() const
     {
-        return m_layoutObject->selectionState();
+        return m_layoutObject->getSelectionState();
     }
 
     Color selectionBackgroundColor() const
     {
         return m_layoutObject->selectionBackgroundColor();
     }
 
     Color resolveColor(const ComputedStyle& styleToUse, int colorProperty)
     {
         return m_layoutObject->resolveColor(styleToUse, colorProperty);
@@ skipping 68 matching lines @@
     LayoutObject* m_layoutObject;
 
     friend class LineLayoutAPIShim;
     friend class LineLayoutBlockFlow;
     friend class LineLayoutRubyRun;
 };
 
 } // namespace blink
 
 #endif // LineLayoutItem_h