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

Unified Diff: third_party/WebKit/Source/core/css/FontFaceSet.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/FontFaceSet.cpp
diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.cpp b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
index 2673d2860a121f3311d955eb89c2b9d65495f18a..5d69583eb0110c2f1981b8e9718825e5b09e34f6 100644
--- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp
+++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
@@ -385,8 +385,8 @@ ScriptPromise FontFaceSet::load(ScriptState* scriptState, const String& fontStri
FontFaceCache* fontFaceCache = document()->styleEngine().fontSelector()->fontFaceCache();
FontFaceArray faces;
- for (const FontFamily* f = &font.fontDescription().family(); f; f = f->next()) {
- CSSSegmentedFontFace* segmentedFontFace = fontFaceCache->get(font.fontDescription(), f->family());
+ for (const FontFamily* f = &font.getFontDescription().family(); f; f = f->next()) {
+ CSSSegmentedFontFace* segmentedFontFace = fontFaceCache->get(font.getFontDescription(), f->family());
if (segmentedFontFace)
segmentedFontFace->match(text, faces);
}
@@ -412,8 +412,8 @@ bool FontFaceSet::check(const String& fontString, const String& text, ExceptionS
FontFaceCache* fontFaceCache = fontSelector->fontFaceCache();
bool hasLoadedFaces = false;
- for (const FontFamily* f = &font.fontDescription().family(); f; f = f->next()) {
- CSSSegmentedFontFace* face = fontFaceCache->get(font.fontDescription(), f->family());
+ for (const FontFamily* f = &font.getFontDescription().family(); f; f = f->next()) {
+ CSSSegmentedFontFace* face = fontFaceCache->get(font.getFontDescription(), f->family());
if (face) {
if (!face->checkFont(text))
return false;
@@ -422,8 +422,8 @@ bool FontFaceSet::check(const String& fontString, const String& text, ExceptionS
}
if (hasLoadedFaces)
return true;
- for (const FontFamily* f = &font.fontDescription().family(); f; f = f->next()) {
- if (fontSelector->isPlatformFontAvailable(font.fontDescription(), f->family()))
+ for (const FontFamily* f = &font.getFontDescription().family(); f; f = f->next()) {
+ if (fontSelector->isPlatformFontAvailable(font.getFontDescription(), f->family()))
return true;
}
return false;
@@ -456,7 +456,7 @@ bool FontFaceSet::resolveFontStyle(const String& fontString, Font& font)
style->setFontDescription(defaultFontDescription);
- style->font().update(style->font().fontSelector());
+ style->font().update(style->font().getFontSelector());
document()->ensureStyleResolver().computeFont(style.get(), *parsedStyle);

Powered by Google App Engine
This is Rietveld 408576698