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

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

Index: third_party/WebKit/Source/core/layout/line/AbstractInlineTextBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/line/AbstractInlineTextBox.cpp b/third_party/WebKit/Source/core/layout/line/AbstractInlineTextBox.cpp
index d7ded7df18f5177e4b25c0f25886a854adb43ceb..cdd011a2439fb76811f1a44279a92bd6d57ab405 100644
--- a/third_party/WebKit/Source/core/layout/line/AbstractInlineTextBox.cpp
+++ b/third_party/WebKit/Source/core/layout/line/AbstractInlineTextBox.cpp
@@ -86,7 +86,7 @@ void AbstractInlineTextBox::detach()
 
 PassRefPtr<AbstractInlineTextBox> AbstractInlineTextBox::nextInlineTextBox() const
 {
-    ASSERT(!m_inlineTextBox || !m_inlineTextBox->lineLayoutItem().needsLayout());
+    ASSERT(!m_inlineTextBox || !m_inlineTextBox->getLineLayoutItem().needsLayout());
     if (!m_inlineTextBox)
         return nullptr;
 
@@ -171,38 +171,38 @@ String AbstractInlineTextBox::text() const
 
 bool AbstractInlineTextBox::isFirst() const
 {
-    ASSERT(!m_inlineTextBox || !m_inlineTextBox->lineLayoutItem().needsLayout());
+    ASSERT(!m_inlineTextBox || !m_inlineTextBox->getLineLayoutItem().needsLayout());
     return !m_inlineTextBox || !m_inlineTextBox->prevTextBox();
 }
 
 bool AbstractInlineTextBox::isLast() const
 {
-    ASSERT(!m_inlineTextBox || !m_inlineTextBox->lineLayoutItem().needsLayout());
+    ASSERT(!m_inlineTextBox || !m_inlineTextBox->getLineLayoutItem().needsLayout());
     return !m_inlineTextBox || !m_inlineTextBox->nextTextBox();
 }
 
 PassRefPtr<AbstractInlineTextBox> AbstractInlineTextBox::nextOnLine() const
 {
-    ASSERT(!m_inlineTextBox || !m_inlineTextBox->lineLayoutItem().needsLayout());
+    ASSERT(!m_inlineTextBox || !m_inlineTextBox->getLineLayoutItem().needsLayout());
     if (!m_inlineTextBox)
         return nullptr;
 
     InlineBox* next = m_inlineTextBox->nextOnLine();
     if (next && next->isInlineTextBox())
-        return getOrCreate(toInlineTextBox(next)->lineLayoutItem(), toInlineTextBox(next));
+        return getOrCreate(toInlineTextBox(next)->getLineLayoutItem(), toInlineTextBox(next));
 
     return nullptr;
 }
 
 PassRefPtr<AbstractInlineTextBox> AbstractInlineTextBox::previousOnLine() const
 {
-    ASSERT(!m_inlineTextBox || !m_inlineTextBox->lineLayoutItem().needsLayout());
+    ASSERT(!m_inlineTextBox || !m_inlineTextBox->getLineLayoutItem().needsLayout());
     if (!m_inlineTextBox)
         return nullptr;
 
     InlineBox* previous = m_inlineTextBox->prevOnLine();
     if (previous && previous->isInlineTextBox())
-        return getOrCreate(toInlineTextBox(previous)->lineLayoutItem(), toInlineTextBox(previous));
+        return getOrCreate(toInlineTextBox(previous)->getLineLayoutItem(), toInlineTextBox(previous));
 
     return nullptr;
 }