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

third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp

 /*
 * Copyright (C) 2008 Apple 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:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 988 matching lines @@
     InlineBox* inlineBox;
     if (m_layoutObject->isLayoutInline())
         inlineBox = toLayoutInline(m_layoutObject)->lastLineBox();
     else if (m_layoutObject->isText())
         inlineBox = toLayoutText(m_layoutObject)->lastTextBox();
     else
         return 0;
 
     AXObject* result = 0;
     for (InlineBox* next = inlineBox->nextOnLine(); next; next = next->nextOnLine()) {
-        LayoutObject* layoutObject = LineLayoutAPIShim::layoutObjectFrom(next->lineLayoutItem());
+        LayoutObject* layoutObject = LineLayoutAPIShim::layoutObjectFrom(next->getLineLayoutItem());
         result = axObjectCache().getOrCreate(layoutObject);
         if (result)
             break;
     }
 
     // A static text node might span multiple lines. Try to return the first inline
     // text box within that static text if possible.
     if (result && result->roleValue() == StaticTextRole && result->children().size())
         result = result->children()[0].get();
 
     return result;
 }
 
 AXObject* AXLayoutObject::previousOnLine() const
 {
     if (!m_layoutObject)
         return 0;
 
     InlineBox* inlineBox;
     if (m_layoutObject->isLayoutInline())
         inlineBox = toLayoutInline(m_layoutObject)->firstLineBox();
     else if (m_layoutObject->isText())
         inlineBox = toLayoutText(m_layoutObject)->firstTextBox();
     else
         return 0;
 
     AXObject* result = 0;
     for (InlineBox* prev = inlineBox->prevOnLine(); prev; prev = prev->prevOnLine()) {
-        LayoutObject* layoutObject = LineLayoutAPIShim::layoutObjectFrom(prev->lineLayoutItem());
+        LayoutObject* layoutObject = LineLayoutAPIShim::layoutObjectFrom(prev->getLineLayoutItem());
         result = axObjectCache().getOrCreate(layoutObject);
         if (result)
             break;
     }
 
     // A static text node might span multiple lines. Try to return the last inline
     // text box within that static text if possible.
     if (result && result->roleValue() == StaticTextRole && result->children().size())
         result = result->children()[result->children().size() - 1].get();
 
@@ skipping 1497 matching lines @@
         if (label && label->layoutObject()) {
             LayoutRect labelRect = axObjectCache().getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace blink