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

third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp

 /*
  * Copyright (c) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 BlackBerry Limited. 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.
@@ skipping 137 matching lines @@
 // WebKit uses this to justify text.
 void HarfBuzzShaper::setExpansion(float padding)
 {
     m_expansion = padding;
     if (!m_expansion)
         return;
 
     // If we have padding to distribute, then we try to give an equal
     // amount to each expansion opportunity.
     bool isAfterExpansion = m_isAfterExpansion;
-    m_expansionOpportunityCount = Character::expansionOpportunityCount(m_normalizedBuffer.get(), m_normalizedBufferLength, m_textRun.direction(), isAfterExpansion, m_textRun.textJustify());
+    m_expansionOpportunityCount = Character::expansionOpportunityCount(m_normalizedBuffer.get(), m_normalizedBufferLength, m_textRun.direction(), isAfterExpansion, m_textRun.getTextJustify());
     if (isAfterExpansion && !m_textRun.allowsTrailingExpansion()) {
         ASSERT(m_expansionOpportunityCount > 0);
         --m_expansionOpportunityCount;
     }
 
     if (m_expansionOpportunityCount)
         m_expansionPerOpportunity = m_expansion / m_expansionOpportunityCount;
     else
         m_expansionPerOpportunity = 0;
 }
@@ skipping 554 matching lines @@
     const TextRun& textRun, float positionOffset, unsigned count)
 {
     const SimpleFontData* fontData = font->primaryFont();
     OwnPtr<ShapeResult::RunInfo> run = adoptPtr(new ShapeResult::RunInfo(fontData,
         // Tab characters are always LTR or RTL, not TTB, even when isVerticalAnyUpright().
         textRun.rtl() ? HB_DIRECTION_RTL : HB_DIRECTION_LTR,
         HB_SCRIPT_COMMON, 0, count, count));
     float position = textRun.xPos() + positionOffset;
     float startPosition = position;
     for (unsigned i = 0; i < count; i++) {
-        float advance = font->tabWidth(*fontData, textRun.tabSize(), position);
+        float advance = font->tabWidth(*fontData, textRun.getTabSize(), position);
         run->m_glyphData[i].characterIndex = i;
         run->setGlyphAndPositions(i, fontData->spaceGlyph(), advance, 0, 0);
         position += advance;
     }
     run->m_width = position - startPosition;
 
     RefPtr<ShapeResult> result = ShapeResult::create(font, count, textRun.direction());
     result->m_width = run->m_width;
     result->m_numGlyphs = count;
     ASSERT(result->m_numGlyphs == count); // no overflow
@@ skipping 15 matching lines @@
 
     if (!m_expansionOpportunityCount)
         return spacing;
 
     if (treatAsSpace) {
         spacing += nextExpansionPerOpportunity();
         m_isAfterExpansion = true;
         return spacing;
     }
 
-    if (m_textRun.textJustify() != TextJustify::TextJustifyAuto) {
+    if (m_textRun.getTextJustify() != TextJustify::TextJustifyAuto) {
         m_isAfterExpansion = false;
         return spacing;
     }
 
     // isCJKIdeographOrSymbol() has expansion opportunities both before and after each character.
     // http://www.w3.org/TR/jlreq/#line_adjustment
     if (U16_IS_LEAD(character) && currentCharacterIndex + 1 < m_normalizedBufferLength && U16_IS_TRAIL(m_normalizedBuffer[currentCharacterIndex + 1]))
         character = U16_GET_SUPPLEMENTARY(character, m_normalizedBuffer[currentCharacterIndex + 1]);
     if (!Character::isCJKIdeographOrSymbol(character)) {
         m_isAfterExpansion = false;
@@ skipping 17 matching lines @@
     }
 
     // Don't need to check m_textRun.allowsTrailingExpansion() since it's covered by !m_expansionOpportunityCount above
     spacing += nextExpansionPerOpportunity();
     m_isAfterExpansion = true;
     return spacing;
 }
 
 
 } // namespace blink