third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp - Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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/geometry/FloatRoundedRect.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 f8d0ef571dbe66bc337548cc30dbbfd583f98d02..f1bc7a1c431e2296d15b27ae6fde1a5b4388e09d 100644

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

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

@@ -87,7 +87,7 @@ float SimpleShaper::adjustSpacing(float width, const CharacterData& charData)

{

// Account for letter-spacing.

if (width)

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

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

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

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

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

// We apply additional space between "words" by adding width to the space character.

if (isExpansionOpportunity && (charData.character != tabulationCharacter || !m_textRun.allowTabs())

&& (charData.characterOffset || charData.character == noBreakSpaceCharacter)

- && m_font->fontDescription().wordSpacing()) {

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

+ && m_font->getFontDescription().wordSpacing()) {

+ width += m_font->getFontDescription().wordSpacing();

}

} else {

m_isAfterExpansion = false;

@@ -126,7 +126,7 @@ float SimpleShaper::adjustSpacing(float width, const CharacterData& charData)

template <typename TextIterator>

unsigned SimpleShaper::advanceInternal(TextIterator& textIterator, GlyphBuffer* glyphBuffer)

{

- bool hasExtraSpacing = (m_font->fontDescription().letterSpacing() || m_font->fontDescription().wordSpacing() || m_expansion)

+ bool hasExtraSpacing = (m_font->getFontDescription().letterSpacing() || m_font->getFontDescription().wordSpacing() || m_expansion)

&& !m_textRun.spacingDisabled();

const SimpleFontData* lastFontData = m_font->primaryFont();