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

third_party/WebKit/Source/platform/text/BidiResolver.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2006, 2007, 2008 Apple Inc.  All right reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 48 matching lines @@
 
     void stopIgnoringSpaces(const Iterator& midpoint)
     {
         ASSERT(m_numMidpoints % 2);
         addMidpoint(midpoint);
     }
 
     // Adding a pair of midpoints before a character will split it out into a new line box.
     void ensureCharacterGetsLineBox(Iterator& textParagraphSeparator)
     {
-        startIgnoringSpaces(Iterator(0, textParagraphSeparator.lineLayoutItem(), textParagraphSeparator.offset() - 1));
-        stopIgnoringSpaces(Iterator(0, textParagraphSeparator.lineLayoutItem(), textParagraphSeparator.offset()));
+        startIgnoringSpaces(Iterator(0, textParagraphSeparator.getLineLayoutItem(), textParagraphSeparator.offset() - 1));
+        stopIgnoringSpaces(Iterator(0, textParagraphSeparator.getLineLayoutItem(), textParagraphSeparator.offset()));
     }
 
     void checkMidpoints(Iterator& lBreak)
     {
         // Check to see if our last midpoint is a start point beyond the line break. If so,
         // shave it off the list, and shave off a trailing space if the previous end point doesn't
         // preserve whitespace.
-        if (lBreak.lineLayoutItem() && m_numMidpoints && !(m_numMidpoints % 2)) {
+        if (lBreak.getLineLayoutItem() && m_numMidpoints && !(m_numMidpoints % 2)) {
             Iterator* midpointsIterator = m_midpoints.data();
             Iterator& endpoint = midpointsIterator[m_numMidpoints - 2];
             const Iterator& startpoint = midpointsIterator[m_numMidpoints - 1];
             Iterator currpoint = endpoint;
             while (!currpoint.atEnd() && currpoint != startpoint && currpoint != lBreak)
                 currpoint.increment();
             if (currpoint == lBreak) {
                 // We hit the line break before the start point. Shave off the start point.
                 m_numMidpoints--;
-                if (endpoint.lineLayoutItem().style()->collapseWhiteSpace() && endpoint.lineLayoutItem().isText())
+                if (endpoint.getLineLayoutItem().style()->collapseWhiteSpace() && endpoint.getLineLayoutItem().isText())
                     endpoint.setOffset(endpoint.offset() - 1);
             }
         }
     }
 
     Vector<Iterator>& midpoints() { return m_midpoints; }
     const unsigned& numMidpoints() const { return m_numMidpoints; }
     const unsigned& currentMidpoint() const { return m_currentMidpoint; }
     void incrementCurrentMidpoint() { m_currentMidpoint++; }
     const bool& betweenMidpoints() const { return m_betweenMidpoints; }
@@ skipping 1029 matching lines @@
 
 template<class Iterator, class Run, class IsolatedRun>
 MidpointState<Iterator> BidiResolver<Iterator, Run, IsolatedRun>::midpointStateForIsolatedRun(Run& run)
 {
     return m_midpointStateForIsolatedRun.take(&run);
 }
 
 } // namespace blink
 
 #endif // BidiResolver_h