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

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2007, 2011 Apple Inc. All rights 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.
@@ skipping 176 matching lines @@
     void setText(const LChar* c, unsigned len) { m_data.characters8 = c; m_len = len; m_is8Bit = true;}
     void setText(const UChar* c, unsigned len) { m_data.characters16 = c; m_len = len; m_is8Bit = false;}
     void setText(const String&);
     void setCharactersLength(unsigned charactersLength) { m_charactersLength = charactersLength; }
 
     void setExpansionBehavior(ExpansionBehavior behavior) { m_expansionBehavior = behavior; }
     float horizontalGlyphStretch() const { return m_horizontalGlyphStretch; }
     void setHorizontalGlyphStretch(float scale) { m_horizontalGlyphStretch = scale; }
 
     bool allowTabs() const { return m_allowTabs; }
-    TabSize tabSize() const { return m_tabSize; }
+    TabSize getTabSize() const { return m_tabSize; }
     void setTabSize(bool, TabSize);
 
     float xPos() const { return m_xpos; }
     void setXPos(float xPos) { m_xpos = xPos; }
     float expansion() const { return m_expansion; }
     bool allowsLeadingExpansion() const { return m_expansionBehavior & AllowLeadingExpansion; }
     bool allowsTrailingExpansion() const { return m_expansionBehavior & AllowTrailingExpansion; }
     TextDirection direction() const { return static_cast<TextDirection>(m_direction); }
     bool rtl() const { return m_direction == RTL; }
     bool ltr() const { return m_direction == LTR; }
     bool directionalOverride() const { return m_directionalOverride; }
     bool spacingDisabled() const { return m_disableSpacing; }
 
     void disableSpacing() { m_disableSpacing = true; }
     void setDirection(TextDirection direction) { m_direction = direction; }
     void setDirectionalOverride(bool override) { m_directionalOverride = override; }
 
     void setTextJustify(TextJustify textJustify) { m_textJustify = static_cast<unsigned>(textJustify); }
-    TextJustify textJustify() const { return static_cast<TextJustify>(m_textJustify); }
+    TextJustify getTextJustify() const { return static_cast<TextJustify>(m_textJustify); }
 
 private:
     union {
         const LChar* characters8;
         const UChar* characters16;
     } m_data;
     unsigned m_charactersLength; // Marks the end of the characters buffer. Default equals to m_len.
     unsigned m_len;
 
     // m_xpos is the x position relative to the left start of the text line, not relative to the left
@@ skipping 34 matching lines @@
 
     const TextRun& run;
     int from;
     int to;
     FloatRect bounds;
     RefPtr<const SkTextBlob>* cachedTextBlob;
 };
 
 } // namespace blink
 #endif