third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp - Issue 2581083003: Initial OpenType Font Variations Support

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2581083003: Initial OpenType Font Variations Support (Closed)

Patch Set: Fix hash collision tests, adjust test expectations Created 4 years 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

« third_party/WebKit/Source/platform/fonts/opentype/FontSettings.cpp ('K') | « third_party/WebKit/Source/platform/fonts/opentype/FontSettingsTest.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 368 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
379 cacheEntry->hbFontData(), nullptr);	379 cacheEntry->hbFontData(), nullptr);

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

	390 // TODO crbug.com/674879 - Connect variation axis parameters to future

	391 // HarfBuzz API here.

389 ASSERT(m_harfBuzzFontData->m_simpleFontData);	392 ASSERT(m_harfBuzzFontData->m_simpleFontData);

390 int scale = SkiaScalarToHarfBuzzPosition(m_platformData->size());	393 int scale = SkiaScalarToHarfBuzzPosition(m_platformData->size());

391 hb_font_set_scale(m_unscaledFont, scale, scale);	394 hb_font_set_scale(m_unscaledFont, scale, scale);

392 return m_unscaledFont;	395 return m_unscaledFont;

393 }	396 }

394	397

395 } // namespace blink	398 } // namespace blink

OLD	NEW