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

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

Index: third_party/WebKit/Source/core/layout/line/BreakingContext.cpp
diff --git a/third_party/WebKit/Source/core/layout/line/BreakingContext.cpp b/third_party/WebKit/Source/core/layout/line/BreakingContext.cpp
index 96d2e824158794c6005050ad2d1b618c9444ebe5..80e1877f7574326abf4d177286dd65ddad48846e 100644
--- a/third_party/WebKit/Source/core/layout/line/BreakingContext.cpp
+++ b/third_party/WebKit/Source/core/layout/line/BreakingContext.cpp
@@ -27,15 +27,15 @@ namespace blink {
 
 InlineIterator BreakingContext::handleEndOfLine()
 {
-    if (m_lineBreak == m_resolver.position() && (!m_lineBreak.lineLayoutItem() || !m_lineBreak.lineLayoutItem().isBR())) {
+    if (m_lineBreak == m_resolver.position() && (!m_lineBreak.getLineLayoutItem() || !m_lineBreak.getLineLayoutItem().isBR())) {
         // we just add as much as possible
         if (m_blockStyle->whiteSpace() == PRE && !m_current.offset()) {
             m_lineBreak.moveTo(m_lastObject, m_lastObject.isText() ? m_lastObject.length() : 0);
-        } else if (m_lineBreak.lineLayoutItem()) {
+        } else if (m_lineBreak.getLineLayoutItem()) {
             // Don't ever break in the middle of a word if we can help it.
             // There's no room at all. We just have to be on this line,
             // even though we'll spill out.
-            m_lineBreak.moveTo(m_current.lineLayoutItem(), m_current.offset());
+            m_lineBreak.moveTo(m_current.getLineLayoutItem(), m_current.offset());
         }
     }
 
@@ -59,7 +59,7 @@ InlineIterator BreakingContext::handleEndOfLine()
         do {
             m_lineBreak.setOffset(m_lineBreak.offset() - 1);
             m_lineBreak.increment();
-        } while (!m_lineBreak.atEnd() && isEmptyInline(m_lineBreak.lineLayoutItem()));
+        } while (!m_lineBreak.atEnd() && isEmptyInline(m_lineBreak.getLineLayoutItem()));
     }
 
     return m_lineBreak;