Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Unified Diff: third_party/WebKit/Source/core/css/resolver/FontBuilder.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
Index: third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp b/third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp
index 6524b2ed1765bd7b7dca30fa6f165b3c2a21e61b..545853794b25bde3a04e06027ae294bba996fdc5 100644
--- a/third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp
@@ -300,7 +300,7 @@ void FontBuilder::updateSpecifiedSize(FontDescription& fontDescription, const Co
fontDescription.setSpecifiedSize(specifiedSize);
- checkForGenericFamilyChange(style.fontDescription(), fontDescription);
+ checkForGenericFamilyChange(style.getFontDescription(), fontDescription);
}
void FontBuilder::updateAdjustedSize(FontDescription& fontDescription, const ComputedStyle& style, FontSelector* fontSelector)
@@ -316,11 +316,11 @@ void FontBuilder::updateAdjustedSize(FontDescription& fontDescription, const Com
Font font(fontDescription);
font.update(fontSelector);
- if (!font.fontMetrics().hasXHeight())
+ if (!font.getFontMetrics().hasXHeight())
return;
const float sizeAdjust = fontDescription.sizeAdjust();
- float aspectValue = font.fontMetrics().xHeight() / specifiedSize;
+ float aspectValue = font.getFontMetrics().xHeight() / specifiedSize;
float adjustedSize = (sizeAdjust / aspectValue) * specifiedSize;
adjustedSize = getComputedSizeFromSpecifiedSize(fontDescription, style.effectiveZoom(), adjustedSize);
@@ -344,7 +344,7 @@ void FontBuilder::createFont(PassRefPtrWillBeRawPtr<FontSelector> fontSelector,
if (!m_flags)
return;
- FontDescription description = style.fontDescription();
+ FontDescription description = style.getFontDescription();
if (isSet(PropertySetFlag::Family)) {
description.setGenericFamily(m_fontDescription.genericFamily());

Powered by Google App Engine
This is Rietveld 408576698