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

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

Issue 2698043005: Wire up Skia axis parameters to HarfBuzz (Closed)
Patch Set: CrOS build fix 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 Google Inc. All rights reserved. 2 * Copyright (c) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 return cacheEntry; 380 return cacheEntry;
381 } 381 }
382 382
383 hb_font_t* HarfBuzzFace::getScaledFont( 383 hb_font_t* HarfBuzzFace::getScaledFont(
384 PassRefPtr<UnicodeRangeSet> rangeSet) const { 384 PassRefPtr<UnicodeRangeSet> rangeSet) const {
385 m_platformData->setupPaint(&m_harfBuzzFontData->m_paint); 385 m_platformData->setupPaint(&m_harfBuzzFontData->m_paint);
386 m_harfBuzzFontData->m_paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); 386 m_harfBuzzFontData->m_paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
387 m_harfBuzzFontData->m_rangeSet = rangeSet; 387 m_harfBuzzFontData->m_rangeSet = rangeSet;
388 m_harfBuzzFontData->updateSimpleFontData(m_platformData); 388 m_harfBuzzFontData->updateSimpleFontData(m_platformData);
389 389
390 // TODO crbug.com/674879 - Connect variation axis parameters to future
391 // HarfBuzz API here.
392 ASSERT(m_harfBuzzFontData->m_simpleFontData); 390 ASSERT(m_harfBuzzFontData->m_simpleFontData);
393 int scale = SkiaScalarToHarfBuzzPosition(m_platformData->size()); 391 int scale = SkiaScalarToHarfBuzzPosition(m_platformData->size());
394 hb_font_set_scale(m_unscaledFont, scale, scale); 392 hb_font_set_scale(m_unscaledFont, scale, scale);
393
394 // TODO: crbug.com/696570 Remove this conditional
395 // once HarfBuzz on CrOS is updated.
396 #if HB_VERSION_ATLEAST(1, 4, 2)
397 SkTypeface* typeface = m_harfBuzzFontData->m_paint.getTypeface();
398 int axisCount = typeface->getVariationDesignPosition(nullptr, 0);
399 if (axisCount > 0) {
400 Vector<SkFontArguments::VariationPosition::Coordinate> axisValues;
401 axisValues.resize(axisCount);
402 typeface->getVariationDesignPosition(axisValues.data(), axisValues.size());
bungeman-skia 2017/03/01 15:33:10 Note that you should test that this comes back > 0
403 Vector<float> axisValuesFloat;
bungeman-skia 2017/03/01 15:33:10 Seems like this should be Vector<hb_variation_t> a
404 axisValuesFloat.resize(axisCount);
405 for (size_t i = 0; i < axisValues.size(); i++) {
406 axisValuesFloat[i] = axisValues[i].value;
407 }
408 hb_font_set_var_coords_design(m_unscaledFont, axisValuesFloat.data(),
409 axisValuesFloat.size());
410 }
411 #endif
412
395 return m_unscaledFont; 413 return m_unscaledFont;
396 } 414 }
397 415
398 } // namespace blink 416 } // namespace blink
OLDNEW
« 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