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

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

Issue 2735233004: Remove HarfBuzz version specific compile conditional (Closed)
Patch Set: Created 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
index a3bb692c2a59b58df893d0ebd92b6b251f1391d1..70c4b8c00c2b2fe244431df1ef588db148f6784d 100644
--- a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
+++ b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
@@ -380,9 +380,6 @@ PassRefPtr<HbFontCacheEntry> createHbFontCacheEntry(hb_face_t* face) {
return cacheEntry;
}
-// TODO: crbug.com/696570 Remove this conditional
-// once HarfBuzz on CrOS is updated.
-#if HB_VERSION_ATLEAST(1, 4, 2)
static_assert(
std::is_same<decltype(SkFontArguments::VariationPosition::Coordinate::axis),
decltype(hb_variation_t::tag)>::value &&
@@ -393,7 +390,6 @@ static_assert(
sizeof(hb_variation_t),
"Skia and HarfBuzz Variation parameter types must match in structure and "
"size.");
-#endif
hb_font_t* HarfBuzzFace::getScaledFont(
PassRefPtr<UnicodeRangeSet> rangeSet) const {
@@ -406,9 +402,6 @@ hb_font_t* HarfBuzzFace::getScaledFont(
int scale = SkiaScalarToHarfBuzzPosition(m_platformData->size());
hb_font_set_scale(m_unscaledFont, scale, scale);
-// TODO: crbug.com/696570 Remove this conditional
-// once HarfBuzz on CrOS is updated.
-#if HB_VERSION_ATLEAST(1, 4, 2)
SkTypeface* typeface = m_harfBuzzFontData->m_paint.getTypeface();
int axisCount = typeface->getVariationDesignPosition(nullptr, 0);
if (axisCount > 0) {
@@ -421,7 +414,6 @@ hb_font_t* HarfBuzzFace::getScaledFont(
axisValues.size());
}
}
-#endif
return m_unscaledFont;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698