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

third_party/WebKit/Source/core/layout/line/EllipsisBox.cpp

Index: third_party/WebKit/Source/core/layout/line/EllipsisBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/line/EllipsisBox.cpp b/third_party/WebKit/Source/core/layout/line/EllipsisBox.cpp
index ae1ed720e75ab0a2d0a3399145236f0f9d4841fa..fce3a26f105098c8f5f8e23de72d3f9512083547 100644
--- a/third_party/WebKit/Source/core/layout/line/EllipsisBox.cpp
+++ b/third_party/WebKit/Source/core/layout/line/EllipsisBox.cpp
@@ -37,7 +37,7 @@ void EllipsisBox::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffs
 
 IntRect EllipsisBox::selectionRect() const
 {
-    const ComputedStyle& style = lineLayoutItem().styleRef(isFirstLineStyle());
+    const ComputedStyle& style = getLineLayoutItem().styleRef(isFirstLineStyle());
     const Font& font = style.font();
     return enclosingIntRect(font.selectionRectForText(constructTextRun(font, m_str, style, TextRun::AllowTrailingExpansion), IntPoint(logicalLeft(), logicalTop() + root().selectionTop()), root().selectionHeight()));
 }
@@ -52,8 +52,8 @@ bool EllipsisBox::nodeAtPoint(HitTestResult& result, const HitTestLocation& loca
     boxOrigin.moveBy(accumulatedOffset);
     LayoutRect boundsRect(boxOrigin, size());
     if (visibleToHitTestRequest(result.hitTestRequest()) && boundsRect.intersects(LayoutRect(HitTestLocation::rectForPoint(locationInContainer.point(), 0, 0, 0, 0)))) {
-        lineLayoutItem().updateHitTestResult(result, locationInContainer.point() - toLayoutSize(adjustedLocation));
-        if (result.addNodeToListBasedTestResult(lineLayoutItem().node(), locationInContainer, boundsRect) == StopHitTesting)
+        getLineLayoutItem().updateHitTestResult(result, locationInContainer.point() - toLayoutSize(adjustedLocation));
+        if (result.addNodeToListBasedTestResult(getLineLayoutItem().node(), locationInContainer, boundsRect) == StopHitTesting)
             return true;
     }