third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp - Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/

Unified Diff: third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8

Patch Set: get-names-9: rebase Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp ('k') | third_party/WebKit/Source/platform/text/TextRun.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp b/third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp

index 414455ef401a6824faaa8452375e55653012a980..f8d0ef571dbe66bc337548cc30dbbfd583f98d02 100644

--- a/third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp

+++ b/third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp

@@ -49,7 +49,7 @@ SimpleShaper::SimpleShaper(const Font* font, const TextRun& run, const GlyphData

m_expansionPerOpportunity = 0;

} else {

bool isAfterExpansion = m_isAfterExpansion;

- unsigned expansionOpportunityCount = m_textRun.is8Bit() ? Character::expansionOpportunityCount(m_textRun.characters8(), m_textRun.length(), m_textRun.direction(), isAfterExpansion, m_textRun.textJustify()) : Character::expansionOpportunityCount(m_textRun.characters16(), m_textRun.length(), m_textRun.direction(), isAfterExpansion, m_textRun.textJustify());

+ unsigned expansionOpportunityCount = m_textRun.is8Bit() ? Character::expansionOpportunityCount(m_textRun.characters8(), m_textRun.length(), m_textRun.direction(), isAfterExpansion, m_textRun.getTextJustify()) : Character::expansionOpportunityCount(m_textRun.characters16(), m_textRun.length(), m_textRun.direction(), isAfterExpansion, m_textRun.getTextJustify());

if (isAfterExpansion && !m_textRun.allowsTrailingExpansion())

expansionOpportunityCount--;

@@ -72,7 +72,7 @@ float SimpleShaper::characterWidth(UChar32 character, const GlyphData& glyphData

ASSERT(fontData);

if (UNLIKELY(character == tabulationCharacter && m_textRun.allowTabs()))

- return m_font->tabWidth(*fontData, m_textRun.tabSize(), m_textRun.xPos() + m_runWidthSoFar);

+ return m_font->tabWidth(*fontData, m_textRun.getTabSize(), m_textRun.xPos() + m_runWidthSoFar);

float width = fontData->widthForGlyph(glyphData.glyph);

@@ -89,8 +89,8 @@ float SimpleShaper::adjustSpacing(float width, const CharacterData& charData)

if (width)

width += m_font->fontDescription().letterSpacing();

- bool isExpansionOpportunity = Character::treatAsSpace(charData.character) || (m_textRun.textJustify() == TextJustifyDistribute);

- if (isExpansionOpportunity || (m_textRun.textJustify() == TextJustifyAuto && Character::isCJKIdeographOrSymbol(charData.character))) {

+ bool isExpansionOpportunity = Character::treatAsSpace(charData.character) || (m_textRun.getTextJustify() == TextJustifyDistribute);

+ if (isExpansionOpportunity || (m_textRun.getTextJustify() == TextJustifyAuto && Character::isCJKIdeographOrSymbol(charData.character))) {

// Distribute the run's total expansion evenly over all expansion opportunities in the run.

if (m_expansion) {

if (!isExpansionOpportunity && !m_isAfterExpansion) {