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

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

Index: third_party/WebKit/Source/core/layout/line/TrailingObjects.cpp
diff --git a/third_party/WebKit/Source/core/layout/line/TrailingObjects.cpp b/third_party/WebKit/Source/core/layout/line/TrailingObjects.cpp
index ce0113809831409d7aaddba823b78487de5e2a66..f0d2184a16ed62a3b9cea5a1662695e2260b66a7 100644
--- a/third_party/WebKit/Source/core/layout/line/TrailingObjects.cpp
+++ b/third_party/WebKit/Source/core/layout/line/TrailingObjects.cpp
@@ -39,7 +39,7 @@ void TrailingObjects::updateMidpointsForTrailingObjects(LineMidpointState& lineM
     if (lineMidpointState.numMidpoints() % 2) {
         // Find the trailing space object's midpoint.
         int trailingSpaceMidpoint = lineMidpointState.numMidpoints() - 1;
-        for ( ; trailingSpaceMidpoint > 0 && lineMidpointState.midpoints()[trailingSpaceMidpoint].lineLayoutItem() != m_whitespace; --trailingSpaceMidpoint) { }
+        for ( ; trailingSpaceMidpoint > 0 && lineMidpointState.midpoints()[trailingSpaceMidpoint].getLineLayoutItem() != m_whitespace; --trailingSpaceMidpoint) { }
         ASSERT(trailingSpaceMidpoint >= 0);
         if (collapseFirstSpace == CollapseFirstSpace)
             lineMidpointState.midpoints()[trailingSpaceMidpoint].setOffset(lineMidpointState.midpoints()[trailingSpaceMidpoint].offset() -1);
@@ -52,12 +52,12 @@ void TrailingObjects::updateMidpointsForTrailingObjects(LineMidpointState& lineM
                 // We don't have a midpoint for this box yet.
                 ensureLineBoxInsideIgnoredSpaces(&lineMidpointState, LineLayoutItem(m_objects[i]));
             } else {
-                ASSERT(lineMidpointState.midpoints()[currentMidpoint].lineLayoutItem() == m_objects[i]);
-                ASSERT(lineMidpointState.midpoints()[currentMidpoint + 1].lineLayoutItem() == m_objects[i]);
+                ASSERT(lineMidpointState.midpoints()[currentMidpoint].getLineLayoutItem() == m_objects[i]);
+                ASSERT(lineMidpointState.midpoints()[currentMidpoint + 1].getLineLayoutItem() == m_objects[i]);
             }
             currentMidpoint += 2;
         }
-    } else if (!lBreak.lineLayoutItem()) {
+    } else if (!lBreak.getLineLayoutItem()) {
         ASSERT(collapseFirstSpace == CollapseFirstSpace);
         // Add a new end midpoint that stops right at the very end.
         unsigned length = m_whitespace.textLength();