Remove HarfBuzz version specific compile conditional

third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp

 /*
  * Copyright (c) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 362 matching lines @@
   hb_ot_font_set_funcs(otFont.get());
   // Creating a sub font means that non-available functions
   // are found from the parent.
   hb_font_t* unscaledFont = hb_font_create_sub_font(otFont.get());
   RefPtr<HbFontCacheEntry> cacheEntry = HbFontCacheEntry::create(unscaledFont);
   hb_font_set_funcs(unscaledFont, harfBuzzSkiaGetFontFuncs(),
                     cacheEntry->hbFontData(), nullptr);
   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 &&
         std::is_same<
             decltype(SkFontArguments::VariationPosition::Coordinate::value),
             decltype(hb_variation_t::value)>::value &&
         sizeof(SkFontArguments::VariationPosition::Coordinate) ==
             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 {
   m_platformData->setupPaint(&m_harfBuzzFontData->m_paint);
   m_harfBuzzFontData->m_paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
   m_harfBuzzFontData->m_rangeSet = rangeSet;
   m_harfBuzzFontData->updateSimpleFontData(m_platformData);
 
   ASSERT(m_harfBuzzFontData->m_simpleFontData);
   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) {
     Vector<SkFontArguments::VariationPosition::Coordinate> axisValues;
     axisValues.resize(axisCount);
     if (typeface->getVariationDesignPosition(axisValues.data(),
                                              axisValues.size()) > 0) {
       hb_font_set_variations(
           m_unscaledFont, reinterpret_cast<hb_variation_t*>(axisValues.data()),
           axisValues.size());
     }
   }
-#endif
 
   return m_unscaledFont;
 }
 
 }  // namespace blink