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

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 68 matching lines @@
         if (AXObjectCache* cache = node->document().existingAXObjectCache())
             cache->remove(this);
     }
 
     m_lineLayoutItem = LineLayoutText(nullptr);
     m_inlineTextBox = nullptr;
 }
 
 PassRefPtr<AbstractInlineTextBox> AbstractInlineTextBox::nextInlineTextBox() const
 {
-    ASSERT(!m_inlineTextBox || !m_inlineTextBox->lineLayoutItem().needsLayout());
+    ASSERT(!m_inlineTextBox || !m_inlineTextBox->getLineLayoutItem().needsLayout());
     if (!m_inlineTextBox)
         return nullptr;
 
     return getOrCreate(m_lineLayoutItem, m_inlineTextBox->nextTextBox());
 }
 
 LayoutRect AbstractInlineTextBox::bounds() const
 {
     if (!m_inlineTextBox || !m_lineLayoutItem)
         return LayoutRect();
@@ skipping 64 matching lines @@
     }
 
     String result = m_lineLayoutItem.text().substring(start, len).simplifyWhiteSpace(WTF::DoNotStripWhiteSpace);
     if (m_inlineTextBox->nextTextBox() && m_inlineTextBox->nextTextBox()->start() > m_inlineTextBox->end() && result.length() && !result.right(1).containsOnlyWhitespace())
         return result + " ";
     return result;
 }
 
 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;
 }
 
 } // namespace blink